]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Sun, 16 Jul 2017 23:16:31 +0000 (19:16 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sun, 16 Jul 2017 23:16:31 +0000 (19:16 -0400)
coders/jp2.c
coders/msl.c

index 48352d823dea27b45c56ff94cd432b66d13ded75..c358066ef43b572e88d50ba3d5c516952b95a182 100644 (file)
@@ -917,7 +917,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
       &parameters.subsampling_dx,&parameters.subsampling_dy);
   property=GetImageProperty(image,"comment",exception);
   if (property != (const char *) NULL)
-    parameters.cp_comment=property;
+    parameters.cp_comment=(char *) property;
   channels=3;
   jp2_colorspace=OPJ_CLRSPC_SRGB;
   if (image->colorspace == YUVColorspace)
index a3fa531d06ff438e5e0923952cf5d651f3c82572..5ec1ee57ba724962c618f514a25ee5e252c76c37 100644 (file)
@@ -7756,8 +7756,7 @@ static MagickBooleanType ProcessMSLScript(const ImageInfo *image_info,
       (msl_info.image == (Image **) NULL) ||
       (msl_info.attributes == (Image **) NULL) ||
       (msl_info.group_info == (MSLGroupInfo *) NULL))
-    ThrowFatalException(ResourceLimitFatalError,
-      "UnableToInterpretMSLImage");
+    ThrowFatalException(ResourceLimitFatalError,"UnableToInterpretMSLImage");
   *msl_info.image_info=CloneImageInfo(image_info);
   *msl_info.draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
   *msl_info.attributes=AcquireImage(image_info,exception);