diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | configh.in | 5 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | makefiles/config.cygwin | 5 | ||||
| -rw-r--r-- | makefiles/config.mingw | 5 | ||||
| -rw-r--r-- | makefiles/config.no-cygwin | 5 | ||||
| -rw-r--r-- | makefiles/config.os2x | 5 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 8 |
8 files changed, 28 insertions, 15 deletions
@@ -38,6 +38,10 @@ CHANGES IN FLTK 1.1.0b4 - The editor demo had the save and discard button actions reversed. + - The Fl_Help_View widget now uses + png_destroy_read_struct() if the older + png_read_destroy() function is not available. + CHANGES IN FLTK 1.1.0b3 diff --git a/configh.in b/configh.in index aa6ef40c0..5517e6a4f 100644 --- a/configh.in +++ b/configh.in @@ -1,5 +1,5 @@ /* - * "$Id: configh.in,v 1.11.2.11.2.3 2001/10/01 16:49:29 easysw Exp $" + * "$Id: configh.in,v 1.11.2.11.2.4 2001/10/19 14:04:08 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * @configure_input@ @@ -197,8 +197,9 @@ #undef HAVE_PNG_GET_VALID #undef HAVE_PNG_SET_TRNS_TO_ALPHA +#undef HAVE_PNG_READ_DESTROY /* - * End of "$Id: configh.in,v 1.11.2.11.2.3 2001/10/01 16:49:29 easysw Exp $". + * End of "$Id: configh.in,v 1.11.2.11.2.4 2001/10/19 14:04:08 easysw Exp $". */ diff --git a/configure.in b/configure.in index 436a25839..9c0f49efb 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.11 2001/10/18 20:47:10 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.12 2001/10/19 14:04:08 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -203,7 +203,7 @@ AC_CHECK_HEADER(png.h, AC_DEFINE(HAVE_LIBPNG) IMAGELIBS="-lpng -lm$IMAGELIBS" LIBS="-lpng -lm $LIBS" - AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha))) + AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha png_read_destroy))) dnl Restore original LIBS settings... LIBS="$SAVELIBS" @@ -474,5 +474,5 @@ AC_OUTPUT(makeinclude fltk-config) chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.11 2001/10/18 20:47:10 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.12 2001/10/19 14:04:08 easysw Exp $". dnl diff --git a/makefiles/config.cygwin b/makefiles/config.cygwin index 77a7a56ed..997ada880 100644 --- a/makefiles/config.cygwin +++ b/makefiles/config.cygwin @@ -1,5 +1,5 @@ /* - * "$Id: config.cygwin,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $" + * "$Id: config.cygwin,v 1.1.2.3.2.2 2001/10/19 14:04:08 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * @@ -179,8 +179,9 @@ #undef HAVE_PNG_GET_VALID #undef HAVE_PNG_SET_TRNS_TO_ALPHA +#undef HAVE_PNG_READ_DESTROY /* - * End of "$Id: config.cygwin,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $". + * End of "$Id: config.cygwin,v 1.1.2.3.2.2 2001/10/19 14:04:08 easysw Exp $". */ diff --git a/makefiles/config.mingw b/makefiles/config.mingw index b5b35f8cb..ef1c3c421 100644 --- a/makefiles/config.mingw +++ b/makefiles/config.mingw @@ -1,5 +1,5 @@ /* - * "$Id: config.mingw,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $" + * "$Id: config.mingw,v 1.1.2.3.2.2 2001/10/19 14:04:08 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * @@ -179,8 +179,9 @@ #undef HAVE_PNG_GET_VALID #undef HAVE_PNG_SET_TRNS_TO_ALPHA +#undef HAVE_PNG_READ_DESTROY /* - * End of "$Id: config.mingw,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $". + * End of "$Id: config.mingw,v 1.1.2.3.2.2 2001/10/19 14:04:08 easysw Exp $". */ diff --git a/makefiles/config.no-cygwin b/makefiles/config.no-cygwin index 2330a6042..fdb21027f 100644 --- a/makefiles/config.no-cygwin +++ b/makefiles/config.no-cygwin @@ -1,5 +1,5 @@ /* - * "$Id: config.no-cygwin,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $" + * "$Id: config.no-cygwin,v 1.1.2.3.2.2 2001/10/19 14:04:08 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * @@ -179,8 +179,9 @@ #undef HAVE_PNG_GET_VALID #undef HAVE_PNG_SET_TRNS_TO_ALPHA +#undef HAVE_PNG_READ_DESTROY /* - * End of "$Id: config.no-cygwin,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $". + * End of "$Id: config.no-cygwin,v 1.1.2.3.2.2 2001/10/19 14:04:08 easysw Exp $". */ diff --git a/makefiles/config.os2x b/makefiles/config.os2x index f7dc25cde..5c31357e6 100644 --- a/makefiles/config.os2x +++ b/makefiles/config.os2x @@ -1,5 +1,5 @@ /* - * "$Id: config.os2x,v 1.1.2.4.2.1 2001/10/01 16:49:29 easysw Exp $" + * "$Id: config.os2x,v 1.1.2.4.2.2 2001/10/19 14:04:08 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * @@ -176,8 +176,9 @@ #undef HAVE_PNG_GET_VALID #undef HAVE_PNG_SET_TRNS_TO_ALPHA +#undef HAVE_PNG_READ_DESTROY /* - * End of "$Id: config.os2x,v 1.1.2.4.2.1 2001/10/01 16:49:29 easysw Exp $". + * End of "$Id: config.os2x,v 1.1.2.4.2.2 2001/10/19 14:04:08 easysw Exp $". */ diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 93c79396a..92560fe23 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.cxx,v 1.1.2.5 2001/10/16 20:25:24 easysw Exp $" +// "$Id: Fl_Help_View.cxx,v 1.1.2.6 2001/10/19 14:04:08 easysw Exp $" // // Fl_Help_View widget routines. // @@ -3114,7 +3114,11 @@ Fl_Help_View::load_png(Fl_Help_Image *img,// I - Image pointer free(rows); png_read_end(pp, info); +# ifdef HAVE_PNG_READ_DESTROY png_read_destroy(pp, info, NULL); +# else + png_destroy_read_struct(pp, info, NULL); +# endif // HAVE_PNG_READ_DESTROY return (1); } @@ -3580,5 +3584,5 @@ scrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx,v 1.1.2.5 2001/10/16 20:25:24 easysw Exp $". +// End of "$Id: Fl_Help_View.cxx,v 1.1.2.6 2001/10/19 14:04:08 easysw Exp $". // |