Removed a return statement from void function

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

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 83446867add08e353f58b615b7d30b13fe501ce2..32845b9afec70b471d564cb710e7eaf6070711b1 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -25,6 +25,7 @@
 #if wxUSE_IMAGE && wxUSE_LIBPNG
 
 #include "wx/imagpng.h"
 #if wxUSE_IMAGE && wxUSE_LIBPNG
 
 #include "wx/imagpng.h"

+#include "wx/versioninfo.h"

 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"


@@ -165,7 +166,9 @@ 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 )
 {
     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
 }
 
 // from pngerror.c


@@ -385,7 +388,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 +456,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


@@ -608,7 +611,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() )
     {


@@ -657,7 +662,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;
     }
 


@@ -666,7 +673,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;
     }
 


@@ -674,7 +683,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;
     }
 


@@ -771,7 +782,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 )


@@ -818,7 +829,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:


@@ -892,4 +903,18 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
 
 #endif  // wxUSE_STREAMS
 
 
 #endif  // wxUSE_STREAMS
 

+/*static*/ wxVersionInfo wxPNGHandler::GetLibraryVersionInfo()
+{
+    // The version string seems to always have a leading space and a trailing
+    // new line, get rid of them both.
+    wxString str = png_get_header_version(NULL) + 1;
+    str.Replace("\n", "");
+
+    return wxVersionInfo("libpng",
+                         PNG_LIBPNG_VER_MAJOR,
+                         PNG_LIBPNG_VER_MINOR,
+                         PNG_LIBPNG_VER_RELEASE,
+                         str);
+}
+

 #endif  // wxUSE_LIBPNG
 #endif  // wxUSE_LIBPNG