Changeset 1294

Timestamp:

02/22/10 10:26:39 (3 years ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• magick/quantum-export.c (modified) (2 diffs)
• magick/quantum-import.c (modified) (3 diffs)

ImageMagick/trunk/ChangeLog

@@ -2 +2 @@
   * Insufficient image data in EPT is a warning rather than an error.
   * Respect -type TrueColor when writing gray DPX images.
+  * Fix problem reading 10-bit grayscale DPX images when scanline length is
+    not a multiple of 3.
 
 2010-02-20  6.5.9-10 Cristy  <quetzlzacatenango@image...>

ImageMagick/trunk/magick/quantum-export.c

@@ -775 +775 @@
                 pixel;
 
-              for (x=0; x < (long) number_pixels; x+=3)
+              for (x=0; x < (long) (number_pixels-2); x+=3)
               {
                 pixel=(unsigned long) (
@@ -785 +785 @@
                 q+=quantum_info->pad;
               }
+              pixel=0UL;
               if (x++ < (long) (number_pixels-1))
-                q=PopQuantumPixel(&quantum_state,image->depth,ScaleQuantumToAny(
-                  PixelIntensityToQuantum(p+1),range),q);
+                pixel|=ScaleQuantumToAny(PixelIntensityToQuantum(p+1),
+                  range) << 12;
               if (x++ < (long) number_pixels)
-                q=PopQuantumPixel(&quantum_state,image->depth,ScaleQuantumToAny(
-                  PixelIntensityToQuantum(p+0),range),q);
+                pixel|=ScaleQuantumToAny(PixelIntensityToQuantum(p+0),
+                  range) << 2;
+              q=PopLongPixel(endian,pixel,q);
               break;
             }

ImageMagick/trunk/magick/quantum-import.c

@@ -808 +808 @@
               if (image->endian != LSBEndian)
                 {
-                  for (x=0; x < (long) number_pixels/3; x++)
+                  for (x=0; x < (long) (number_pixels-2); x+=3)
                   {
                     p=PushLongPixel(endian,p,&pixel);
@@ -825 +825 @@
                     q++;
                   }
+                  p=PushLongPixel(endian,p,&pixel);
+                  if (x++ < (long) (number_pixels-1))
+                    {
+                      q->red=ScaleAnyToQuantum((pixel >> 2) & 0x3ff,range);
+                      q->green=q->red;
+                      q->blue=q->red;
+                      q++;
+                    }
+                  if (x++ < (long) number_pixels)
+                    {
+                      q->red=ScaleAnyToQuantum((pixel >> 12) & 0x3ff,range);
+                      q->green=q->red;
+                      q->blue=q->red;
+                      q++;
+                    }
                   break;
                 }
-              for (x=0; x < (long) number_pixels/3; x++)
+              for (x=0; x < (long) (number_pixels-2); x+=3)
               {
                 p=PushLongPixel(endian,p,&pixel);
@@ -844 +859 @@
                 q++;
               }
+              p=PushLongPixel(endian,p,&pixel);
+              if (x++ < (long) (number_pixels-1))
+                {
+                  q->red=ScaleAnyToQuantum((pixel >> 22) & 0x3ff,range);
+                  q->green=q->red;
+                  q->blue=q->red;
+                  q++;
+                }
+              if (x++ < (long) number_pixels)
+                {
+                  q->red=ScaleAnyToQuantum((pixel >> 12) & 0x3ff,range);
+                  q->green=q->red;
+                  q->blue=q->red;
+                  q++;
+                }
               break;
             }