(no commit message)

diff --git a/MagickCore/color.c b/MagickCore/color.c
index 91f833a9a4926cffe2f68d701f7b1a0cd0bacab9..bc4f700e8476a5cc94a96515957786a925874c76 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2200,7 +2200,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name,
       */
       (void) ResetMagickMemory(&pixel,0,sizeof(pixel));
       name++;
-      for (n=0; IfMagickTrue(isxdigit((int) ((unsigned char) name[n]))); n++);
+      for (n=0; isxdigit((int) ((unsigned char) name[n])) != 0; n++) ;
       if ((n % 3) == 0)
         {
           do
@@ -2223,7 +2223,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name,
                   else
                     return(MagickFalse);
             }
-          } while (IfMagickTrue(isxdigit((int) ((unsigned char) name[n]))));
+          } while (isxdigit((int) ((unsigned char) *name)) != 0);
           depth=4*(n/3);
         }
       else

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 05d170d8cd6dc3a423ec70247b92a92c8f7c4551..78c20f1730aeb580ae7ef5c1f017e1b0690ef3c4 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -3937,6 +3937,9 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
       DrawInfo
         *annotate_info;
 
+      ImageInfo
+        *image_info;
+
       MagickBooleanType
         status;
 
@@ -3952,9 +3955,11 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
       caption_image=CloneImage(image,image->columns,1,MagickTrue,exception);
       if (caption_image == (Image *) NULL)
         return((Image *) NULL);
+      image_info=AcquireImageInfo();
       annotate_info=CloneDrawInfo((const ImageInfo *) NULL,draw_info);
-      text=InterpretImageProperties((ImageInfo *) NULL,(Image *) image,caption,
+      text=InterpretImageProperties(image_info,(Image *) image,caption,
         exception);
+      image_info=DestroyImageInfo(image_info);
       (void) CloneString(&annotate_info->text,text);
       count=FormatMagickCaption(caption_image,annotate_info,MagickTrue,&metrics,
         &text,exception);