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

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 501f901e6b..1d8a97046d 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -11,10 +11,6 @@
 // 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__) || 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
@@ -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);
 }
 
-// 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)
 {
@@ -188,6 +176,19 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp 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 png_ptr, png_const_charp message)
+{
+    wx_png_warning(NULL, message);
+
+    // we're not using libpng built-in jump buffer (see comment before
+    // wxPNGInfoStruct above) so we have to return ourselves, otherwise libpng
+    // would just abort
+    longjmp(WX_PNG_INFO(png_ptr)->jmpbuf, 1);
+}
+
 } // extern "C"
 
 // ----------------------------------------------------------------------------
@@ -507,13 +508,16 @@ wxPNGHandler::LoadFile(wxImage *image,
                        bool verbose,
                        int WXUNUSED(index))
 {
-    // VZ: as this function uses setjmp() the only fool proof error handling
+    // VZ: as this function uses setjmp() the only fool-proof error handling
     //     method is to use goto (setjmp is not really C++ dtors friendly...)
 
     unsigned char **lines = NULL;
     png_infop info_ptr = (png_infop) NULL;
     wxPNGInfoStruct wxinfo;
 
+    png_uint_32 i, width, height = 0;
+    int bit_depth, color_type, interlace_type;
+
     wxinfo.verbose = verbose;
     wxinfo.stream.in = &stream;
 
@@ -540,9 +544,6 @@ wxPNGHandler::LoadFile(wxImage *image,
     if (setjmp(wxinfo.jmpbuf))
         goto error;
 
-    png_uint_32 i, width, height;
-    int bit_depth, color_type, interlace_type;
-
     png_read_info( png_ptr, info_ptr );
     png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, (int*) NULL, (int*) NULL );
 
@@ -602,6 +603,9 @@ error:
 
     if ( lines )
     {
+        for ( unsigned int n = 0; n < height; n++ )
+            free( lines[n] );
+
         free( lines );
     }
 
@@ -717,6 +721,9 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
         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 );
@@ -735,9 +742,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)
@@ -757,36 +770,34 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
 
                 case wxPNG_TYPE_COLOUR:
                     *pData++ = uchRed;
-                    if (iBitDepth > 8)
+                    if ( iBitDepth == 16 )
                         *pData++ = 0;
                     *pData++ = uchGreen;
-                    if (iBitDepth > 8)
+                    if ( iBitDepth == 16 )
                         *pData++ = 0;
                     *pData++ = uchBlue;
-                    if (iBitDepth > 8)
+                    if ( iBitDepth == 16 )
                         *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);
-                        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);
-                        }
                     }
                     break;
 
                 case wxPNG_TYPE_GREY_RED:
                     *pData++ = uchRed;
-                    if (iBitDepth > 8)
+                    if ( iBitDepth == 16 )
                         *pData++ = 0;
                     break;
             }
@@ -806,7 +817,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
                 }
 
                 *pData++ = uchAlpha;
-                if (iBitDepth > 8)
+                if ( iBitDepth == 16 )
                     *pData++ = 0;
             }
         }