(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 45b2ca0bdf41363159f991b4578acbeb0f4fd6c6..e76e95fbf46719b5a4be07dae340c8bada17de69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-05-14  6.6.1-9 Cristy  <quetzlzacatenango@image...>
   * Increase the estimated # points for the path drawing primitive.
+  * Remove any prior resolution block from PSD before writing the new block.
 
 2010-05-14  6.6.1-9 Anthony Thyssen <A.Thyssen@griffith...>
   * Addition of more Morphologocal/Convolution Kernels.

diff --git a/coders/psd.c b/coders/psd.c
index 7a87fbddba49e2b30e22d20955d1974548c8dcf2..7ed2a9894f9cfcc354016b913e9cd4a2937e5131 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -428,10 +428,10 @@ static MagickBooleanType ParseImageResourceBlocks(Image *image,
   {
     if (LocaleNCompare((const char *) p,"8BIM",4) != 0)
       break;
-    p=PushLongPixel(LSBEndian,p,&long_sans);
-    p=PushShortPixel(LSBEndian,p,&id);
-    p=PushShortPixel(LSBEndian,p,&short_sans);
-    p=PushLongPixel(LSBEndian,p,&count);
+    p=PushLongPixel(MSBEndian,p,&long_sans);
+    p=PushShortPixel(MSBEndian,p,&id);
+    p=PushShortPixel(MSBEndian,p,&short_sans);
+    p=PushLongPixel(MSBEndian,p,&count);
     switch (id)
     {
       case 0x03ed:
@@ -442,16 +442,16 @@ static MagickBooleanType ParseImageResourceBlocks(Image *image,
         /*
           Resolution info.
         */
-        p=PushShortPixel(LSBEndian,p,&resolution);
+        p=PushShortPixel(MSBEndian,p,&resolution);
         image->x_resolution=(double) resolution;
-        p=PushShortPixel(LSBEndian,p,&short_sans);
-        p=PushShortPixel(LSBEndian,p,&short_sans);
-        p=PushShortPixel(LSBEndian,p,&short_sans);
-        p=PushShortPixel(LSBEndian,p,&resolution);
+        p=PushShortPixel(MSBEndian,p,&short_sans);
+        p=PushShortPixel(MSBEndian,p,&short_sans);
+        p=PushShortPixel(MSBEndian,p,&short_sans);
+        p=PushShortPixel(MSBEndian,p,&resolution);
         image->y_resolution=(double) resolution;
-        p=PushShortPixel(LSBEndian,p,&short_sans);
-        p=PushShortPixel(LSBEndian,p,&short_sans);
-        p=PushShortPixel(LSBEndian,p,&short_sans);
+        p=PushShortPixel(MSBEndian,p,&short_sans);
+        p=PushShortPixel(MSBEndian,p,&short_sans);
+        p=PushShortPixel(MSBEndian,p,&short_sans);
         break;
       }
       default:
@@ -1921,6 +1921,54 @@ static void RemoveICCProfileFromResourceBlock(StringInfo *bim_profile)
   }
 }
 
+static void RemoveResolutionFromResourceBlock(StringInfo *bim_profile)
+{
+  register const unsigned char
+    *p;
+
+  size_t
+    length;
+
+  unsigned char
+    *datum;
+
+  unsigned long
+    count,
+    long_sans;
+
+  unsigned short
+    id,
+    short_sans;
+
+  length=GetStringInfoLength(bim_profile);
+  if (length < 16)
+    return;
+  datum=GetStringInfoDatum(bim_profile);
+  for (p=datum; (p >= datum) && (p < (datum+length-16)); )
+  {
+    register unsigned char
+      *q;
+
+    q=(unsigned char *) p;
+    if (LocaleNCompare((const char *) p,"8BIM",4) != 0)
+      break;
+    p=PushLongPixel(MSBEndian,p,&long_sans);
+    p=PushShortPixel(MSBEndian,p,&id);
+    p=PushShortPixel(MSBEndian,p,&short_sans);
+    p=PushLongPixel(MSBEndian,p,&count);
+    if (id == 0x000003ed)
+      {
+        (void) CopyMagickMemory(q,q+PSDQuantum(count)+12,length-
+          (PSDQuantum(count)+12)-(q-datum));
+        SetStringInfoLength(bim_profile,length-(PSDQuantum(count)+12));
+        break;
+      }
+    p+=count;
+    if ((count & 0x01) != 0)
+      p++;
+  }
+}
+
 static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image)
 {
   const char
@@ -2066,18 +2114,19 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image)
       bim_profile=CloneStringInfo(bim_profile);
       if (icc_profile != (StringInfo *) NULL)
         RemoveICCProfileFromResourceBlock(bim_profile);
+      RemoveResolutionFromResourceBlock(bim_profile);
       length+=PSDQuantum(GetStringInfoLength(bim_profile));
     }
   if (icc_profile != (const StringInfo *) NULL)
     length+=PSDQuantum(GetStringInfoLength(icc_profile))+12;
   (void) WriteBlobMSBLong(image,(unsigned int) length);
+  WriteResolutionResourceBlock(image);
   if (bim_profile != (StringInfo *) NULL)
     {
       (void) WriteBlob(image,GetStringInfoLength(bim_profile),
         GetStringInfoDatum(bim_profile));
       bim_profile=DestroyStringInfo(bim_profile);
     }
-  WriteResolutionResourceBlock(image);
   if (icc_profile != (StringInfo *) NULL)
     {
       (void) WriteBlob(image,4,(const unsigned char *) "8BIM");