...

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 0bc5c8789c10380c8d80336a63c617e7267f66a5..0b276f934ac57d0cf7e6716056d963a2c0471997 100644 (file)
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -3134,15 +3134,15 @@ MagickExport unsigned int ReadBlobLong(Image *image)
   if (image->endian == LSBEndian)
     {
       value=(unsigned int) (*p++);
-      value|=((unsigned int) (*p++)) << 8;
-      value|=((unsigned int) (*p++)) << 16;
-      value|=((unsigned int) (*p++)) << 24;
+      value|=(unsigned int) (*p++) << 8;
+      value|=(unsigned int) (*p++) << 16;
+      value|=(unsigned int) (*p++) << 24;
       return(value & 0xffffffff);
     }
-  value=((unsigned int) (*p++)) << 24;
-  value|=((unsigned int) (*p++)) << 16;
-  value|=((unsigned int) (*p++)) << 8;
-  value|=((unsigned int) (*p++));
+  value=(unsigned int) (*p++) << 24;
+  value|=(unsigned int) (*p++) << 16;
+  value|=(unsigned int) (*p++) << 8;
+  value|=(unsigned int) (*p++);
   return(value & 0xffffffff);
 }
 \f
@@ -3192,23 +3192,23 @@ MagickExport MagickSizeType ReadBlobLongLong(Image *image)
   if (image->endian == LSBEndian)
     {
       value=(MagickSizeType) (*p++);
-      value|=((MagickSizeType) (*p++)) << 8;
-      value|=((MagickSizeType) (*p++)) << 16;
-      value|=((MagickSizeType) (*p++)) << 24;
-      value|=((MagickSizeType) (*p++)) << 32;
-      value|=((MagickSizeType) (*p++)) << 40;
-      value|=((MagickSizeType) (*p++)) << 48;
-      value|=((MagickSizeType) (*p++)) << 56;
+      value|=(MagickSizeType) (*p++) << 8;
+      value|=(MagickSizeType) (*p++) << 16;
+      value|=(MagickSizeType) (*p++) << 24;
+      value|=(MagickSizeType) (*p++) << 32;
+      value|=(MagickSizeType) (*p++) << 40;
+      value|=(MagickSizeType) (*p++) << 48;
+      value|=(MagickSizeType) (*p++) << 56;
       return(value & MagickULLConstant(0xffffffffffffffff));
     }
-  value=((MagickSizeType) (*p++)) << 56;
-  value|=((MagickSizeType) (*p++)) << 48;
-  value|=((MagickSizeType) (*p++)) << 40;
-  value|=((MagickSizeType) (*p++)) << 32;
-  value|=((MagickSizeType) (*p++)) << 24;
-  value|=((MagickSizeType) (*p++)) << 16;
-  value|=((MagickSizeType) (*p++)) << 8;
-  value|=((MagickSizeType) (*p++));
+  value=(MagickSizeType) (*p++) << 56;
+  value|=(MagickSizeType) (*p++) << 48;
+  value|=(MagickSizeType) (*p++) << 40;
+  value|=(MagickSizeType) (*p++) << 32;
+  value|=(MagickSizeType) (*p++) << 24;
+  value|=(MagickSizeType) (*p++) << 16;
+  value|=(MagickSizeType) (*p++) << 8;
+  value|=(MagickSizeType) (*p++);
   return(value & MagickULLConstant(0xffffffffffffffff));
 }
 \f
@@ -3258,10 +3258,10 @@ MagickExport unsigned short ReadBlobShort(Image *image)
   if (image->endian == LSBEndian)
     {
       value=(unsigned short) (*p++);
-      value|=((unsigned short) (*p++)) << 8;
+      value|=(unsigned short) (*p++) << 8;
       return(value);
     }
-  value=(unsigned short) ((*p++) << 8);
+  value=(unsigned short) (*p++) << 8;
   value|=(unsigned short) (*p++);
   return(value);
 }
