From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 2 Sep 2019 12:19:46 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.8-64~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd45f324084453a2fb279c5c9b5c5c075bce2904;p=imagemagick

...
---

diff --git a/coders/xpm.c b/coders/xpm.c
index 812def9f0..2e06ee715 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -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);