wxTinderbox warning fix.

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

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 501f901e6b27148fe536994c67a713305bd84640..98d19795727299251c4dc45607d47d0cd47e4364 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -11,10 +11,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagpng.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -109,7 +105,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 #if wxUSE_STREAMS
 
 #ifndef PNGLINKAGEMODE
 #if wxUSE_STREAMS
 
 #ifndef PNGLINKAGEMODE

-    #ifdef __WATCOMC__
+    #if defined(__WATCOMC__) && ( defined(__WXMSW__) || defined(__WXMGL__) )

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


@@ -172,14 +168,6 @@ void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data,
     WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
 }
 
     WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
 }
 

-// from pngerror.c
-// so that the libpng doesn't send anything on stderr
-void
-PNGLINKAGEMODE wx_png_error(png_structp WXUNUSED(png_ptr), png_const_charp message)
-{
-    wxLogFatalError( wxString::FromAscii(message) );
-}
-

 void
 PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
 {
 void
 PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
 {


@@ -188,6 +176,17 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
         wxLogWarning( wxString::FromAscii(message) );
 }
 
         wxLogWarning( wxString::FromAscii(message) );
 }
 

+// from pngerror.c
+// so that the libpng doesn't send anything on stderr
+void
+PNGLINKAGEMODE wx_png_error(png_structp WXUNUSED(png_ptr), png_const_charp message)
+{
+    // JS: deliver it to wx_png_warning and don't perform any more actions:
+    // libpng will jump back to the calling function (LoadFile and SaveFile)
+    // and allow it to handle the error
+    wx_png_warning(NULL, message);
+}
+

 } // extern "C"
 
 // ----------------------------------------------------------------------------
 } // extern "C"
 
 // ----------------------------------------------------------------------------


@@ -717,6 +716,9 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
         iElements++;
     }
 
         iElements++;
     }
 

+    if ( iBitDepth == 16 )
+        iElements *= 2;
+

     png_set_sBIT( png_ptr, info_ptr, &sig_bit );
     png_write_info( png_ptr, info_ptr );
     png_set_shift( png_ptr, &sig_bit );
     png_set_sBIT( png_ptr, info_ptr, &sig_bit );
     png_write_info( png_ptr, info_ptr );
     png_set_shift( png_ptr, &sig_bit );


@@ -735,9 +737,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     int iHeight = image->GetHeight();
     int iWidth = image->GetWidth();
 
     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)
     unsigned char *pColors = image->GetData();
 
     for (int y = 0; y != iHeight; ++y)


@@ -757,36 +765,34 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
 
                 case wxPNG_TYPE_COLOUR:
                     *pData++ = uchRed;
 
                 case wxPNG_TYPE_COLOUR:
                     *pData++ = uchRed;

-                    if (iBitDepth > 8)
+                    if ( iBitDepth == 16 )

                         *pData++ = 0;
                     *pData++ = uchGreen;
                         *pData++ = 0;
                     *pData++ = uchGreen;

-                    if (iBitDepth > 8)
+                    if ( iBitDepth == 16 )

                         *pData++ = 0;
                     *pData++ = uchBlue;
                         *pData++ = 0;
                     *pData++ = uchBlue;

-                    if (iBitDepth > 8)
+                    if ( iBitDepth == 16 )

                         *pData++ = 0;
                     break;
 
                 case wxPNG_TYPE_GREY:
                     {
                         *pData++ = 0;
                     break;
 
                 case wxPNG_TYPE_GREY:
                     {

+                        // where do these coefficients come from? maybe we
+                        // should have image options for them as well?

                         unsigned uiColor =
                             (unsigned) (76.544*(unsigned)uchRed +
                                         150.272*(unsigned)uchGreen +
                                         36.864*(unsigned)uchBlue);
                         unsigned uiColor =
                             (unsigned) (76.544*(unsigned)uchRed +
                                         150.272*(unsigned)uchGreen +
                                         36.864*(unsigned)uchBlue);

-                        uiColor >>= (16 - iBitDepth);
-                        if (iBitDepth > 8)
-                        {
-                            *pData++ = (unsigned char)((uiColor >> 8) & 0xFF);
-                            *pData++ = (unsigned char)(uiColor & 0xFF);
-                        } else {
+
+                        *pData++ = (unsigned char)((uiColor >> 8) & 0xFF);
+                        if ( iBitDepth == 16 )

                             *pData++ = (unsigned char)(uiColor & 0xFF);
                             *pData++ = (unsigned char)(uiColor & 0xFF);

-                        }

                     }
                     break;
 
                 case wxPNG_TYPE_GREY_RED:
                     *pData++ = uchRed;
                     }
                     break;
 
                 case wxPNG_TYPE_GREY_RED:
                     *pData++ = uchRed;

-                    if (iBitDepth > 8)
+                    if ( iBitDepth == 16 )

                         *pData++ = 0;
                     break;
             }
                         *pData++ = 0;
                     break;
             }


@@ -806,7 +812,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
                 }
 
                 *pData++ = uchAlpha;
                 }
 
                 *pData++ = uchAlpha;

-                if (iBitDepth > 8)
+                if ( iBitDepth == 16 )

                     *pData++ = 0;
             }
         }
                     *pData++ = 0;
             }
         }