@@ -3310,9 +3310,9 @@ MagickExport unsigned int ReadBlobLSBLong(Image *image)
   if (count != 4)
     return(0U);
   value=(unsigned int) (*p++);
-  value|=((unsigned int) (*p++)) << 8;
-  value|=((unsigned int) (*p++)) << 16;
-  value|=((unsigned int) (*p++)) << 24;
+  value|=(unsigned int) (*p++) << 8;
+  value|=(unsigned int) (*p++) << 16;
+  value|=(unsigned int) (*p++) << 24;
   return(value & 0xffffffff);
 }
 \f
@@ -3382,7 +3382,7 @@ MagickExport unsigned short ReadBlobLSBShort(Image *image)
   register const unsigned char
     *p;
 
-  register unsigned int
+  register unsigned short
     value;
 
   ssize_t
@@ -3398,8 +3398,8 @@ MagickExport unsigned short ReadBlobLSBShort(Image *image)
   if (count != 2)
     return((unsigned short) 0U);
   value=(unsigned int) (*p++);
-  value|=((unsigned int) ((*p++)) << 8);
-  return((unsigned short) (value & 0xffff));
+  value|=(unsigned int) (*p++) << 8;
+  return(value & 0xffff);
 }
 \f
 /*
@@ -3483,9 +3483,9 @@ MagickExport unsigned int ReadBlobMSBLong(Image *image)
   p=(const unsigned char *) ReadBlobStream(image,4,buffer,&count);
   if (count != 4)
     return(0UL);
-  value=((unsigned int) (*p++) << 24);
-  value|=((unsigned int) (*p++) << 16);
-  value|=((unsigned int) (*p++) << 8);
+  value=(unsigned int) (*p++) << 24;
+  value|=(unsigned int) (*p++) << 16;
+  value|=(unsigned int) (*p++) << 8;
   value|=(unsigned int) (*p++);
   return(value);
 }
@@ -3533,14 +3533,14 @@ MagickExport MagickSizeType ReadBlobMSBLongLong(Image *image)
   p=(const unsigned char *) ReadBlobStream(image,8,buffer,&count);
   if (count != 8)
     return(MagickULLConstant(0));
-  value=((MagickSizeType) (*p++)) << 56;
-  value|=((MagickSizeType) (*p++)) << 48;
-  value|=((MagickSizeType) (*p++)) << 40;
-  value|=((MagickSizeType) (*p++)) << 32;
-  value|=((MagickSizeType) (*p++)) << 24;
-  value|=((MagickSizeType) (*p++)) << 16;
-  value|=((MagickSizeType) (*p++)) << 8;
-  value|=((MagickSizeType) (*p++));
+  value=(MagickSizeType) (*p++) << 56;
+  value|=(MagickSizeType) (*p++) << 48;
+  value|=(MagickSizeType) (*p++) << 40;
+  value|=(MagickSizeType) (*p++) << 32;
+  value|=(MagickSizeType) (*p++) << 24;
+  value|=(MagickSizeType) (*p++) << 16;
+  value|=(MagickSizeType) (*p++) << 8;
+  value|=(MagickSizeType) (*p++);
   return(value & MagickULLConstant(0xffffffffffffffff));
 }
 \f
@@ -3572,7 +3572,7 @@ MagickExport unsigned short ReadBlobMSBShort(Image *image)
   register const unsigned char
     *p;
 
-  register unsigned int
+  register unsigned short
     value;
 
   ssize_t
@@ -3587,9 +3587,9 @@ MagickExport unsigned short ReadBlobMSBShort(Image *image)
   p=(const unsigned char *) ReadBlobStream(image,2,buffer,&count);
   if (count != 2)
     return((unsigned short) 0U);
-  value=(unsigned int) ((*p++) << 8);
-  value|=(unsigned int) (*p++);
-  return((unsigned short) (value & 0xffff));
+  value=(unsigned short) (*p++) << 8;
+  value|=(unsigned short) (*p++);
+  return(value & 0xffff);
 }
 \f
 /*

diff --git a/MagickCore/property.c b/MagickCore/property.c
index ca5c5fe0bcd0105a0528c224931acd1781cf969c..0882914996f445f1dd532deb7e1d5bfd926cbe2a 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1819,11 +1819,14 @@ static char *TracePSClippath(const unsigned char *blob,size_t length)
   (void) ConcatenateString(&path,message);
   (void) FormatLocaleString(message,MagickPathExtent,"{\n");
   (void) ConcatenateString(&path,message);
-  (void) FormatLocaleString(message,MagickPathExtent,"  /c {curveto} bind def\n");
+  (void) FormatLocaleString(message,MagickPathExtent,
+    "  /c {curveto} bind def\n");
   (void) ConcatenateString(&path,message);
-  (void) FormatLocaleString(message,MagickPathExtent,"  /l {lineto} bind def\n");
+  (void) FormatLocaleString(message,MagickPathExtent,
+    "  /l {lineto} bind def\n");
   (void) ConcatenateString(&path,message);
-  (void) FormatLocaleString(message,MagickPathExtent,"  /m {moveto} bind def\n");
+  (void) FormatLocaleString(message,MagickPathExtent,
+    "  /m {moveto} bind def\n");
   (void) ConcatenateString(&path,message);
   (void) FormatLocaleString(message,MagickPathExtent,
     "  /v {currentpoint 6 2 roll curveto} bind def\n");
@@ -1837,8 +1840,8 @@ static char *TracePSClippath(const unsigned char *blob,size_t length)
   (void) FormatLocaleString(message,MagickPathExtent,"  newpath\n");
   (void) ConcatenateString(&path,message);
   /*
-    The clipping path format is defined in "Adobe Photoshop File
-    Formats Specification" version 6.0 downloadable from adobe.com.
+    The clipping path format is defined in "Adobe Photoshop File Formats
+    Specification" version 6.0 downloadable from adobe.com.
   */
   (void) ResetMagickMemory(point,0,sizeof(point));
   (void) ResetMagickMemory(first,0,sizeof(first));
