Changeset 7556

Timestamp:

04/18/12 10:46:17 (14 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/branches/ImageMagick-6/Magick++/lib

Files:

• Image.cpp (modified) (1 diff)
• Magick++/Include.h (modified) (2 diffs)

ImageMagick/branches/ImageMagick-6/Magick++/lib/Image.cpp

@@ -2670 +2670 @@
 
   modifyImage();
-
-  if ( colorSpace_ != RGBColorspace &&
-       colorSpace_ != sRGBColorspace &&
-       colorSpace_ != TransparentColorspace &&
-       colorSpace_ != GRAYColorspace )
-    {
-      if (image()->colorspace != RGBColorspace &&
-          image()->colorspace != sRGBColorspace &&
-          image()->colorspace != TransparentColorspace &&
-          image()->colorspace != GRAYColorspace)
-        {
-          /* Transform to RGB colorspace as intermediate step */
-          TransformRGBImage( image(), image()->colorspace );
-          throwImageException();
-        }
-      /* Transform to final non-RGB colorspace */
-      RGBTransformImage( image(), colorSpace_ );
-      throwImageException();
-      return;
-    }
-
-  if ( colorSpace_ == RGBColorspace ||
-       colorSpace_ == sRGBColorspace ||
-       colorSpace_ == TransparentColorspace ||
-       colorSpace_ == GRAYColorspace )
-    {
-      /* Transform to a RGB-type colorspace */
-      TransformRGBImage( image(), image()->colorspace );
-      throwImageException();
-      return;
-    }
+  TransformRGBImage( image(), colorSpace_ );
+  throwImageException();
 }
 Magick::ColorspaceType Magick::Image::colorSpace ( void ) const

ImageMagick/branches/ImageMagick-6/Magick++/lib/Magick++/Include.h

@@ -868 +868 @@
   using MagickCore::ResourceLimitFatalError;
   using MagickCore::ResourceLimitWarning;
-  using MagickCore::RGBTransformImage;
   using MagickCore::RollImage;
   using MagickCore::RotateImage;
@@ -921 +920 @@
   using MagickCore::ThrowException;
   using MagickCore::TransformImage;
-  using MagickCore::TransformRGBImage;
+  using MagickCore::TransformImageColorspace;
   using MagickCore::TransparentPaintImage;
   using MagickCore::TransparentPaintImageChroma;