]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Wed, 11 Jul 2018 23:24:37 +0000 (19:24 -0400)
committerCristy <urban-warrior@imagemagick.org>
Wed, 11 Jul 2018 23:24:37 +0000 (19:24 -0400)
MagickWand/mogrify.c
MagickWand/operation.c

index 8bb31e97f94baad8dc2cbc8555c419829fa07f8a..e54d53668ae0d0297a51235e03671c76a97dec3b 100644 (file)
@@ -2458,6 +2458,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                   exception);
                 if (file_data != (StringInfo *) NULL)
                   {
+                    (void) SetImageInfo(profile_info,0,exception);
                     (void) ProfileImage(*image,profile_info->magick,
                       GetStringInfoDatum(file_data),
                       GetStringInfoLength(file_data),exception);
index 0efc76e591e02bc59de949547a888edf5bf6c18f..6216e68b9fc211950b50725a9a98f1311617462d 100644 (file)
@@ -2957,7 +2957,6 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
         }
       if (LocaleCompare("profile",option+1) == 0)
         {
-          /* Note: arguments do not have percent escapes expanded */
           const char
             *name;
 
@@ -2970,6 +2969,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
           ImageInfo
             *profile_info;
 
+          /* Note: arguments do not have percent escapes expanded */
           if (IfPlusOp)
             { /* Remove a profile from the _image.  */
               (void) ProfileImage(_image,arg1,(const unsigned char *)
@@ -2994,6 +2994,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
               profile=FileToStringInfo(profile_info->filename,~0UL,_exception);
               if (profile != (StringInfo *) NULL)
                 {
+                  (void) SetImageInfo(profile_info,0,_exception);
                   (void) ProfileImage(_image,profile_info->magick,
                     GetStringInfoDatum(profile),(size_t)
                     GetStringInfoLength(profile),_exception);