From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 7 Aug 2011 01:16:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=327d5e91332775c89c886a36cf2c00b4a78c66a1;p=imagemagick

---

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index ba130b0ab..7a5b643a4 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1193,7 +1193,7 @@ MagickExport MagickBooleanType SetImageColorspace(Image *image,
   const ColorspaceType colorspace,ExceptionInfo *exception)
 {
   image->colorspace=colorspace;
-  return(MagickFalse);
+  return(MagickTrue);
 }
 
 /*
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 5a6dc37d7..289477d31 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2521,7 +2521,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   assert(image->signature == MagickSignature);
-  status=MagickFalse;
+  status=MagickTrue;
   switch (alpha_type)
   {
     case ActivateAlphaChannel:
@@ -2558,7 +2558,6 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       if (image->colorspace == CMYKColorspace)
         ConvertRGBToCMYK(&background);
       SetPacketPixelInfo(image,&background,&pixel);
-      status=MagickTrue;
       image_view=AcquireCacheView(image);
       #if defined(MAGICKCORE_OPENMP_SUPPORT)
         #pragma omp parallel for schedule(dynamic,4) shared(status)
@@ -3674,7 +3673,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
       if (image->storage_class != DirectClass)
         status=SetImageStorageClass(image,DirectClass,&image->exception);
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
+        status=SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       break;
     }
     case OptimizeType: