[packages/wxWidgets] - more workarounds

qboosh qboosh at pld-linux.org
Sun Sep 30 18:25:54 CEST 2012


commit ecdad9f82037fb1f7cbbea77025831863c6b6732
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 30 18:27:10 2012 +0200

    - more workarounds

 wxWidgets-format.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
---
diff --git a/wxWidgets-format.patch b/wxWidgets-format.patch
index 1cf2ae4..432c7ba 100644
--- a/wxWidgets-format.patch
+++ b/wxWidgets-format.patch
@@ -1109,3 +1109,50 @@
          return false;
      }
  
+--- wxWidgets-2.8.12/src/common/imagpnm.cpp.orig	2011-03-22 12:59:41.000000000 +0100
++++ wxWidgets-2.8.12/src/common/imagpnm.cpp	2012-09-30 18:26:48.461052596 +0200
+@@ -69,7 +69,7 @@
+         case wxT('5'): // RAW Grey
+         case wxT('6'): break;
+         default:
+-            if (verbose) wxLogError(_("PNM: File format is not recognized."));
++            if (verbose) wxLogError("%s", _("PNM: File format is not recognized."));
+             return false;
+     }
+ 
+@@ -85,7 +85,7 @@
+     if (!ptr)
+     {
+         if (verbose)
+-           wxLogError( _("PNM: Couldn't allocate memory.") );
++           wxLogError("%s",  _("PNM: Couldn't allocate memory.") );
+         return false;
+     }
+ 
+@@ -103,7 +103,7 @@
+             *ptr++=(unsigned char)value; // B
+             if ( !buf_stream )
+             {
+-                if (verbose) wxLogError(_("PNM: File seems truncated."));
++                if (verbose) wxLogError("%s", _("PNM: File seems truncated."));
+                 return false;
+             }
+         }
+@@ -122,7 +122,7 @@
+ 
+             if ( !buf_stream )
+               {
+-                if (verbose) wxLogError(_("PNM: File seems truncated."));
++                if (verbose) wxLogError("%s", _("PNM: File seems truncated."));
+                 return false;
+               }
+           }
+@@ -141,7 +141,7 @@
+             *ptr++=value; // B
+             if ( !buf_stream )
+             {
+-                if (verbose) wxLogError(_("PNM: File seems truncated."));
++                if (verbose) wxLogError("%s", _("PNM: File seems truncated."));
+                 return false;
+             }
+         }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wxWidgets.git/commitdiff/ecdad9f82037fb1f7cbbea77025831863c6b6732



More information about the pld-cvs-commit mailing list