@@ -2023,14 +2026,14 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length,
   if (path == (char *) NULL)
     return((char *) NULL);
   message=AcquireString((char *) NULL);
-    (void) FormatLocaleString(message,MagickPathExtent,
-    ("<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n"
+  (void) FormatLocaleString(message,MagickPathExtent,(
+    "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n"
     "<svg xmlns=\"http://www.w3.org/2000/svg\""
     " width=\"%.20g\" height=\"%.20g\">\n"
     "<g>\n"
     "<path fill-rule=\"evenodd\" style=\"fill:#00000000;stroke:#00000000;"
-    "stroke-width:0;stroke-antialiasing:false\" d=\"\n"),
-    (double) columns,(double) rows);
+    "stroke-width:0;stroke-antialiasing:false\" d=\"\n"),(double) columns,
+    (double) rows);
   (void) ConcatenateString(&path,message);
   (void) ResetMagickMemory(point,0,sizeof(point));
   (void) ResetMagickMemory(first,0,sizeof(first));

diff --git a/coders/png.c b/coders/png.c
index 6b40d20fdef9187589436481de77a2495dcdfcad..6d0aaaf6f7f658144f84312ed30ed79010c62333 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -12625,7 +12625,10 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info,
           p=blob+8;
           for (i=8; i<(ssize_t) length; i+=len+12)
           {
-            len=(size_t) (*p<<24)|((*(p+1))<<16)|((*(p+2))<<8)|(*(p+3));
+            len=(size_t) (*p) << 24;
+            len|=(size_t) (*(p+1)) << 16;
+            len|=(size_t) (*(p+2)) << 8;
+            len|=(size_t) (*(p+3));
             p+=4;
 
             if (*(p)==73 && *(p+1)==68 && *(p+2)==65 && *(p+3)==84) /* IDAT */