somebody added #ifdefed #pragma to disable warnings about // in c source, instead...

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

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index a2f0c435ed3a460b8279a846402814c432290f94..f869ffedee51cb09a7e1601ed3860d7629e08267 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -7,10 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-/*
-   We don't put pragma implement in this file because it is already present in
-   src/common/image.cpp
-*/
+#ifdef __GNUG__
+#pragma implementation "imagpng.h"
+#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -25,7 +24,7 @@
 
 #if wxUSE_LIBPNG
 
 
 #if wxUSE_LIBPNG
 

-#include "wx/image.h"
+#include "wx/imagpng.h"

 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"


@@ -53,9 +52,7 @@
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)

-#endif

 
 #if wxUSE_LIBPNG
 
 
 #if wxUSE_LIBPNG
 


@@ -96,7 +93,7 @@ LINKAGEMODE png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WX
 {
 }
 
 {
 }
 

-bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose)
+bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )

 {
     // VZ: as this function uses setjmp() the only fool proof error handling
     //     method is to use goto (setjmp is not really C++ dtors friendly...)
 {
     // VZ: as this function uses setjmp() the only fool proof error handling
     //     method is to use goto (setjmp is not really C++ dtors friendly...)


@@ -144,18 +141,18 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
         png_set_expand( png_ptr );
     png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER );
 
         png_set_expand( png_ptr );
     png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER );
 

-    image->Create( width, height );
+    image->Create( (int)width, (int)height );

 
     if (!image->Ok())
         goto error_nolines;
 
 
     if (!image->Ok())
         goto error_nolines;
 

-    lines = (unsigned char **)malloc( height * sizeof(unsigned char *) );
+    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );

     if (lines == NULL)
         goto error_nolines;
 
     for (i = 0; i < height; i++)
     {
     if (lines == NULL)
         goto error_nolines;
 
     for (i = 0; i < height; i++)
     {

-        if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL)
+        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] );
         {
             for ( unsigned int n = 0; n < i; n++ )
                 free( lines[n] );


@@ -167,6 +164,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     {
         int transp = 0;
         png_read_image( png_ptr, lines );
     {
         int transp = 0;
         png_read_image( png_ptr, lines );

+        png_read_end( png_ptr, info_ptr );

         png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
         unsigned char *ptr = image->GetData();
         if ((color_type == PNG_COLOR_TYPE_GRAY) ||
         png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
         unsigned char *ptr = image->GetData();
         if ((color_type == PNG_COLOR_TYPE_GRAY) ||


@@ -243,7 +241,8 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
  error_nolines:
     lines = NULL; // called from before it was set
  error:
  error_nolines:
     lines = NULL; // called from before it was set
  error:

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

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


@@ -278,7 +277,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
             return FALSE;
         }
 
             return FALSE;
         }
 

-       if (!verbose) png_set_error_fn(png_ptr, (png_voidp)NULL, png_silent_error, png_silent_warning);
+        if (!verbose) png_set_error_fn(png_ptr, (png_voidp)NULL, png_silent_error, png_silent_warning);

 
         png_infop info_ptr = png_create_info_struct(png_ptr);
         if (info_ptr == NULL)
 
         png_infop info_ptr = png_create_info_struct(png_ptr);
         if (info_ptr == NULL)


@@ -324,7 +323,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
                 data[(x << 2) + 0] = *ptr++;
                 data[(x << 2) + 1] = *ptr++;
                 data[(x << 2) + 2] = *ptr++;
                 data[(x << 2) + 0] = *ptr++;
                 data[(x << 2) + 1] = *ptr++;
                 data[(x << 2) + 2] = *ptr++;

-                if (( !image->HasMask() ) || \
+                if (( !image->HasMask() ) || \

                     (data[(x << 2) + 0] != image->GetMaskRed()) || \
                     (data[(x << 2) + 1] != image->GetMaskGreen()) || \
                     (data[(x << 2) + 2] != image->GetMaskBlue()))
                     (data[(x << 2) + 0] != image->GetMaskRed()) || \
                     (data[(x << 2) + 1] != image->GetMaskGreen()) || \
                     (data[(x << 2) + 2] != image->GetMaskBlue()))


@@ -347,7 +346,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxPNGHandler::CanRead( wxInputStream& stream )
+bool wxPNGHandler::DoCanRead( wxInputStream& stream )

 {
     unsigned char hdr[4];
 
 {
     unsigned char hdr[4];