]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Mon, 2 Sep 2019 12:19:46 +0000 (08:19 -0400)
committerCristy <urban-warrior@imagemagick.org>
Mon, 2 Sep 2019 12:19:46 +0000 (08:19 -0400)
coders/xpm.c

index 812def9f0e72b3eae0595c12c944ed900d68437a..2e06ee715b1def520304c0815d5f99cb2fdded41 100644 (file)
@@ -256,12 +256,12 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
     *p,
     *q;
 
-  register ssize_t
-    x;
-
   register Quantum
     *r;
 
+  register ssize_t
+    x;
+
   size_t
     length;
 
@@ -407,7 +407,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         if ((next-q) < 0)
           break;
         (void) CopyXPMColor(target,q,MagickMin((size_t) (next-q),
-            MagickPathExtent-1));
+          MagickPathExtent-1));
         q=ParseXPMColor(target,MagickFalse);
         if (q != (char *) NULL)
           *q='\0';
@@ -457,7 +457,10 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          ssize_t count=CopyXPMColor(key,p,MagickMin(width,MagickPathExtent-1));
+          ssize_t
+            count;
+
+          count=CopyXPMColor(key,p,MagickMin(width,MagickPathExtent-1));
           if (count != (ssize_t) width)
             break;
           j=(ssize_t) GetValueFromSplayTree(xpm_colors,key);