OS/2 fixes for new PNG lib

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index b6dc8e43b0688a420836dc6def39c512fdd5c560..b07ea6c6877d008511c3aadafa2fc7f74dd194f0 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -8,20 +8,20 @@ LIBTARGET=$(WXDIR)\lib\pngd.lib
 !endif
 
 OBJECTS = $D\png.obj \
 !endif
 
 OBJECTS = $D\png.obj \

+          $D\pngerror.obj \
+          $D\pngget.obj \
+          $D\pngmem.obj \
+          $D\pngpread.obj \

           $D\pngread.obj \
           $D\pngread.obj \

+          $D\pngrio.obj \

           $D\pngrtran.obj \
           $D\pngrutil.obj \
           $D\pngrtran.obj \
           $D\pngrutil.obj \

-          $D\pngpread.obj \
+          $D\pngset.obj \

           $D\pngtrans.obj \
           $D\pngtrans.obj \

+          $D\pngwio.obj \

           $D\pngwrite.obj \
           $D\pngwtran.obj \
           $D\pngwrite.obj \
           $D\pngwtran.obj \

-          $D\pngwutil.obj \
-          $D\pngerror.obj \
-          $D\pngmem.obj \
-          $D\pngwio.obj \
-          $D\pngrio.obj \
-          $D\pngget.obj \
-          $D\pngset.obj
+          $D\pngwutil.obj

 
 
 
 
 
 

diff --git a/src/png/png.c b/src/png/png.c
index 380c19c8cb1c4d578110a481c59b7770abd247e6..68c7d1adb88ea0a3b3c38d417b70fd3d264b3375 100644 (file)
--- a/src/png/png.c
+++ b/src/png/png.c
@@ -82,6 +82,10 @@ const int FARDATA png_pass_dsp_mask[]
 
 #endif
 
 
 #endif
 

+#ifdef __VISAGECPP__
+const char png_libpng_ver[18] = "1.2.4";
+#endif
+

 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
  * stream we can set num_bytes = 8 so that libpng will not attempt to read
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
  * stream we can set num_bytes = 8 so that libpng will not attempt to read


@@ -144,7 +148,7 @@ png_zalloc(voidpf png_ptr, uInt items, uInt size)
 {
    png_uint_32 num_bytes = (png_uint_32)items * size;
    png_voidp ptr;
 {
    png_uint_32 num_bytes = (png_uint_32)items * size;
    png_voidp ptr;

-   png_structp p=png_ptr;
+   png_structp p=(png_structp)png_ptr;

    png_uint_32 save_flags=p->flags;
 
    p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
    png_uint_32 save_flags=p->flags;
 
    p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;

diff --git a/src/png/pngconf.h b/src/png/pngconf.h
index 2a52920e3344d39edc4634eaaf7c7070334973d0..46fc4d811449356f8493c35de9e26eb098688311 100644 (file)
--- a/src/png/pngconf.h
+++ b/src/png/pngconf.h
@@ -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
 


@@ -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


@@ -1162,7 +1162,7 @@ typedef z_stream FAR *  png_zstreamp;
 #  define PNGAPI __cdecl
 #  undef PNG_IMPEXP
 #  define PNG_IMPEXP
 #  define PNGAPI __cdecl
 #  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.


@@ -1228,7 +1228,7 @@ typedef z_stream FAR *  png_zstreamp;
 #     endif
 #  endif  /* PNG_IMPEXP */
 #else /* !(DLL || non-cygwin WINDOWS) */
 #     endif
 #  endif  /* PNG_IMPEXP */
 #else /* !(DLL || non-cygwin WINDOWS) */

-#    if (defined(__IBMC__) || defined(IBMCPP__)) && defined(__OS2__)
+#    if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)

 #      define PNGAPI _System
 #      define PNG_IMPEXP
 #    else
 #      define PNGAPI _System
 #      define PNG_IMPEXP
 #    else


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

+#if defined(__VISAGECPP__)
+/* I don't compile with _System linkage, ever! */
+#  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 +1331,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. */