X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/deb2fec01e097102e2799d7d0797f66dbae4f0c4..e16ebee6a9cb46e71b5e15fe14edf61fd790bb14:/src/common/imagpng.cpp

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 1a27982b12..132655980c 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -57,7 +57,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 #endif
 
-#if wxUSE_STREAMS
+#if wxUSE_LIBPNG
 
 #if defined(__VISAGECPP__)
 #define LINKAGEMODE _Optlink
@@ -78,7 +78,7 @@ static void LINKAGEMODE _PNG_stream_writer( png_structp png_ptr, png_bytep data,
 // from pngerror.c
 // so that the libpng doesn't send anything on stderr
 void
-png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message))
+LINKAGEMODE png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message))
 {
 #ifdef USE_FAR_KEYWORD
    {
@@ -92,7 +92,7 @@ png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message))
 }
 
 void
-png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WXUNUSED(message))
+LINKAGEMODE png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WXUNUSED(message))
 {
 }
 
@@ -278,7 +278,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
             return FALSE;
         }
 
-	if (!verbose) png_set_error_fn(png_ptr, (png_voidp)NULL, png_silent_error, png_silent_warning);
+        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)
@@ -324,15 +324,16 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
                 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;
@@ -346,9 +347,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     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