Compilo.

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

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index d0da8f6111f7c64a2797c6522ab6993c7a27955a..f3fe5cbce85e73338baa90219eb1d47bdac220e4 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -160,12 +160,14 @@ struct wxPNGInfoStruct
 extern "C"
 {
 
 extern "C"
 {
 

-void PNGLINKAGEMODE _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length )
+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 _PNG_stream_writer( png_structp png_ptr, png_bytep data, png_size_t length )
+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);
 }


@@ -319,7 +321,7 @@ bool wxPNGHandler::DoCanRead( wxInputStream& stream )
     unsigned char hdr[4];
 
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
     unsigned char hdr[4];
 
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )

-        return FALSE;
+        return false;

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


@@ -540,7 +542,7 @@ wxPNGHandler::LoadFile(wxImage *image,
 
     // NB: please see the comment near wxPNGInfoStruct declaration for
     //     explanation why this line is mandatory
 
     // NB: please see the comment near wxPNGInfoStruct declaration for
     //     explanation why this line is mandatory

-    png_set_read_fn( png_ptr, &wxinfo, _PNG_stream_reader);
+    png_set_read_fn( png_ptr, &wxinfo, wx_PNG_stream_reader);

 
     info_ptr = png_create_info_struct( png_ptr );
     if (!info_ptr)
 
     info_ptr = png_create_info_struct( png_ptr );
     if (!info_ptr)


@@ -568,7 +570,7 @@ wxPNGHandler::LoadFile(wxImage *image,
         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( (int)width, (int)height );
+    image->Create((int)width, (int)height, false /* no need to init pixels */);

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


@@ -598,7 +600,7 @@ wxPNGHandler::LoadFile(wxImage *image,
         free( lines[i] );
     free( lines );
 
         free( lines[i] );
     free( lines );
 

-    return TRUE;
+    return true;

 
 error:
     if (verbose)
 
 error:
     if (verbose)


@@ -624,7 +626,7 @@ error:
         else
             png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
     }
         else
             png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
     }

-    return FALSE;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -643,7 +645,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     {
         if (verbose)
            wxLogError(_("Couldn't save PNG image."));
     {
         if (verbose)
            wxLogError(_("Couldn't save PNG image."));

-        return FALSE;
+        return false;

     }
 
     png_set_error_fn(png_ptr, (png_voidp)NULL, wx_png_error, wx_png_warning);
     }
 
     png_set_error_fn(png_ptr, (png_voidp)NULL, wx_png_error, wx_png_warning);


@@ -654,7 +656,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
         if (verbose)
            wxLogError(_("Couldn't save PNG image."));
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
         if (verbose)
            wxLogError(_("Couldn't save PNG image."));

-        return FALSE;
+        return false;

     }
 
     if (setjmp(wxinfo.jmpbuf))
     }
 
     if (setjmp(wxinfo.jmpbuf))


@@ -662,12 +664,12 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
         if (verbose)
            wxLogError(_("Couldn't save PNG image."));
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
         if (verbose)
            wxLogError(_("Couldn't save PNG image."));

-        return FALSE;
+        return false;

     }
 
     // NB: please see the comment near wxPNGInfoStruct declaration for
     //     explanation why this line is mandatory
     }
 
     // NB: please see the comment near wxPNGInfoStruct declaration for
     //     explanation why this line is mandatory

-    png_set_write_fn( png_ptr, &wxinfo, _PNG_stream_writer, NULL);
+    png_set_write_fn( png_ptr, &wxinfo, wx_PNG_stream_writer, NULL);

 
     png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(), 8,
         PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
 
     png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(), 8,
         PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,


@@ -687,7 +689,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     if (!data)
     {
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
     if (!data)
     {
         png_destroy_write_struct( &png_ptr, (png_infopp)NULL );

-        return FALSE;
+        return false;

     }
 
     for (int y = 0; y < image->GetHeight(); y++)
     }
 
     for (int y = 0; y < image->GetHeight(); y++)


@@ -698,7 +700,11 @@ 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->HasAlpha() )
+            {
+                data[(x << 2) + 3] = image->GetAlpha(x, y);
+            }
+            else 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()))


@@ -718,7 +724,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     png_write_end( png_ptr, info_ptr );
     png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr );
 
     png_write_end( png_ptr, info_ptr );
     png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr );
 

-    return TRUE;
+    return true;

 }
 
 #ifdef __VISUALC__
 }
 
 #ifdef __VISUALC__