Applied #9011: Native wxListCtrl::HitTest on OS X

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

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 2ffb924bf9bbb57574aa71d7656b698480ce0207..14fd9eddb1bae5669b911390af956e76c83d9942 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -148,29 +148,31 @@ struct wxPNGInfoStruct
 extern "C"
 {
 
 extern "C"
 {
 

-void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data,
-                                          png_size_t length )
+static void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data,
+                                                 png_size_t length )

 {
     WX_PNG_INFO(png_ptr)->stream.in->Read(data, length);
 }
 
 {
     WX_PNG_INFO(png_ptr)->stream.in->Read(data, length);
 }
 

-void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data,
-                                          png_size_t length )
+static void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data,
+                                                 png_size_t length )

 {
     WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
 }
 
 {
     WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
 }
 

-void
+static void

 PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
 {
     wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
     if ( !info || info->verbose )
 PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
 {
     wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
     if ( !info || info->verbose )

+    {

         wxLogWarning( wxString::FromAscii(message) );
         wxLogWarning( wxString::FromAscii(message) );

+    }

 }
 
 // from pngerror.c
 // so that the libpng doesn't send anything on stderr
 }
 
 // from pngerror.c
 // so that the libpng doesn't send anything on stderr

-void
+static void

 PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message)
 {
     wx_png_warning(NULL, message);
 PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message)
 {
     wx_png_warning(NULL, message);


@@ -302,7 +304,7 @@ bool wxPNGHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[4];
 
 {
     unsigned char hdr[4];
 

-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here

         return false;
 
     return memcmp(hdr, "\211PNG", WXSIZEOF(hdr)) == 0;
         return false;
 
     return memcmp(hdr, "\211PNG", WXSIZEOF(hdr)) == 0;


@@ -385,7 +387,7 @@ void CopyDataFromPNG(wxImage *image,
 
                         // must be opaque then as otherwise we shouldn't be
                         // using the mask at all
 
                         // must be opaque then as otherwise we shouldn't be
                         // using the mask at all

-                        wxASSERT_MSG( IsOpaque(a), _T("logic error") );
+                        wxASSERT_MSG( IsOpaque(a), wxT("logic error") );

 
                         // fall through
 
 
                         // fall through
 


@@ -453,7 +455,7 @@ void CopyDataFromPNG(wxImage *image,
                         {
                             // must be opaque then as otherwise we shouldn't be
                             // using the mask at all
                         {
                             // must be opaque then as otherwise we shouldn't be
                             // using the mask at all

-                            wxASSERT_MSG( IsOpaque(a), _T("logic error") );
+                            wxASSERT_MSG( IsOpaque(a), wxT("logic error") );

 
                             // if we couldn't find a unique colour for the
                             // mask, we can have real pixels with the same
 
                             // if we couldn't find a unique colour for the
                             // mask, we can have real pixels with the same


@@ -558,18 +560,16 @@ wxPNGHandler::LoadFile(wxImage *image,
     if (!image->Ok())
         goto error;
 
     if (!image->Ok())
         goto error;
 

-    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
+    // initialize all line pointers to NULL to ensure that they can be safely
+    // free()d if an error occurs before all of them could be allocated
+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));

     if ( !lines )
         goto error;
 
     for (i = 0; i < height; i++)
     {
         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
     if ( !lines )
         goto error;
 
     for (i = 0; i < height; i++)
     {
         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)

-        {
-            for ( unsigned int n = 0; n < i; n++ )
-                free( lines[n] );

             goto error;
             goto error;

-        }

     }
 
     png_read_image( png_ptr, lines );
     }
 
     png_read_image( png_ptr, lines );


@@ -610,7 +610,9 @@ wxPNGHandler::LoadFile(wxImage *image,
 
 error:
     if (verbose)
 
 error:
     if (verbose)

+    {

        wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
        wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));

+    }

 
     if ( image->Ok() )
     {
 
     if ( image->Ok() )
     {


@@ -659,7 +661,9 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     if (!png_ptr)
     {
         if (verbose)
     if (!png_ptr)
     {
         if (verbose)

+        {

            wxLogError(_("Couldn't save PNG image."));
            wxLogError(_("Couldn't save PNG image."));

+        }

         return false;
     }
 
         return false;
     }
 


@@ -668,7 +672,9 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     {
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
         if (verbose)
     {
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
         if (verbose)

+        {

            wxLogError(_("Couldn't save PNG image."));
            wxLogError(_("Couldn't save PNG image."));

+        }

         return false;
     }
 
         return false;
     }
 


@@ -676,7 +682,9 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     {
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
         if (verbose)
     {
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
         if (verbose)

+        {

            wxLogError(_("Couldn't save PNG image."));
            wxLogError(_("Couldn't save PNG image."));

+        }

         return false;
     }
 
         return false;
     }
 


@@ -691,9 +699,6 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
                             ? image->GetOptionInt(wxIMAGE_OPTION_PNG_BITDEPTH)
                             : 8;
 
                             ? image->GetOptionInt(wxIMAGE_OPTION_PNG_BITDEPTH)
                             : 8;
 

-    wxASSERT_MSG( iBitDepth == 8 || iBitDepth == 16,
-                    _T("PNG bit depth must be 8 or 16") );
-

     bool bHasAlpha = image->HasAlpha();
     bool bHasMask = image->HasMask();
     bool bUseAlpha = bHasAlpha || bHasMask;
     bool bHasAlpha = image->HasAlpha();
     bool bHasMask = image->HasMask();
     bool bUseAlpha = bHasAlpha || bHasMask;


@@ -776,7 +781,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG( _T("unsupported image resolution units") );
+            wxFAIL_MSG( wxT("unsupported image resolution units") );

     }
 
     if ( resX && resY )
     }
 
     if ( resX && resY )


@@ -823,7 +828,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
             switch ( iColorType )
             {
                 default:
             switch ( iColorType )
             {
                 default:

-                    wxFAIL_MSG( _T("unknown wxPNG_TYPE_XXX") );
+                    wxFAIL_MSG( wxT("unknown wxPNG_TYPE_XXX") );

                     // fall through
 
                 case wxPNG_TYPE_COLOUR:
                     // fall through
 
                 case wxPNG_TYPE_COLOUR: