Updated wxvc_dll.dsp and memory.h to make VC++ compile in DLL mode again

[wxWidgets.git] / src / common / imagpng.cpp

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 1b3a06663955197325bcd50795226113c0b2018f..cee55ca261b4e1183a171b9b1639bbaa6c9396ab 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -7,10 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-/*
-   We don't put pragma implement in this file because it is already present in
-   src/common/image.cpp
-*/
+#ifdef __GNUG__
+#pragma implementation "imagpng.h"
+#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -25,7 +24,7 @@
 
 #if wxUSE_LIBPNG
 
-#include "wx/image.h"
+#include "wx/imagpng.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"
@@ -53,11 +52,9 @@
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
-#endif
 
-#if wxUSE_STREAMS
+#if wxUSE_LIBPNG
 
 #if defined(__VISAGECPP__)
 #define LINKAGEMODE _Optlink
@@ -75,7 +72,28 @@ static void LINKAGEMODE _PNG_stream_writer( png_structp png_ptr, png_bytep data,
     ((wxOutputStream*) png_get_io_ptr( png_ptr )) -> Write(data, length);
 }
 
-bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream )
+// from pngerror.c
+// so that the libpng doesn't send anything on stderr
+void
+LINKAGEMODE png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message))
+{
+#ifdef USE_FAR_KEYWORD
+   {
+      jmp_buf jmpbuf;
+      png_memcpy(jmpbuf,png_ptr->jmpbuf,sizeof(jmp_buf));
+      longjmp(jmpbuf, 1);
+   }
+#else
+   longjmp(png_ptr->jmpbuf, 1);
+#endif
+}
+
+void
+LINKAGEMODE png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WXUNUSED(message))
+{
+}
+
+bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {
     // VZ: as this function uses setjmp() the only fool proof error handling
     //     method is to use goto (setjmp is not really C++ dtors friendly...)
@@ -93,6 +111,9 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream )
     if (!png_ptr)
         goto error_nolines;
 
+    // the file example.c explain how to guess if the stream is a png image
+    if (!verbose) png_set_error_fn(png_ptr, (png_voidp)NULL, png_silent_error, png_silent_warning);
+
     info_ptr = png_create_info_struct( png_ptr );
     if (!info_ptr)
         goto error_nolines;
@@ -143,6 +164,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream )
     {
         int transp = 0;
         png_read_image( png_ptr, lines );
+        png_read_end( png_ptr, info_ptr );
         png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
         unsigned char *ptr = image->GetData();
         if ((color_type == PNG_COLOR_TYPE_GRAY) ||
@@ -219,7 +241,8 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream )
  error_nolines:
     lines = NULL; // called from before it was set
  error:
-    wxLogError(_("Couldn't load a PNG image - probably file is corrupted."));
+    if (verbose)
+       wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
 
     if ( image->Ok() )
     {
@@ -245,7 +268,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream )
 }
 
 
-bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
+bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
 {
     {
         png_structp png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ -254,6 +277,8 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
             return FALSE;
         }
 
+        if (!verbose) png_set_error_fn(png_ptr, (png_voidp)NULL, png_silent_error, png_silent_warning);
+
         png_infop info_ptr = png_create_info_struct(png_ptr);
         if (info_ptr == NULL)
         {
@@ -298,15 +323,16 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
                 data[(x << 2) + 0] = *ptr++;
                 data[(x << 2) + 1] = *ptr++;
                 data[(x << 2) + 2] = *ptr++;
-                if ((data[(x << 2) + 0] == image->GetMaskRed()) &&
-                    (data[(x << 2) + 1] == image->GetMaskGreen()) &&
-                    (data[(x << 2) + 2] == image->GetMaskBlue()))
+                if (( !image->HasMask() ) || \
+                    (data[(x << 2) + 0] != image->GetMaskRed()) || \
+                    (data[(x << 2) + 1] != image->GetMaskGreen()) || \
+                    (data[(x << 2) + 2] != image->GetMaskBlue()))
                 {
-                    data[(x << 2) + 3] = 0;
+                    data[(x << 2) + 3] = 255;
                 }
                 else
                 {
-                    data[(x << 2) + 3] = 255;
+                    data[(x << 2) + 3] = 0;
                 }
             }
             png_bytep row_ptr = data;
@@ -320,9 +346,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
     return TRUE;
 }
 
-#endif
-  // wxUSE_STREAMS
+bool wxPNGHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[4];
 
-#endif
-  // wxUSE_LIBPNG
+    stream.Read(&hdr, 4);
+    stream.SeekI(-4, wxFromCurrent);
+    return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G');
+}
+
+#endif  // wxUSE_STREAMS
 
+#endif  // wxUSE_LIBPNG