- up to 10.35.90

[packages/netpbm.git] / netpbm-build.patch

diff --git a/netpbm-build.patch b/netpbm-build.patch
index f5b149d5499758900474590f8f000ce7cdb06f3d..f4ca06177b2d147cb7a8b56f511833f824a94358 100644 (file)
--- a/netpbm-build.patch
+++ b/netpbm-build.patch
@@ -1339,3 +1339,55 @@
          
          png_init_io(pngP, ofP);
  
+--- netpbm-10.35.90/converter/other/tifftopnm.c~       2006-08-19 05:12:28.000000000 +0200
++++ netpbm-10.35.90/converter/other/tifftopnm.c        2013-10-31 17:58:49.296479893 +0100
+@@ -902,14 +902,14 @@
+                 
+                 ok = TIFFRGBAImageBegin(&img, tif, stopOnErrorFalse, emsg) ;
+                 if (!ok) {
+-                    pm_message(emsg);
++                    pm_message("%s", emsg);
+                     *statusP = CONV_FAILED;
+                 } else {
+                     int ok;
+                     ok = TIFFRGBAImageGet(&img, raster, cols, rows);
+                     TIFFRGBAImageEnd(&img) ;
+                     if (!ok) {
+-                        pm_message(emsg);
++                        pm_message("%s", emsg);
+                         *statusP = CONV_FAILED;
+                     } else {
+                         *statusP = CONV_DONE;
+--- netpbm-10.35.90/converter/other/tifftopnm.c~       2013-10-31 17:59:04.000000000 +0100
++++ netpbm-10.35.90/converter/other/tifftopnm.c        2013-10-31 18:00:05.761780998 +0100
+@@ -882,7 +882,7 @@
+         int ok;
+         ok = TIFFRGBAImageOK(tif, emsg);
+         if (!ok) {
+-            pm_message(emsg);
++            pm_message("%s", emsg);
+             *statusP = CONV_UNABLE;
+         } else {
+             uint32* raster ;
+--- netpbm-10.35.90/converter/other/fiasco/pnmtofiasco.c~      2006-08-19 05:12:28.000000000 +0200
++++ netpbm-10.35.90/converter/other/fiasco/pnmtofiasco.c       2013-10-31 18:02:13.731936837 +0100
+@@ -176,7 +176,7 @@
+       return 0;
+    else
+    {
+-      fprintf (stderr, fiasco_get_error_message ());
++      fprintf (stderr, "%s", fiasco_get_error_message ());
+       fprintf (stderr, "\n");
+       return 1;
+    }
+--- netpbm-10.35.90/converter/other/fiasco/params.c~   2006-08-19 05:12:28.000000000 +0200
++++ netpbm-10.35.90/converter/other/fiasco/params.c    2013-10-31 18:05:00.869560937 +0100
+@@ -652,7 +652,7 @@
+    fprintf (stderr, "Usage: %s [OPTION]...%s\n", progname,
+           non_opt_string ? non_opt_string : " ");
+    if (synopsis != NULL)
+-      fprintf (stderr, synopsis);
++      fprintf (stderr, "%s", synopsis);
+    fprintf (stderr, "\n\n");
+    fprintf (stderr, "Mandatory or optional arguments to long options "
+           "are mandatory or optional\nfor short options too. "