(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 01e3c6feef0ffc15dd3592bc9a778b4949d84d95..46968ae3d59c46f880bcf212aa7d7bab4f6d3b1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2010-02-07  6.5.9-2 Anthony Thyssen <A.Thyssen@griffith...>
+2010-02-07  6.5.9-3 Cristy  <quetzlzacatenango@image...>
+  * Initialize grayscale colormap for PSD images.
+
+2010-02-07  6.5.9-3 Anthony Thyssen <A.Thyssen@griffith...>
   * Final testing and fixing of basic morphology operators
   * Addition Third-level Subtractive Morphology Methods
     edge-in, edge-out, edge, top-hat, bottom-hat

diff --git a/Makefile.am b/Makefile.am
index de8630944f55c89c3168c6328cdc5b0e99700974..115e5f9908a87ab79607c5fdf8ad725e91f5c0a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,9 +39,7 @@ CLEANFILES = \
        $(WAND_CLEANFILES) \
        $(MAGICKPP_CLEANFILES) \
        $(UTILITIES_CLEANFILES) \
-       $(TESTS_CLEANFILES) \
-  magick/magick-config.h \
-  _configs.sed
+       $(TESTS_CLEANFILES)
 
 bin_PROGRAMS = \
        $(UTILITIES_PGMS)

diff --git a/Makefile.in b/Makefile.in
index 31a01029472782209dc7fcedb7e1e2952ae32343..ac9fefd7623f2f520d5d9a64373b4d5c9eb00280 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2553,9 +2553,8 @@ MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -av
 DISTCHECK_CONFIGURE_FLAGS = $(DISTCHECK_CONFIG_FLAGS)
 CLEANFILES = $(LTDL_CLEANFILES) $(WAND_CLEANFILES) \
        $(MAGICKPP_CLEANFILES) $(UTILITIES_CLEANFILES) \
-       $(TESTS_CLEANFILES) magick/magick-config.h _configs.sed \
-       ltdl/libltdl.la ltdl/libltdlc.la ltdl/libdlloader.la \
-       $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
+       $(TESTS_CLEANFILES) ltdl/libltdl.la ltdl/libltdlc.la \
+       ltdl/libdlloader.la $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
 
 # Binary scripts
 bin_SCRIPTS = \

diff --git a/coders/psd.c b/coders/psd.c
index 467318425b510609ff5dd3cd6918729b59731d69..8dec87f2f49a573a83da3ce8d379794e4795ac31 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -695,6 +695,8 @@ 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(),

diff --git a/config/configure.xml b/config/configure.xml
index a3b7824d7831f83cbb4d653ca290eb5d254876d1..76a47fa691802474344d470e73257785110dd47a 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x659"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,9,3"/>
-  <configure name="RELEASE_DATE" value="2010-02-04"/>
+  <configure name="RELEASE_DATE" value="2010-02-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/magick/version.h b/magick/version.h
index f54dacd7aca9e8c540451fc420359f2b12244235..477c2ee060b048db387c1453845df69fcaab5361 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -32,8 +32,8 @@ extern "C" {
 #define MagickLibVersionNumber  3,0,0
 #define MagickLibAddendum  "-3"
 #define MagickLibInterface  3
-#define MagickReleaseDate  "2010-02-04"
-#define MagickChangeDate   "20100203"
+#define MagickReleaseDate  "2010-02-07"
+#define MagickChangeDate   "20100207"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.9/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)