(no commit message)

diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index d2cf1db026012daa73a645664191871f2e52e02b..b20d43798246b2cd085fefda07138bbb4631be8d 100644 (file)
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -1369,14 +1369,17 @@ MagickExport size_t ExportQuantumPixels(Image *image,CacheView *image_view,
                 p+=3;
                 q+=quantum_info->pad;
               }
-              pixel=0UL;
-              if (x++ < (ssize_t) (number_pixels-1))
-                pixel|=ScaleQuantumToAny(GetPixelIntensity(image,p+1),
-                  range) << 12;
-              if (x++ < (ssize_t) number_pixels)
-                pixel|=ScaleQuantumToAny(GetPixelIntensity(image,p+0),
-                  range) << 2;
-              q=PopLongPixel(endian,pixel,q);
+              if (x < (ssize_t) number_pixels)
+                {
+                  pixel=0U;
+                  if (x++ < (ssize_t) (number_pixels-1))
+                    pixel|=ScaleQuantumToAny(GetPixelIntensity(image,p+1),
+                      range) << 12;
+                  if (x++ < (ssize_t) number_pixels)
+                    pixel|=ScaleQuantumToAny(GetPixelIntensity(image,p+0),
+                      range) << 2;
+                  q=PopLongPixel(endian,pixel,q);
+                }
               break;
             }
           for (x=0; x < (ssize_t) number_pixels; x++)

diff --git a/coders/cin.c b/coders/cin.c
index a0508e5bd231350a4f833199a8285d4406b8ea7e..1238db43499261f2000dd7768943f58c567f00a9 100644 (file)
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -1165,7 +1165,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image,
   if (0)
     {
       quantum_type=GrayQuantum;
-      length=GetBytesPerRow(image->columns,3,image->depth,MagickTrue);
+      length=GetBytesPerRow(image->columns,1,image->depth,MagickTrue);
     }
   for (y=0; y < (ssize_t) image->rows; y++)
   {

diff --git a/coders/dpx.c b/coders/dpx.c
index ad672c488d499218766005507ea0c6cf44606ee0..f8ab20647b736740311d8fe13630426e50c6c4f0 100644 (file)
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1290,6 +1290,9 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
   DPXInfo
     dpx;
 
+  GeometryInfo
+    geometry_info;
+
   MagickBooleanType
     status;
 
@@ -1299,9 +1302,6 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
   MagickStatusType
     flags;
 
-  GeometryInfo
-    geometry_info;
-
   QuantumInfo
     *quantum_info;
 
@@ -1704,7 +1704,8 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
     dpx.television.field_number=(unsigned char) StringToLong(value);
   offset+=WriteBlobByte(image,dpx.television.field_number);
   dpx.television.video_signal=0;
-  value=GetDPXProperty(image_info,image,"dpx:television.video_signal",exception);
+  value=GetDPXProperty(image_info,image,"dpx:television.video_signal",
+    exception);
   if (value != (const char *) NULL)
     dpx.television.video_signal=(unsigned char) StringToLong(value);
   offset+=WriteBlobByte(image,dpx.television.video_signal);
@@ -1714,18 +1715,15 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
     dpx.television.padding=(unsigned char) StringToLong(value);
   offset+=WriteBlobByte(image,dpx.television.padding);
   dpx.television.horizontal_sample_rate=0.0f;
-  value=GetDPXProperty(image_info,image,
-    "dpx:television.horizontal_sample_rate",exception);
+  value=GetDPXProperty(image_info,image,"dpx:television.horizontal_sample_rate",    exception);
   if (value != (const char *) NULL)
-    dpx.television.horizontal_sample_rate=StringToDouble(value,
-      (char **) NULL);
+    dpx.television.horizontal_sample_rate=StringToDouble(value,(char **) NULL);
   offset+=WriteBlobFloat(image,dpx.television.horizontal_sample_rate);
   dpx.television.vertical_sample_rate=0.0f;
   value=GetDPXProperty(image_info,image,"dpx:television.vertical_sample_rate",
     exception);
   if (value != (const char *) NULL)
-    dpx.television.vertical_sample_rate=StringToDouble(value,
-      (char **) NULL);
+    dpx.television.vertical_sample_rate=StringToDouble(value,(char **) NULL);
   offset+=WriteBlobFloat(image,dpx.television.vertical_sample_rate);
   dpx.television.frame_rate=0.0f;
   value=GetDPXProperty(image_info,image,"dpx:television.frame_rate",exception);