Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 23:42:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Check for png_read_destroy(), since newer versions of libpng do not

Browse Source 
provide (or export) this function.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1641 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2001-10-19 14:04:08 +00:00
parent 874fc2ecb0
commit 461002c3ad
8 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+4
View File
@@ -38,6 +38,10 @@ CHANGES IN FLTK 1.1.0b4
- The editor demo had the save and discard button - The editor demo had the save and discard button
actions reversed. 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 CHANGES IN FLTK 1.1.0b3
configh.in
+3 -2
View File
@@ -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). * Configuration file for the Fast Light Tool Kit (FLTK).
* @configure_input@ * @configure_input@
@@ -197,8 +197,9 @@
#undef HAVE_PNG_GET_VALID #undef HAVE_PNG_GET_VALID
#undef HAVE_PNG_SET_TRNS_TO_ALPHA #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 $".
*/ */
configure.in
+3 -3
View File
@@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl 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
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@@ -203,7 +203,7 @@ AC_CHECK_HEADER(png.h,
AC_DEFINE(HAVE_LIBPNG) AC_DEFINE(HAVE_LIBPNG)
IMAGELIBS="-lpng -lm$IMAGELIBS" IMAGELIBS="-lpng -lm$IMAGELIBS"
LIBS="-lpng -lm $LIBS" 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... dnl Restore original LIBS settings...
LIBS="$SAVELIBS" LIBS="$SAVELIBS"
@@ -474,5 +474,5 @@ AC_OUTPUT(makeinclude fltk-config)
chmod +x fltk-config chmod +x fltk-config
dnl 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 dnl
makefiles/config.cygwin
+3 -2
View File
@@ -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). * Configuration file for the Fast Light Tool Kit (FLTK).
* *
@@ -179,8 +179,9 @@
#undef HAVE_PNG_GET_VALID #undef HAVE_PNG_GET_VALID
#undef HAVE_PNG_SET_TRNS_TO_ALPHA #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 $".
*/ */
makefiles/config.mingw
+3 -2
View File
@@ -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). * Configuration file for the Fast Light Tool Kit (FLTK).
* *
@@ -179,8 +179,9 @@
#undef HAVE_PNG_GET_VALID #undef HAVE_PNG_GET_VALID
#undef HAVE_PNG_SET_TRNS_TO_ALPHA #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 $".
*/ */
makefiles/config.no-cygwin
+3 -2
View File
@@ -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). * Configuration file for the Fast Light Tool Kit (FLTK).
* *
@@ -179,8 +179,9 @@
#undef HAVE_PNG_GET_VALID #undef HAVE_PNG_GET_VALID
#undef HAVE_PNG_SET_TRNS_TO_ALPHA #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 $".
*/ */
makefiles/config.os2x
+3 -2
View File
@@ -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). * Configuration file for the Fast Light Tool Kit (FLTK).
* *
@@ -176,8 +176,9 @@
#undef HAVE_PNG_GET_VALID #undef HAVE_PNG_GET_VALID
#undef HAVE_PNG_SET_TRNS_TO_ALPHA #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 $".
*/ */
src/Fl_Help_View.cxx
+6 -2
View File
@@ -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. // Fl_Help_View widget routines.
// //
@@ -3114,7 +3114,11 @@ Fl_Help_View::load_png(Fl_Help_Image *img,// I - Image pointer
free(rows); free(rows);
png_read_end(pp, info); png_read_end(pp, info);
# ifdef HAVE_PNG_READ_DESTROY
png_read_destroy(pp, info, NULL); png_read_destroy(pp, info, NULL);
# else
png_destroy_read_struct(pp, info, NULL);
# endif // HAVE_PNG_READ_DESTROY
return (1); 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 $".
// //