(no commit message)

[imagemagick] / coders / cals.c

diff --git a/coders/cals.c b/coders/cals.c
index 20c4b1b0c89f78d69bd424925474b0b410c8f70f..bba5409e7e7b5d85f1bdb5f45134509dd53b2bea 100644 (file)
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  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  %
@@ -262,7 +262,7 @@ static Image *ReadCALSImage(const ImageInfo *image_info,
   image=DestroyImage(image);
   read_info=CloneImageInfo(image_info);
   SetImageInfoBlob(read_info,(void *) NULL,0);
-  (void) FormatMagickString(read_info->filename,MaxTextExtent,"group4:%.1024s",
+  (void) FormatMagickString(read_info->filename,MaxTextExtent,"group4:%s",
     filename);
   (void) FormatMagickString(message,MaxTextExtent,"%lux%lu",width,height);
   read_info->size=ConstantString(message);
@@ -404,15 +404,15 @@ static ssize_t WriteCALSRecord(Image *image,const char *data)
   char
     pad[128];
 
-  ssize_t
-    count;
-
   register const char
     *p;
 
   register ssize_t
     i;
 
+  ssize_t
+    count;
+
   i=0;
   if (data != (const char *) NULL)
     {
@@ -447,20 +447,18 @@ static MagickBooleanType WriteCALSImage(const ImageInfo *image_info,
   register ssize_t
     i;
 
+  size_t
+    density,
+    length,
+    orient_x,
+    orient_y;
+
   ssize_t
     count;
 
-  size_t
-    length;
-
   unsigned char
     *group4;
 
-  size_t
-    density,
-    orient_x,
-    orient_y;
-
   /*
     Open output image file.
   */
@@ -477,6 +475,7 @@ static MagickBooleanType WriteCALSImage(const ImageInfo *image_info,
     Create standard CALS header.
   */
   count=WriteCALSRecord(image,"srcdocid: NONE");
+  (void) count;
   count=WriteCALSRecord(image,"dstdocid: NONE");
   count=WriteCALSRecord(image,"txtfilid: NONE");
   count=WriteCALSRecord(image,"figid: NONE");