]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/imagpng.cpp
Ambiguous overload fix for gcc
[wxWidgets.git] / src / common / imagpng.cpp
index e5d7fd48a52757b5103d1f59094bc7c92876fb32..c277cf17b7aa5c859bbebcb8c0a6188b0a22d611 100644 (file)
 // declarations
 // ============================================================================
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagpng.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -109,7 +105,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 #if wxUSE_STREAMS
 
 #ifndef PNGLINKAGEMODE
-    #ifdef __WATCOMC__
+    #if defined(__WATCOMC__) && ( defined(__WXMSW__) || __WATCOMC__ > 1230 )
         // we need an explicit cdecl for Watcom, at least according to
         //
         // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863
@@ -738,9 +734,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     int iHeight = image->GetHeight();
     int iWidth = image->GetWidth();
 
-    unsigned char uchMaskRed = bHasMask ? image->GetMaskRed() : 0;
-    unsigned char uchMaskGreen = bHasMask ? image->GetMaskGreen() : 0;
-    unsigned char uchMaskBlue = bHasMask ? image->GetMaskBlue() : 0;
+    unsigned char uchMaskRed = 0, uchMaskGreen = 0, uchMaskBlue = 0;
+
+    if ( bHasMask )
+    {
+        uchMaskRed = image->GetMaskRed();
+        uchMaskGreen = image->GetMaskGreen();
+        uchMaskBlue = image->GetMaskBlue();
+    }
+
     unsigned char *pColors = image->GetData();
 
     for (int y = 0; y != iHeight; ++y)