(no commit message)

diff --git a/coders/psd.c b/coders/psd.c
index 1bb53b4cffc39c157e40edd8c95c31e776302656..679ea72013b9973225cecb170dcd6af531cbc29d 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -2137,8 +2137,8 @@ compute_layer_info:
       layer_info_size += 16;
     else
       {
-        size_t length=strlen(theAttr)+(4-(length % 4))+1;
-        layer_info_size += 8+length;
+        size_t length=strlen(theAttr);
+        layer_info_size += 8+length+(4-(length % 4))+1;
       }
     layer_count++;
     tmp_image = GetNextImageInList(tmp_image);
@@ -2241,8 +2241,8 @@ compute_layer_info:
           layer_count++ );
         WritePascalString( image, (char*)layer_name, 4 );
       } else {
-        size_t length=strlen(theAttr)+(4-(length % 4))+1;
-        (void) WriteBlobMSBLong(image, length+8);
+        size_t length=strlen(theAttr);
+        (void) WriteBlobMSBLong(image, length+(4-(length % 4))+1+8);
         (void) WriteBlobMSBLong(image, 0);
         (void) WriteBlobMSBLong(image, 0);
         WritePascalString( image, theAttr, 4 );

diff --git a/wand/convert.c b/wand/convert.c
index 3f1d4e2ffcbcaefc3f9598f519e6c0c60617c72b..d803f19823a6fcd860f991d96ae533c40575325e 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -1042,6 +1042,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             if (i == (long) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
 #if 1
+            (void) token;
             if (IsGeometry(argv[i]) == MagickFalse)
               ThrowConvertInvalidArgumentException(option,argv[i]);
 #else

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 10a8f1cf7d3de075f786d6eaa389388301ef5384..84bc5eea4c43407eea49865ffde3fbb15077ff25 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -4534,6 +4534,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             if (i == (long) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
 #if 1
+            (void) token;
             if (IsGeometry(argv[i]) == MagickFalse)
               ThrowMogrifyInvalidArgumentException(option,argv[i]);
 #else