(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 742f241500e0b302392d2a4cd8a9cec62f37c792..7a2a7030686d4bcc84364656bdd2627febee5ca4 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.6.0
-%define Patchlevel  4
+%define Patchlevel  3
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/psd.c b/coders/psd.c
index b78894b0ac64e670957cdd9199421bbef850e9c4..9cefd97e26db0887f76bb2d2c1fb9d5e2b6a576b 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1674,8 +1674,9 @@ static size_t PSDPackbitsEncodeImage(Image *image,const size_t length,
   return(q-compressed_pixels);
 }
 
-static void WritePackbitsLength(const ImageInfo *image_info,Image *image,
-  Image *tmp_image,unsigned char *pixels,unsigned char *compressed_pixels,
+static void WritePackbitsLength(const PSDInfo *psd_info,
+  const ImageInfo *image_info,Image *image,Image *tmp_image,
+  unsigned char *pixels,unsigned char *compressed_pixels,
   const QuantumType quantum_type)
 {
   int
@@ -1703,14 +1704,15 @@ static void WritePackbitsLength(const ImageInfo *image_info,Image *image,
     length=ExportQuantumPixels(tmp_image,(CacheView *) NULL,quantum_info,
       quantum_type,pixels,&image->exception);
     length=PSDPackbitsEncodeImage(image,length,pixels,compressed_pixels);
-    (void) WriteBlobMSBShort(image,length);
+    (void) SetPSDOffset(psd_info,image,length);
   }
   quantum_info=DestroyQuantumInfo(quantum_info);
 }
 
-static void WriteOneChannel(const ImageInfo *image_info,Image *image,
-  Image *tmp_image,unsigned char *pixels,unsigned char *compressed_pixels,
-  const QuantumType quantum_type,const MagickBooleanType compression_flag)
+static void WriteOneChannel(const PSDInfo *psd_info,const ImageInfo *image_info,
+  Image *image,Image *tmp_image,unsigned char *pixels,
+  unsigned char *compressed_pixels,const QuantumType quantum_type,
+  const MagickBooleanType compression_flag)
 {
   int
     y;
@@ -1750,8 +1752,9 @@ static void WriteOneChannel(const ImageInfo *image_info,Image *image,
   quantum_info=DestroyQuantumInfo(quantum_info);
 }
 
-static MagickBooleanType WriteImageChannels(const ImageInfo *image_info,
-  Image *image,Image *tmp_image,const MagickBooleanType separate)
+static MagickBooleanType WriteImageChannels(const PSDInfo *psd_info,
+  const ImageInfo *image_info,Image *image,Image *tmp_image,
+  const MagickBooleanType separate)
 {
   int
     i;
@@ -1765,7 +1768,7 @@ static MagickBooleanType WriteImageChannels(const ImageInfo *image_info,
     *pixels;
 
   /*
-    Write uncompressed pixel datas separate planes.
+    Write uncompressed pixels as separate planes.
   */
   channels=1;
   if ((tmp_image->storage_class == PseudoClass) &&
@@ -1796,20 +1799,20 @@ static MagickBooleanType WriteImageChannels(const ImageInfo *image_info,
           */
           (void) WriteBlobMSBShort(image,1);
           if (tmp_image->matte == MagickFalse)
-            WritePackbitsLength(image_info,image,tmp_image,pixels,
+            WritePackbitsLength(psd_info,image_info,image,tmp_image,pixels,
               compressed_pixels,IndexQuantum);
           else
-            WritePackbitsLength(image_info,image,tmp_image,pixels,
+            WritePackbitsLength(psd_info,image_info,image,tmp_image,pixels,
               compressed_pixels,IndexAlphaQuantum);
         }
       if (tmp_image->matte == MagickFalse)
-        WriteOneChannel(image_info,image,tmp_image,pixels,compressed_pixels,
-          IndexQuantum,(i++ == 0) || (separate != MagickFalse) ?
-          MagickTrue : MagickFalse);
+        WriteOneChannel(psd_info,image_info,image,tmp_image,pixels,
+          compressed_pixels,IndexQuantum,(i++ == 0) ||
+          (separate != MagickFalse) ? MagickTrue : MagickFalse);
       else
-        WriteOneChannel(image_info,image,tmp_image,pixels,compressed_pixels,
-          IndexAlphaQuantum,(i++ == 0) || (separate != MagickFalse) ?
-          MagickTrue : MagickFalse);
+        WriteOneChannel(psd_info,image_info,image,tmp_image,pixels,
+          compressed_pixels,IndexAlphaQuantum,(i++ == 0) ||
+          (separate != MagickFalse) ?  MagickTrue : MagickFalse);
       (void) SetImageProgress(image,SaveImagesTag,0,1);
     }
   else
@@ -1823,41 +1826,41 @@ static MagickBooleanType WriteImageChannels(const ImageInfo *image_info,
           */
           (void) WriteBlobMSBShort(image,1);
           if (tmp_image->matte != MagickFalse)
-            WritePackbitsLength(image_info,image,tmp_image,pixels,
+            WritePackbitsLength(psd_info,image_info,image,tmp_image,pixels,
               compressed_pixels,AlphaQuantum);
-          WritePackbitsLength(image_info,image,tmp_image,pixels,
+          WritePackbitsLength(psd_info,image_info,image,tmp_image,pixels,
             compressed_pixels,RedQuantum);
-          WritePackbitsLength(image_info,image,tmp_image,pixels,
+          WritePackbitsLength(psd_info,image_info,image,tmp_image,pixels,
             compressed_pixels,GreenQuantum);
-          WritePackbitsLength(image_info,image,tmp_image,pixels,
+          WritePackbitsLength(psd_info,image_info,image,tmp_image,pixels,
             compressed_pixels,BlueQuantum);
           if (tmp_image->colorspace == CMYKColorspace)
-            WritePackbitsLength(image_info,image,tmp_image,pixels,
+            WritePackbitsLength(psd_info,image_info,image,tmp_image,pixels,
               compressed_pixels,BlackQuantum);
         }
       (void) SetImageProgress(image,SaveImagesTag,0,6);
       if (tmp_image->matte != MagickFalse)
-        WriteOneChannel(image_info,image,tmp_image,pixels,compressed_pixels,
-          AlphaQuantum,(i++ == 0) || (separate != MagickFalse) ?
-          MagickTrue : MagickFalse);
+        WriteOneChannel(psd_info,image_info,image,tmp_image,pixels,
+          compressed_pixels,AlphaQuantum,(i++ == 0) ||
+          (separate != MagickFalse) ? MagickTrue : MagickFalse);
       (void) SetImageProgress(image,SaveImagesTag,1,6);
-      WriteOneChannel(image_info,image,tmp_image,pixels,compressed_pixels,
-        RedQuantum,(i++ == 0) || (separate != MagickFalse) ?
+      WriteOneChannel(psd_info,image_info,image,tmp_image,pixels,
+        compressed_pixels,RedQuantum,(i++ == 0) || (separate != MagickFalse) ?
         MagickTrue : MagickFalse);
       (void) SetImageProgress(image,SaveImagesTag,2,6);
-      WriteOneChannel(image_info,image,tmp_image,pixels,compressed_pixels,
-        GreenQuantum,(i++ == 0) || (separate != MagickFalse) ?
+      WriteOneChannel(psd_info,image_info,image,tmp_image,pixels,
+        compressed_pixels,GreenQuantum,(i++ == 0) || (separate != MagickFalse) ?
         MagickTrue : MagickFalse);
       (void) SetImageProgress(image,SaveImagesTag,3,6);
-      WriteOneChannel(image_info,image,tmp_image,pixels,compressed_pixels,
-        BlueQuantum,(i++ == 0) || (separate != MagickFalse) ?
+      WriteOneChannel(psd_info,image_info,image,tmp_image,pixels,
+        compressed_pixels,BlueQuantum,(i++ == 0) || (separate != MagickFalse) ?
         MagickTrue : MagickFalse);
       (void) SetImageProgress(image,SaveImagesTag,4,6);
       if (tmp_image->colorspace == CMYKColorspace)
         {
-          WriteOneChannel(image_info,image,tmp_image,pixels,compressed_pixels,
-            BlackQuantum,(i++ == 0) || (separate != MagickFalse) ?
-            MagickTrue : MagickFalse);
+          WriteOneChannel(psd_info,image_info,image,tmp_image,pixels,
+            compressed_pixels,BlackQuantum,(i++ == 0) ||
+            (separate != MagickFalse) ? MagickTrue : MagickFalse);
           (void) NegateImage(image,MagickFalse);
         }
       (void) SetImageProgress(image,SaveImagesTag,5,6);
@@ -1992,6 +1995,9 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image)
     invert_layer_count = MagickFalse,
     status;
 
+  PSDInfo
+    psd_info;
+
   register long
     i;
 
@@ -2029,10 +2035,15 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image)
   packet_size=(size_t) (image->depth > 8 ? 6 : 3);
   if (image->matte != MagickFalse)
     packet_size+=image->depth > 8 ? 2 : 1;
-  (void) WriteBlob(image,4,(const unsigned char *) "8BPS");
-  (void) WriteBlobMSBShort(image,1);  /* version */
-  for ( i=1; i<=6; i++)
-  (void) WriteBlobByte(image, 0);  /* 6 bytes of reserved */
+  psd_info.version=1;
+  if ((LocaleCompare(image_info->magick,"PSB") == 0) ||
+      (image->columns > 30000) || (image->rows > 30000))
+    psd_info.version=2;
+  (void) WriteBlob(image,4,(const unsigned char *) (psd_info.version == 1 ?
+    "8BPS" : "8BPB"));
+  (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;
   else
@@ -2136,7 +2147,7 @@ compute_layer_info:
   }
 
   if ( layer_count == 0 )
-    (void) WriteBlobMSBLong(image, 0);
+    (void) SetPSDSize(&psd_info,image,0);
   else
   {
     (void) WriteBlobMSBLong(image,layer_info_size+4+4);
@@ -2235,7 +2246,7 @@ compute_layer_info:
      /* now the image data! */
     tmp_image = base_image;
     while ( tmp_image != NULL ) {
-      status=WriteImageChannels(image_info,image,tmp_image,MagickTrue);
+      status=WriteImageChannels(&psd_info,image_info,image,tmp_image,MagickTrue);
 
       /* add in the pad! */
        if ( rounded_layer_info_size != layer_info_size )
@@ -2253,7 +2264,7 @@ compute_layer_info:
    if (force_white_background != MagickFalse)
      WriteWhiteBackground(image);
    else
-     status=WriteImageChannels(image_info,image,image,MagickFalse);
+     status=WriteImageChannels(&psd_info,image_info,image,image,MagickFalse);
 
   (void) CloseBlob(image);
   return(status);

diff --git a/config/configure.xml b/config/configure.xml
index 0a31b6413d8a114cb7bf20cccf0a25fe388a2648..0a7ed5a60157bfe595ea11e6f51667e65b0a41bf 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x660"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,0,4"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,0,3"/>
   <configure name="RELEASE_DATE" value="2010-03-06"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index eaf8b4fda0d406074026eecb1d33c3fa74426d3f..d9595fb6ce5deb984301f404581f1f90016f6c75 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.6.0-4
+# Generated automatically by config.status (ImageMagick) 6.6.0-3
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

diff --git a/magick/option.c b/magick/option.c
index efc278f7b89ea47cd9103e3c82ce3b3332e72dc1..dbd339ebd3c6fbb152ba7d50a9b9933dd7e2d697 100644 (file)
--- a/magick/option.c
+++ b/magick/option.c
@@ -984,6 +984,8 @@ static const OptionInfo
     { "layers", MagickTrue, MagickFalse },
     { "limit", MagickTrue, MagickFalse },
     { "map", MagickTrue, MagickFalse },
+    { "maximum", MagickTrue, MagickFalse },
+    { "minimum", MagickTrue, MagickFalse },
     { "morph", MagickTrue, MagickFalse },
     { "mosaic", MagickTrue, MagickFalse },
     { "optimize", MagickTrue, MagickFalse },

diff --git a/magick/version.h b/magick/version.h
index 190393ecacf9d0ba97be312f2a0ef084db5b127c..9bc71ba8308efc19f74a80589cc9a5d1a3d538f0 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x660
 #define MagickLibVersionText  "6.6.0"
 #define MagickLibVersionNumber  3,0,0
-#define MagickLibAddendum  "-4"
+#define MagickLibAddendum  "-3"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-03-06"

diff --git a/version.sh b/version.sh
index c721628cf73b4e2c64a939d3ea56612258445670..b26dbcc63c90f14762b238d811c75e21fbd21a3c 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.6.0'
 PACKAGE_LIB_VERSION="0x660"
-PACKAGE_RELEASE="4"
+PACKAGE_RELEASE="3"
 PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"

diff --git a/wand/convert.c b/wand/convert.c
index d156af624424a3755b31222aaf31eaf662c1be68..4eeea668ac48f5a97ba4319e7b3a437f88a93d4f 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -1883,7 +1883,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
               ThrowConvertException(OptionError,"MissingArgument",option);
             break;
           }
-        if (LocaleCompare("max",option+1) == 0)
+        if (LocaleCompare("maximum",option+1) == 0)
           break;
         if (LocaleCompare("median",option+1) == 0)
           {
@@ -1896,7 +1896,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
               ThrowConvertInvalidArgumentException(option,argv[i]);
             break;
           }
-        if (LocaleCompare("min",option+1) == 0)
+        if (LocaleCompare("minimum",option+1) == 0)
           break;
         if (LocaleCompare("modulate",option+1) == 0)
           {