(no commit message)

diff --git a/ChangeLog b/ChangeLog
index f979dfb00c864eeac2fcde80fd36c99ff2cb3970..9d53622cfb50eaf8843d48ba47c20bb64fdc11b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-03-13  6.6.0-6 Cristy  <quetzlzacatenango@image...>
+  * Add support for the Adobe Large Document format.
+
 2010-03-11  6.6.0-5 Cristy  <quetzlzacatenango@image...>
   * Permit user to get virtual pixels with a region width of 0.
   * Reformulate the jinc() functio  so that the main peak is of amplitude of 1.
@@ -6,7 +9,6 @@
 2010-03-07  6.6.0-4 Cristy  <quetzlzacatenango@image...>
   * The -evaluate-sequence option behaves like -evaluate except it operates
     on a sequence of images.
-  * Add support for the Adobe Large Document format.
 
 2010-03-05  6.6.0-2 Cristy  <quetzlzacatenango@image...>
   * Add support for the -maximum and -minimum options.

diff --git a/coders/psd.c b/coders/psd.c
index d44e6dc22171cb7050328699d87b7cf219e2ef92..8d29965062b02174e07dc96a33bc362e6195237a 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1986,7 +1986,6 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image)
     *profile;
 
   MagickBooleanType
-    force_white_background = image->matte,
     invert_layer_count = MagickFalse,
     status;
 
@@ -2013,7 +2012,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image)
 
   Image
     * tmp_image = (Image *) NULL,
-    * base_image = force_white_background ? image : GetNextImageInList(image);
+    * base_image = GetNextImageInList(image);
 
   /*
     Open output image file.
@@ -2038,20 +2037,15 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image)
   (void) WriteBlobMSBShort(image,psd_info.version);  /* version */
   for (i=1; i <= 6; i++)
     (void) WriteBlobByte(image, 0);  /* 6 bytes of reserved */
-  if ( force_white_background )
-    num_channels = 3;
+  if (image->storage_class == PseudoClass)
+    num_channels=(image->matte ? 2UL : 1UL);
   else
-  {
-    if (image->storage_class == PseudoClass)
-     num_channels=(image->matte ? 2UL : 1UL);
-    else
     {
-    if (image->colorspace != CMYKColorspace)
-      num_channels=(image->matte ? 4UL : 3UL);
-    else
-      num_channels=(image->matte ? 5UL : 4UL);
+      if (image->colorspace != CMYKColorspace)
+        num_channels=(image->matte ? 4UL : 3UL);
+      else
+        num_channels=(image->matte ? 5UL : 4UL);
     }
-  }
   (void) WriteBlobMSBShort(image,(unsigned short) num_channels);
   (void) WriteBlobMSBLong(image,image->rows);
   (void) WriteBlobMSBLong(image,image->columns);
@@ -2264,11 +2258,8 @@ compute_layer_info:
 
   }
 
-   /* now the background image data! */
-   if (force_white_background != MagickFalse)
-     WriteWhiteBackground(&psd_info,image);
-   else
-     status=WriteImageChannels(&psd_info,image_info,image,image,MagickFalse);
+  /* now the background image data! */
+  status=WriteImageChannels(&psd_info,image_info,image,image,MagickFalse);
 
   (void) CloseBlob(image);
   return(status);