From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 16 Oct 2009 16:49:56 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10510
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e826ea78bfdedb64b6d22bf349620c46c9687cf;p=imagemagick

---

diff --git a/coders/psd.c b/coders/psd.c
index e05d72a34..9e0ac7422 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -691,8 +691,6 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
   if ((psd_info.mode == BitmapMode) || (psd_info.mode == GrayscaleMode) ||
       (psd_info.mode == DuotoneMode))
     {
-      if (AcquireImageColormap(image,256) == MagickFalse)
-        ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
       image->matte=psd_info.channels >= 2 ? MagickTrue : MagickFalse;
       if (image->debug != MagickFalse)
         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -1338,6 +1336,11 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
               case 0:
               {
                 q->red=(Quantum) pixel;
+                if (psd_info.channels == 1)
+                  {
+                    q->green=q->red;
+                    q->blue=q->red;
+                  }
                 if (image->storage_class == PseudoClass)
                   {
                     if (packet_size == 1)