honour the 2nd parameter of DeleteEntry() instead of always deleting empty groups...

[wxWidgets.git] / src / png / pngconf.h

diff --git a/src/png/pngconf.h b/src/png/pngconf.h
index 2a52920e3344d39edc4634eaaf7c7070334973d0..7b60f45b5bd1626688149b9206ea569541c30165 100644 (file)
--- a/src/png/pngconf.h
+++ b/src/png/pngconf.h
@@ -1,6 +1,6 @@
 /* pngconf.h - machine configurable file for libpng
  *
 /* pngconf.h - machine configurable file for libpng
  *

- * libpng 1.2.4 - July 8, 2002
+ * libpng 1.2.5rc3 - September 18, 2002

  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2002 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2002 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)


@@ -80,9 +80,9 @@
  * 'Cygwin' defines/defaults:
  *   PNG_BUILD_DLL -- (ignored) building the dll
  *   (no define)   -- (ignored) building an application, linking to the dll
  * 'Cygwin' defines/defaults:
  *   PNG_BUILD_DLL -- (ignored) building the dll
  *   (no define)   -- (ignored) building an application, linking to the dll

- *   PNG_STATIC    -- (ignored) building the static lib, or building an 
+ *   PNG_STATIC    -- (ignored) building the static lib, or building an

  *                    application that links to the static lib.
  *                    application that links to the static lib.

- *   ALL_STATIC    -- (ignored) building various static libs, or building an 
+ *   ALL_STATIC    -- (ignored) building various static libs, or building an

  *                    application that links to the static libs.
  * Thus,
  * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
  *                    application that links to the static libs.
  * Thus,
  * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and


@@ -95,12 +95,12 @@
  *   PNG_BUILD_DLL
  *   PNG_STATIC
  *   (nothing) == PNG_USE_DLL
  *   PNG_BUILD_DLL
  *   PNG_STATIC
  *   (nothing) == PNG_USE_DLL

- * 
+ *

  * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
  * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent

- *   of auto-import in binutils, we no longer need to worry about 
+ *   of auto-import in binutils, we no longer need to worry about

  *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
  *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
  *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
  *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes

- *   to __declspec() stuff.  However, we DO need to worry about 
+ *   to __declspec() stuff.  However, we DO need to worry about

  *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
  *   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
  */
  *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
  *   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
  */


@@ -144,8 +144,8 @@
 #        if !defined(PNG_DLL)
 #          define PNG_DLL
 #        endif
 #        if !defined(PNG_DLL)
 #          define PNG_DLL
 #        endif

-#      endif  
-#    endif  
+#      endif
+#    endif

 #  endif
 #endif
 
 #  endif
 #endif
 


@@ -227,7 +227,7 @@
  */
 #ifndef MACOS
 #  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
  */
 #ifndef MACOS
 #  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \

-      defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
+      defined(THINK_C) || (defined(__SC__) && !defined(__DMC__))|| defined(TARGET_OS_MAC)

 #    define MACOS
 #  endif
 #endif
 #    define MACOS
 #  endif
 #endif


@@ -640,7 +640,7 @@
 #  define PNG_EASY_ACCESS_SUPPORTED
 #endif
 
 #  define PNG_EASY_ACCESS_SUPPORTED
 #endif
 

-/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0 
+/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0

    even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */
 #if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
 #  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
    even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */
 #if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
 #  ifndef PNG_ASSEMBLER_CODE_SUPPORTED


@@ -1157,12 +1157,16 @@ typedef z_stream FAR *  png_zstreamp;
 #  endif
 #endif
 
 #  endif
 #endif
 

-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__WINE__)

 #  undef PNGAPI
 #  undef PNGAPI

-#  define PNGAPI __cdecl
+#  if defined(__WINE__)
+#    define PNGAPI
+#  else
+#    define PNGAPI __cdecl
+#  endif

 #  undef PNG_IMPEXP
 #  define PNG_IMPEXP
 #  undef PNG_IMPEXP
 #  define PNG_IMPEXP

-#endif  
+#endif

 
 /* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
  * you may get warnings regarding the linkage of png_zalloc and png_zfree.
 
 /* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
  * you may get warnings regarding the linkage of png_zalloc and png_zfree.


@@ -1241,6 +1245,20 @@ typedef z_stream FAR *  png_zstreamp;
 #endif
 #endif
 
 #endif
 #endif
 

+#if defined(__VISAGECPP__)
+/* I don't compile with this _System linkage for wxWindows */
+#  ifdef PNGAPI
+#    undef PNGAPI
+#  endif
+#  define PNGAPI _Optlink
+#  define PNG_IMPEXP
+#  define PNG_USE_LOCAL_ARRAYS
+#  ifdef PNG_USE_GLOBAL_ARRAYS
+#    undef PNG_USE_GLOBAL_ARRAYS
+#  endif
+extern const char png_libpng_ver[18];
+#endif
+

 #ifndef PNGAPI
 #  define PNGAPI
 #endif
 #ifndef PNGAPI
 #  define PNGAPI
 #endif


@@ -1317,7 +1335,7 @@ typedef z_stream FAR *  png_zstreamp;
 #  define PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT  128  /*  >=  */
 #endif
 #ifndef PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT
 #  define PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT  128  /*  >=  */
 #endif
 #ifndef PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT

-#  define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT  9    /*  >=  */   
+#  define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT  9    /*  >=  */

 #endif
 
 /* Set this in the makefile for VC++ on Pentium, not here. */
 #endif
 
 /* Set this in the makefile for VC++ on Pentium, not here. */