(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 9f278dc9e76f760723b9c2bfb1ab532deb3dc17b..f1ba3da16b733ccb1615948036475ee78d43e361 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2010-01-20  6.6.0-8 Glenn Randers-Pehrson <glennrp@image...>
+2010-03-20  6.6.0-8 Glenn Randers-Pehrson <glennrp@image...>
   * Eliminated some of the deprecated direct references to members of
     the png_info structure.  This must be finished before we can build
     with libpng-1.5.

diff --git a/coders/psd.c b/coders/psd.c
index b6e6a6b29fbab1c613203ceb293e8387c08594e4..a9f9031b8a9a819cf316c5f8878e5a035c7201b2 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -224,7 +224,7 @@ static MagickBooleanType DecodeImage(Image *image,const long channel)
         if (q == (PixelPacket *) NULL)
           break;
         indexes=GetAuthenticIndexQueue(image);
-        for (count=(-count+1); count > 0; count--)
+        for (i=(long) (-count+1); i > 0; i--)
         {
           switch (channel)
           {
@@ -274,13 +274,13 @@ static MagickBooleanType DecodeImage(Image *image,const long channel)
             default:
               break;
           }
-          if (SyncAuthenticPixels(image,exception) == MagickFalse)
-            break;
           q++;
           indexes++;
           x++;
           number_pixels--;
         }
+        if (SyncAuthenticPixels(image,exception) == MagickFalse)
+          break;
         continue;
       }
     count++;
@@ -340,13 +340,13 @@ static MagickBooleanType DecodeImage(Image *image,const long channel)
         default:
           break;
       }
-      if (SyncAuthenticPixels(image,exception) == MagickFalse)
-        break;
       q++;
       indexes++;
       x++;
       number_pixels--;
     }
+    if (SyncAuthenticPixels(image,exception) == MagickFalse)
+      break;
   }
   /*
     Guarentee the correct number of pixel packets.