(no commit message)

[imagemagick] / coders / wpg.c

diff --git a/coders/wpg.c b/coders/wpg.c
index dd1e517df97dc21c20b0f832ccb58ca71c7d5534..8419b17d08429fad7ed58a22b6a678dacc298a0a 100644 (file)
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -16,7 +16,7 @@
 %                                 June 2000                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -597,8 +597,8 @@ static int UnpackWPG2Raster(Image *image,int bpp)
           if(x!=0)
             {
               (void) fprintf(stderr,
-                             "\nUnsupported WPG2 unaligned token RST x=%lu, please report!\n"
-                             ,(unsigned long) x);
+                             "\nUnsupported WPG2 unaligned token RST x=%.20g, please report!\n"
+                             ,(double) x);
               return(-3);
             }
           {
@@ -760,8 +760,8 @@ static Image *ExtractPostscript(Image *image,const ImageInfo *image_info,
   (void) CopyMagickMemory(clone_info->magick,magic_info->name,MaxTextExtent);
   
     /* Read nested image */
-  /*FormatString(clone_info->filename,"%s:%.1024s",magic_info->name,postscript_file);*/
-  FormatMagickString(clone_info->filename,MaxTextExtent,"%.1024s",postscript_file);
+  /*FormatString(clone_info->filename,"%s:%s",magic_info->name,postscript_file);*/
+  FormatMagickString(clone_info->filename,MaxTextExtent,"%s",postscript_file);
   image2=ReadImage(clone_info,exception);
 
   if (!image2)
@@ -1355,6 +1355,7 @@ static Image *ReadWPGImage(const ImageInfo *image_info,
 
       case 0x1B:          /*bitmap rectangle*/
               WPG2Flags = LoadWPG2Flags(image,StartWPG.PosSizePrecision,NULL,&CTM);
+              (void) WPG2Flags;
               break;
             }
         }