From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 16 Jul 2017 23:16:31 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.6-2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23168c558aa91102ad1355991f2d7e5a49c4ee90;p=imagemagick

...
---

diff --git a/coders/jp2.c b/coders/jp2.c
index 48352d823..c358066ef 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -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)
diff --git a/coders/msl.c b/coders/msl.c
index a3fa531d0..5ec1ee57b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -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);