Rework the GTK WebKit backend history to remove the need for the map between wxWebHis...

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

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index c0b19395100aa8224ad965631bfbef145824ff1e..284f5d7171c669668720bbad1f3ff2ca4d639dba 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -43,7 +43,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-// image can not have any transparent pixels at all, have only 100% opaque
+// image cannot have any transparent pixels at all, have only 100% opaque

 // and/or 100% transparent pixels in which case a simple mask is enough to
 // store this information in wxImage or have a real alpha channel in which case
 // we need to have it in wxImage as well
 // and/or 100% transparent pixels in which case a simple mask is enough to
 // store this information in wxImage or have a real alpha channel in which case
 // we need to have it in wxImage as well


@@ -558,7 +558,7 @@ wxPNGHandler::LoadFile(wxImage *image,
 
     image->Create((int)width, (int)height, (bool) false /* no need to init pixels */);
 
 
     image->Create((int)width, (int)height, (bool) false /* no need to init pixels */);
 

-    if (!image->Ok())
+    if (!image->IsOk())

         goto error;
 
     // initialize all line pointers to NULL to ensure that they can be safely
         goto error;
 
     // initialize all line pointers to NULL to ensure that they can be safely


@@ -660,7 +660,7 @@ error:
        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->IsOk() )

     {
         image->Destroy();
     }
     {
         image->Destroy();
     }


@@ -795,15 +795,13 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
 #endif
     ;
 
 #endif
     ;
 

-    png_color_8 mask;
+    png_color_8 mask = { 0, 0, 0, 0, 0 };

 
     if (bHasMask)
     {
         mask.red   = image->GetMaskRed();
         mask.green = image->GetMaskGreen();
         mask.blue  = image->GetMaskBlue();
 
     if (bHasMask)
     {
         mask.red   = image->GetMaskRed();
         mask.green = image->GetMaskGreen();
         mask.blue  = image->GetMaskBlue();

-        mask.alpha = 0;
-        mask.gray  = 0;

     }
 
     PaletteMap palette;
     }
 
     PaletteMap palette;