From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 11 Jan 2012 17:07:34 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6406
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbeca02842ebc9f6aef272d4c938f32ad1cb62f8;p=imagemagick

---

diff --git a/coders/png.c b/coders/png.c
index 9805d0e97..b3f48fd9b 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -11668,9 +11668,6 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info,
 
   if (transparent)
     {
-      ChannelType
-        channel_mask;
-
       jng_color_type=14;
 
       /* Create JPEG blob, image, and image_info */
@@ -11687,15 +11684,10 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info,
         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
           "  Creating jpeg_image.");
 
-      jpeg_image=CloneImage(image,0,0,MagickTrue,exception);
-
+      jpeg_image=SeparateImage(jpeg_image,AlphaChannel,exception);
       if (jpeg_image == (Image *) NULL)
         ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
-
       (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
-      channel_mask=SetPixelChannelMask(jpeg_image,AlphaChannel);
-      status=SeparateImage(jpeg_image,exception);
-      (void) SetPixelChannelMapMask(jpeg_image,channel_mask);
       jpeg_image->matte=MagickFalse;
       jpeg_image->quality=jng_alpha_quality;
       jpeg_image_info->type=GrayscaleType;
diff --git a/coders/ps3.c b/coders/ps3.c
index fd4949877..55573586c 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -430,9 +430,6 @@ static MagickBooleanType SerializeImageIndexes(const ImageInfo *image_info,
 static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info,
   Image *image,const CompressionType compression,ExceptionInfo *exception)
 {
-  ChannelType
-    channel_mask;
-
   char
     buffer[MaxTextExtent];
 
@@ -518,17 +515,9 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info,
   }
   (void) WriteBlobString(image,buffer);
   (void) WriteBlobString(image,"/ReusableStreamDecode filter\n");
-  mask_image=CloneImage(image,0,0,MagickTrue,exception);
+  mask_image=SeparateImage(image,AlphaChannel,exception);
   if (mask_image == (Image *) NULL)
     ThrowWriterException(CoderError,exception->reason);
-  channel_mask=SetPixelChannelMask(mask_image,AlphaChannel);
-  status=SeparateImage(mask_image,exception);
-  (void) SetPixelChannelMapMask(mask_image,channel_mask);
-  if (status == MagickFalse)
-    {
-      mask_image=DestroyImage(mask_image);
-      return(MagickFalse);
-    }
   (void) SetImageType(mask_image,BilevelType,exception);
   (void) SetImageType(mask_image,PaletteType,exception);
   mask_image->matte=MagickFalse;