resolved a conflict

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

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 7d8cfcad54aff520f35689ab4a2dce964d6b6cd5..a2f0c435ed3a460b8279a846402814c432290f94 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -23,7 +23,7 @@
   #include "wx/defs.h"
 #endif
 
-#if wxUSE_STREAMS && wxUSE_LIBPNG
+#if wxUSE_LIBPNG
 
 #include "wx/image.h"
 #include "wx/bitmap.h"
@@ -57,6 +57,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 #endif
 
+#if wxUSE_LIBPNG
+
 #if defined(__VISAGECPP__)
 #define LINKAGEMODE _Optlink
 #else
@@ -322,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;
@@ -353,5 +356,6 @@ bool wxPNGHandler::CanRead( wxInputStream& stream )
     return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G');
 }
 
-#endif  // wxUSE_STREAMS && wxUSE_LIBPNG
+#endif  // wxUSE_STREAMS
 
+#endif  // wxUSE_LIBPNG