(no commit message)

diff --git a/MagickCore/token.c b/MagickCore/token.c
index 57fda386a178c8b5259881873ece51fad8ed7db9..88d3031f95e08a8af7f3ad2871666769caf99c74 100644 (file)
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -961,7 +961,11 @@ MagickExport int Tokenizer(TokenInfo *token_info,const unsigned flag,
     switch (token_info->state)
     {
       case IN_WHITE:
+      {
         token_info->state=IN_TOKEN;
+        StoreToken(token_info,token,max_token_length,c);
+        break;
+      }
       case IN_TOKEN:
       case IN_QUOTE:
       {

diff --git a/coders/meta.c b/coders/meta.c
index 7e5d51b3a8c99082e98665466dc3a93e82b10bb4..c9027bdacca4db536fccb4b0fd187b7264648dc1 100644 (file)
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1842,9 +1842,12 @@ static int formatIPTC(Image *ifile, Image *ofile)
     else
       {
         if (foundiptc)
-          return -1;
+          return(-1);
         else
-          continue;
+          {
+            c=0;
+            continue;
+          }
       }
 
     /* we found the 0x1c tag and now grab the dataset and record number tags */

diff --git a/coders/psd.c b/coders/psd.c
index e99a27807882a336dfc290c3c8d29fa2df13b43a..97a2684bdecd500e6efbbb8ff29086f951bd04aa 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1188,7 +1188,7 @@ static MagickStatusType ReadPSDLayers(Image *image,const ImageInfo *image_info,
       count=ReadBlob(image,4,(unsigned char *) type);
       if ((count == 0) || (LocaleNCompare(type,"8BIM",4) != 0))
         {
-          if (DiscardBlobBytes(image,size-quantum-8) == MagickFalse)
+          if (DiscardBlobBytes(image,size-(ssize_t) quantum-8) == MagickFalse)
             ThrowFileException(exception,CorruptImageError,
               "UnexpectedEndOfFile",image->filename);
         }
@@ -1198,7 +1198,7 @@ static MagickStatusType ReadPSDLayers(Image *image,const ImageInfo *image_info,
           if ((count != 0) && (LocaleNCompare(type,"Lr16",4) == 0))
             size=GetPSDSize(psd_info,image);
           else
-            if (DiscardBlobBytes(image,size-quantum-12) == MagickFalse)
+            if (DiscardBlobBytes(image,size-(ssize_t) quantum-12) == MagickFalse)
               ThrowFileException(exception,CorruptImageError,
                 "UnexpectedEndOfFile",image->filename);
         }

diff --git a/coders/uil.c b/coders/uil.c
index 6811499b175ae4e822f2faad3a2dd7a969079852..8496adee348bdea15b6ec41d4a43e51299c949d1 100644 (file)
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -274,7 +274,6 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
             {
               if (matte_image[i] != 0)
                 SetPixelIndex(image,image->colors,q);
-              p++;
               q+=GetPixelChannels(image);
             }
           }