From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 5 Dec 2016 16:47:57 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.3-10~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99a57168d10d38eeba23ddda5b256c3ab77a8e66;p=imagemagick

...
---

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 00b200ace..1eb06624f 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -563,6 +563,7 @@ static struct
     { "WaveletDenoise", {  {"geometry", StringReference},
       {"threshold", RealReference}, {"softness", RealReference},
       {"channel", MagickChannelOptions} } },
+    { "Colorspace", { {"colorspace", MagickColorspaceOptions} } },
   };
 
 static SplayTreeInfo
@@ -1299,8 +1300,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
               break;
             }
           for ( ; image; image=image->next)
-            (void) TransformImageColorspace(image,(ColorspaceType) sp,
-              exception);
+            image->colorspace=(ColorspaceType) sp;
           break;
         }
       if (LocaleCompare(attribute,"comment") == 0)
@@ -7564,6 +7564,8 @@ Mogrify(ref,...)
     ColorImage         = 288
     WaveletDenoise     = 289
     WaveletDenoiseImage= 290
+    Colorspace         = 291
+    ColorspaceImage    = 292
     MogrifyRegion      = 666
   PPCODE:
   {
@@ -11330,6 +11332,17 @@ Mogrify(ref,...)
             (void) SetImageChannelMask(image,channel_mask);
           break;
         }
+        case 146:  /* Colorspace */
+        {
+          ColorspaceType
+            colorspace;
+
+          colorspace=sRGBColorspace;
+          if (attribute_flag[0] != 0)
+            colorspace=(ColorspaceType) argument_list[0].integer_reference;
+          (void) TransformImageColorspace(image,colorspace,exception);
+          break;
+        }
       }
       if (next != (Image *) NULL)
         (void) CatchImageException(next);
diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index db92de34f..78b9f2dc8 100644
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -563,6 +563,7 @@ static struct
     { "WaveletDenoise", {  {"geometry", StringReference},
       {"threshold", RealReference}, {"softness", RealReference}, 
       {"channel", MagickChannelOptions} } },
+    { "Colorspace", { {"colorspace", MagickColorspaceOptions} } },
   };
 
 static SplayTreeInfo
@@ -1299,8 +1300,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
               break;
             }
           for ( ; image; image=image->next)
-            (void) TransformImageColorspace(image,(ColorspaceType) sp,
-              exception);
+            image->colorspace=(ColorspaceType) sp;
           break;
         }
       if (LocaleCompare(attribute,"comment") == 0)
@@ -7564,6 +7564,8 @@ Mogrify(ref,...)
     ColorImage         = 288
     WaveletDenoise     = 289
     WaveletDenoiseImage= 290
+    Colorspace         = 291
+    ColorspaceImage    = 292
     MogrifyRegion      = 666
   PPCODE:
   {
@@ -11330,6 +11332,17 @@ Mogrify(ref,...)
             (void) SetImageChannelMask(image,channel_mask);
           break;
         }
+        case 146:  /* Colorspace */
+        {
+          ColorspaceType
+            colorspace;
+
+          colorspace=sRGBColorspace;
+          if (attribute_flag[0] != 0)
+            colorspace=(ColorspaceType) argument_list[0].integer_reference;
+          (void) SegmentImageColorspaceType(image,colorspace,exception);
+          break;
+        }
       }
       if (next != (Image *) NULL)
         (void) CatchImageException(next);
diff --git a/www/license.html b/www/license.html
index d6e2e9a04..48ab7921c 100644
--- a/www/license.html
+++ b/www/license.html
@@ -110,7 +110,7 @@
 
 <p>The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow:</p>
 
-<p>Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.</p>
+<p>Copyright 1999-2017 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.</p>
 
 <p><b>1. Definitions</b>.</p>