]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Mon, 5 Dec 2016 16:47:57 +0000 (11:47 -0500)
committerCristy <urban-warrior@imagemagick.org>
Mon, 5 Dec 2016 16:47:57 +0000 (11:47 -0500)
PerlMagick/Magick.xs
PerlMagick/quantum/quantum.xs.in
www/license.html

index 00b200acedf484cf5bb9866ade3fc9ef9f747ec9..1eb06624ff3f64d131e158b13105592c0e4231b3 100644 (file)
@@ -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);
index db92de34fcacfc340eb682f65a7c4260b57075bd..78b9f2dc84f0199a1277c64df169ac0d1dc76857 100644 (file)
@@ -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);
index d6e2e9a041a98e53f1641057c799c1826d7d60cd..48ab7921cf6463e16207c7906881e68e6612e850 100644 (file)
 
 <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>