(no commit message)

diff --git a/coders/jbig.c b/coders/jbig.c
index beb2b53ae6513618a6eef485b03d76e71bcdf14a..0ee226ed4ebd5f3c6618b3972fb66834537f2b99 100644 (file)
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -111,10 +111,6 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
   IndexPacket
     index;
 
-  ssize_t
-    length,
-    y;
-
   MagickBooleanType
     status;
 
@@ -131,7 +127,9 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
     *p;
 
   ssize_t
-    count;
+    count,
+    length,
+    y;
 
   struct jbg_dec_state
     jbig_info;
@@ -238,13 +236,13 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
       byte<<=1;
       if (bit == 8)
         bit=0;
-      indexes[x]=index;
+      SetIndexPixelComponent(indexes+x,index);
       *q++=image->colormap[(ssize_t) index];
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
     status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
-                image->rows);
+      image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -397,9 +395,6 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
   double
     version;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -418,6 +413,12 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
   register unsigned char
     *q;
 
+  size_t
+    number_packets;
+
+  ssize_t
+    y;
+
   struct jbg_enc_state
     jbig_info;
 
@@ -426,9 +427,6 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
     byte,
     *pixels;
 
-  size_t
-    number_packets;
-
   /*
     Open image file.
   */
@@ -487,7 +485,7 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
       if (image->previous == (Image *) NULL)
         {
           status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
+            image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -502,13 +500,13 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
       jbg_enc_layers(&jbig_info,(int) image_info->scene);
     else
       {
-        ssize_t
-          sans_offset;
-
         size_t
           x_resolution,
           y_resolution;
 
+        ssize_t
+          sans_offset;
+
         x_resolution=640;
         y_resolution=480;
         sans_offset=0;

diff --git a/coders/jp2.c b/coders/jp2.c
index c1091a623010342c23d763e465d9e632ee54c7e6..c566d6fd6713225fac8ad2ee2db5d8ef52b16231 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -347,10 +347,6 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   jas_stream_t
     *jp2_stream;
 
-  ssize_t
-    components[4],
-    y;
-
   MagickBooleanType
     status;
 
@@ -371,6 +367,10 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
     x_step[4],
     y_step[4];
 
+  ssize_t
+    components[4],
+    y;
+
   /*
     Open image file.
   */
@@ -536,7 +536,8 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
-          q->red=(Quantum) ScaleAnyToQuantum((QuantumAny) pixel,range[0]);
+          SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+            range[0]));
           SetGreenPixelComponent(q,GetRedPixelComponent(q));
           SetBluePixelComponent(q,GetRedPixelComponent(q));
           q++;
@@ -551,11 +552,14 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
-          q->red=(Quantum) ScaleAnyToQuantum((QuantumAny) pixel,range[0]);
+          SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+            range[0]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[1],x/x_step[1]);
-          q->green=(Quantum) ScaleAnyToQuantum((QuantumAny) pixel,range[1]);
+          SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+            range[1]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
-          q->blue=(Quantum) ScaleAnyToQuantum((QuantumAny) pixel,range[2]);
+          SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+            range[2]));
           q++;
         }
         break;
@@ -568,14 +572,17 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
-          q->red=(Quantum) ScaleAnyToQuantum((QuantumAny) pixel,range[0]);
+          SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+            range[0]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[1],x/x_step[1]);
-          q->green=(Quantum) ScaleAnyToQuantum((QuantumAny) pixel,range[1]);
+          SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+            range[1]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
-          q->blue=(Quantum) ScaleAnyToQuantum((QuantumAny) pixel,range[2]);
+          SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel,
+            range[2]));
           pixel=(QuantumAny) jas_matrix_getv(pixels[3],x/x_step[3]);
-          q->opacity=(Quantum) (QuantumRange-
-            ScaleAnyToQuantum((QuantumAny) pixel,range[3]));
+          SetOpacityPixelComponent(q,(QuantumRange-
+            ScaleAnyToQuantum((QuantumAny) pixel,range[3])));
           q++;
         }
         break;
@@ -584,7 +591,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
     status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
-                image->rows);
+      image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -802,10 +809,6 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image)
   const char
     *option;
 
-  ssize_t
-    format,
-    y;
-
   jas_image_cmptparm_t
     component_info[4];
 
@@ -834,6 +837,10 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image)
   size_t
     number_components;
 
+  ssize_t
+    format,
+    y;
+
   /*
     Open image file.
   */
@@ -944,7 +951,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image)
       (void) jas_image_writecmpt(jp2_image,(short) i,0,(unsigned int) y,
         (unsigned int) image->columns,1,pixels[i]);
     status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
+      image->rows);
     if (status == MagickFalse)
       break;
   }

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 826e2c3424f1cbfc7eebbbbf4230336b0ce5b834..07589a9428a09e3a87faea99c1ff553bbf37c6ff 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -242,8 +242,8 @@ static boolean FillInputBuffer(j_decompress_ptr cinfo)
     *source;
 
   source=(SourceManager *) cinfo->src;
-  source->manager.bytes_in_buffer=(size_t)
-    ReadBlob(source->image,MaxBufferExtent,source->buffer);
+  source->manager.bytes_in_buffer=(size_t) ReadBlob(source->image,
+    MaxBufferExtent,source->buffer);
   if (source->manager.bytes_in_buffer == 0)
     {
       if (source->start_of_blob != 0)
@@ -875,9 +875,6 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   IndexPacket
     index;
 
-  ssize_t
-    y;
-
   JSAMPLE
     *jpeg_pixels;
 
@@ -907,6 +904,9 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
     precision,
     units;
 
+  ssize_t
+    y;
+
   /*
     Open image file.
   */
@@ -1212,35 +1212,38 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
             else
               pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4);
             index=ConstrainColormapIndex(image,pixel);
-            indexes[x]=index;
-            *q++=image->colormap[(int) index];
+            SetIndexPixelComponent(indexes+x,index);
+            SetRedPixelComponent(q,image->colormap[(int) index].red);
+            SetGreenPixelComponent(q,image->colormap[(int) index].green);
+            SetBluePixelComponent(q,image->colormap[(int) index].blue);
             p++;
+            q++;
           }
         else
           if (image->colorspace != CMYKColorspace)
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              q->red=ScaleShortToQuantum((unsigned char)
-                (GETJSAMPLE(*p++) << 4));
-              q->green=ScaleShortToQuantum((unsigned char)
-                (GETJSAMPLE(*p++) << 4));
-              q->blue=ScaleShortToQuantum((unsigned char)
-                (GETJSAMPLE(*p++) << 4));
+              SetRedPixelComponent(q,ScaleShortToQuantum((unsigned char)
+                (GETJSAMPLE(*p++) << 4)));
+              SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned char)
+                (GETJSAMPLE(*p++) << 4)));
+              SetBluePixelComponent(q,ScaleShortToQuantum((unsigned char)
+                (GETJSAMPLE(*p++) << 4)));
               SetOpacityPixelComponent(q,OpaqueOpacity);
               q++;
             }
           else
             for (x=0; x < (ssize_t) image->columns; x++)
             {
-              q->red=(Quantum) QuantumRange-ScaleShortToQuantum((unsigned char)
-                (GETJSAMPLE(*p++) << 4));
-              q->green=(Quantum) QuantumRange-ScaleShortToQuantum(
-                (unsigned char) (GETJSAMPLE(*p++) << 4));
-              q->blue=(Quantum) QuantumRange-ScaleShortToQuantum((unsigned char)
-                (GETJSAMPLE(*p++) << 4));
+              SetCyanPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+                (unsigned char) (GETJSAMPLE(*p++) << 4)));
+              SetMagentaPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+                (unsigned char) (GETJSAMPLE(*p++) << 4)));
+              SetYellowPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+                (unsigned char) (GETJSAMPLE(*p++) << 4)));
+              SetBlackPixelComponent(indexes+x,QuantumRange-ScaleShortToQuantum(
+                (unsigned char) (GETJSAMPLE(*p++) << 4)));
               SetOpacityPixelComponent(q,OpaqueOpacity);
-              indexes[x]=(IndexPacket) QuantumRange-ScaleShortToQuantum(
-                (unsigned char) (GETJSAMPLE(*p++) << 4));
               q++;
             }
       }
@@ -1249,37 +1252,45 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p));
-          indexes[x]=(IndexPacket) index;
-          *q++=image->colormap[(int) index];
+          SetIndexPixelComponent(indexes+x,index);
+          SetRedPixelComponent(q,image->colormap[(int) index].red);
+          SetGreenPixelComponent(q,image->colormap[(int) index].green);
+          SetBluePixelComponent(q,image->colormap[(int) index].blue);
           p++;
+          q++;
         }
       else
         if (image->colorspace != CMYKColorspace)
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            q->red=ScaleCharToQuantum((unsigned char) GETJSAMPLE(*p++));
-            q->green=ScaleCharToQuantum((unsigned char) GETJSAMPLE(*p++));
-            q->blue=ScaleCharToQuantum((unsigned char) GETJSAMPLE(*p++));
+            SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+              GETJSAMPLE(*p++)));
+            SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+              GETJSAMPLE(*p++)));
+            SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+              GETJSAMPLE(*p++)));
             SetOpacityPixelComponent(q,OpaqueOpacity);
             q++;
           }
         else
           for (x=0; x < (ssize_t) image->columns; x++)
           {
-            q->red=(Quantum) QuantumRange-ScaleCharToQuantum((unsigned char)
-              GETJSAMPLE(*p++));
-            q->green=(Quantum) QuantumRange-ScaleCharToQuantum((unsigned char)
-              GETJSAMPLE(*p++));
-            q->blue=(Quantum) QuantumRange-ScaleCharToQuantum((unsigned char)
-              GETJSAMPLE(*p++));
+            SetCyanPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+              (unsigned char) GETJSAMPLE(*p++)));
+            SetMagentaPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+              (unsigned char) GETJSAMPLE(*p++)));
+            SetYellowPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+              (unsigned char) GETJSAMPLE(*p++)));
+            SetBlackPixelComponent(indexes+x,QuantumRange-ScaleCharToQuantum(
+              (unsigned char) GETJSAMPLE(*p++)));
             SetOpacityPixelComponent(q,OpaqueOpacity);
-            indexes[x]=(IndexPacket) QuantumRange-ScaleCharToQuantum(
-              (unsigned char) GETJSAMPLE(*p++));
             q++;
           }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
-    if (SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+    status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+      image->rows);
+    if (status == MagickFalse)
       break;
   }
   /*
@@ -1494,14 +1505,12 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image)
     i;
 
   size_t
-    length;
+    length,
+    tag_length;
 
   StringInfo
     *custom_profile;
 
-  size_t
-    tag_length;
-
   /*
     Save image profile as a APP marker.
   */
@@ -1678,9 +1687,6 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
   JSAMPROW
     scanline[1];
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -1690,6 +1696,9 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
   register ssize_t
     i;
 
+  ssize_t
+    y;
+
   struct jpeg_compress_struct
     jpeg_info;
 
@@ -2185,7 +2194,9 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
             p++;
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-          if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+          status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+            image->rows);
+          if (status == MagickFalse)
             break;
         }
       else
@@ -2208,7 +2219,9 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               p++;
             }
             (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-            if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+            status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+              image->rows);
+            if (status == MagickFalse)
               break;
           }
         else
@@ -2240,11 +2253,13 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               *q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
                 GetBluePixelComponent(p))));
               *q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
-                indexes[x])));
+                GetIndexPixelComponent(indexes+x))));
               p++;
             }
             (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-            if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+            status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+              image->rows);
+            if (status == MagickFalse)
               break;
           }
     }
@@ -2269,7 +2284,9 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
           p++;
         }
         (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
-        if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+        status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+          image->rows);
+        if (status == MagickFalse)
           break;
       }
     else
@@ -2299,7 +2316,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
           status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
+            image->rows);
           if (status == MagickFalse)
             break;
         }
@@ -2331,12 +2348,13 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               GetGreenPixelComponent(p)) >> 4));
             *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
               GetBluePixelComponent(p)) >> 4));
-            *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(indexes[x]) >> 4));
+            *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
+              GetIndexPixelComponent(indexes+x)) >> 4));
             p++;
           }
           (void) jpeg_write_scanlines(&jpeg_info,scanline,1);
           status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
+            image->rows);
           if (status == MagickFalse)
             break;
         }

diff --git a/coders/label.c b/coders/label.c
index d24b85a7bed3d897872b446577ff8490064e85e9..4a26c65efc68e39bcffaa2061e9ee344bdc027c0 100644 (file)
--- a/coders/label.c
+++ b/coders/label.c
@@ -180,11 +180,10 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
       draw_info->geometry=AcquireString(geometry);
     }
   if (image->rows == 0)
-    image->rows=(size_t) floor(metrics.height+draw_info->stroke_width+
-      0.5);
+    image->rows=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
   if (image->rows == 0)
-    image->rows=(size_t) floor(draw_info->pointsize+
-      draw_info->stroke_width+0.5);
+    image->rows=(size_t) floor(draw_info->pointsize+draw_info->stroke_width+
+      0.5);
   if (SetImageBackgroundColor(image) == MagickFalse)
     {
       InheritException(exception,&image->exception);

diff --git a/coders/mac.c b/coders/mac.c
index 24aaed20589c2210b438b399824e4016da909029..e21655db08d9373c6e4a5eb285ef3122ebdfc920 100644 (file)
--- a/coders/mac.c
+++ b/coders/mac.c
@@ -191,7 +191,8 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
               {
                 if (bit == 0)
                   byte=(*p++);
-                indexes[x]=(IndexPacket) ((byte & 0x80) != 0 ? 0x01 : 0x00);
+                SetIndexPixelComponent(indexes+x,((byte & 0x80) != 0 ?
+                  0x01 : 0x00));
                 bit++;
                 byte<<=1;
                 if (bit == 8)
@@ -226,7 +227,8 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             if (bit == 0)
               byte=(*p++);
-            indexes[x]=(IndexPacket) ((byte & 0x80) != 0 ? 0x01 : 0x00);
+            SetIndexPixelComponent(indexes+x,((byte & 0x80) != 0 ?
+              0x01 : 0x00));
             bit++;
             byte<<=1;
             if (bit == 8)

diff --git a/coders/map.c b/coders/map.c
index be3876becc1de7af4acd899ccca666a98a2a9eca..7224cff37a0b0b591c49a6018ac2d3685460727b 100644 (file)
--- a/coders/map.c
+++ b/coders/map.c
@@ -103,9 +103,6 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception)
   IndexPacket
     index;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -125,19 +122,18 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception)
     *p;
 
   size_t
-    packet_size;
+    depth,
+    packet_size,
+    quantum;
 
   ssize_t
-    count;
+    count,
+    y;
 
   unsigned char
     *colormap,
     *pixels;
 
-  size_t
-    depth,
-    quantum;
-
   /*
     Open image file.
   */
@@ -231,8 +227,10 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception)
           index=ConstrainColormapIndex(image,((size_t) index << 8)+(*p));
           p++;
         }
-      indexes[x]=(IndexPacket) index;
-      *q++=image->colormap[(ssize_t) index];
+      SetIndexPixelComponent(indexes+x,index);
+      SetRedPixelComponent(q,image->colormap[(ssize_t) index].red);
+      SetGreenPixelComponent(q,image->colormap[(ssize_t) index].green);
+      SetBluePixelComponent(q,image->colormap[(ssize_t) index].blue);
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
@@ -338,9 +336,6 @@ ModuleExport void UnregisterMAPImage(void)
 */
 static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image)
 {
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -358,15 +353,16 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image)
     *q;
 
   size_t
+    depth,
     packet_size;
 
+  ssize_t
+    y;
+
   unsigned char
     *colormap,
     *pixels;
 
-  size_t
-    depth;
-
   /*
     Open output image file.
   */
@@ -432,7 +428,8 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image)
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if (image->colors > 256)
-        *q++=(unsigned char) ((size_t) indexes[x] >> 8);
+        *q++=(unsigned char) ((size_t) (GetIndexPixelComponent(indexes+x) >>
+          8));
       *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
     }
     (void) WriteBlob(image,(size_t) (q-pixels),pixels);

diff --git a/coders/mat.c b/coders/mat.c
index a555611e5e292a76774d88deaa6f2162e90e8a67..ac56a5da3179140f81e1855520b491c79d4779c3 100644 (file)
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -189,34 +189,46 @@ static void InsertComplexDoubleRow(double *p, int y, Image * image, double MinVa
     MaxVal = 1;
 
   exception=(&image->exception);
-  q = QueueAuthenticPixels(image, 0, y, image->columns, 1,exception);
+  q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
   if (q == (PixelPacket *) NULL)
     return;
   for (x = 0; x < (ssize_t) image->columns; x++)
   {
     if (*p > 0)
     {
-      f = (*p / MaxVal) * (QuantumRange - q->red);
-      if (f + q->red > QuantumRange)
-        q->red = QuantumRange;
+      f = (*p / MaxVal) * (QuantumRange - GetRedPixelComponent(q));
+      if (f + GetRedPixelComponent(q) > QuantumRange)
+        SetRedPixelComponent(q,QuantumRange);
       else
-        q->red += (int) f;
-      if ((int) f / 2.0 > q->green)
-        q->green = q->blue = 0;
+        SetRedPixelComponent(q,GetRedPixelComponent(q)+(int) f);
+      if ((int) f / 2.0 > GetGreenPixelCompoment(q))
+        {
+          SetGreenPixelComponent(q,0);
+          SetBluePixelComponent(q,0);
+        }
       else
-        q->green = q->blue -= (int) (f / 2.0);
+        {
+          SetBluePixelComponent(q,GetBluePixelComponent(q)-(int) (f/2.0));
+          SetGreenPixelComponent(q,GetBluePixelComponent(q));
+        }
     }
     if (*p < 0)
     {
-      f = (*p / MaxVal) * (QuantumRange - q->blue);
-      if (f + q->blue > QuantumRange)
-        q->blue = QuantumRange;
+      f = (*p / MaxVal) * (QuantumRange - GetBluePixelComponent(q));
+      if (f + GetBluePixelComponent(q) > QuantumRange)
+        SetBluePixelComponent(q,QuantumRange);
       else
-        q->blue += (int) f;
+        SetBluePixelComponent(q,GetBluePixelComponent(q)+(int) f);
       if ((int) f / 2.0 > q->green)
-        q->green = q->red = 0;
+        {
+          SetRedPixelComponent(q,0);
+          SetGreenPixelComponent(q,0);
+        }
       else
-        q->green = q->red -= (int) (f / 2.0);
+        {
+          SetRedPixelComponent(q,GetRedPixelComponent(q)-(int) (f/2.0));
+          SetGreenPixelComponent(q,GetRedPixelComponent(q));
+        }
     }
     p++;
     q++;
@@ -250,27 +262,39 @@ static void InsertComplexFloatRow(float *p, int y, Image * image, double MinVal,
   {
     if (*p > 0)
     {
-      f = (*p / MaxVal) * (QuantumRange - q->red);
-      if (f + q->red > QuantumRange)
-        q->red = QuantumRange;
+      f = (*p / MaxVal) * (QuantumRange - GetRedPixelComponent(q));
+      if (f + GetRedPixelComponent(q) > QuantumRange)
+        SetRedPixelComponent(q,QuantumRange);
       else
-        q->red += (int) f;
-      if ((int) f / 2.0 > q->green)
-        q->green = q->blue = 0;
+        SetRedPixelComponent(q,GetRedPixelComponent(q)+(int) f);
+      if ((int) f / 2.0 > GetGreenPixelComponent(q))
+        {
+          SetGreenPixelComponent(q,0);
+          SetBluePixelComponent(q,0);
+        }
       else
-        q->green = q->blue -= (int) (f / 2.0);
+        {
+          SetBluePixelComponent(q,GetBluePixelComponent(q)-(int) (f/2.0));
+          SetGreenPixelComponent(q,GetBluePixelComponent(q));
+        }
     }
     if (*p < 0)
     {
-      f = (*p / MaxVal) * (QuantumRange - q->blue);
-      if (f + q->blue > QuantumRange)
-        q->blue = QuantumRange;
+      f = (*p / MaxVal) * (QuantumRange - GetBluePixelComponent(q));
+      if (f + GetBluePixelComponent(q) > QuantumRange)
+        SetBluePixelComponent(q,QuantumRange);
       else
-        q->blue += (int) f;
+        SetBluePixelComponent(q,GetBluePixelComponent(q)+(int) f);
       if ((int) f / 2.0 > q->green)
-        q->green = q->red = 0;
+        {
+          SetGreenPixelComponent(q,0);
+          SetRedPixelComponent(q,0);
+        }
       else
-        q->green = q->red -= (int) (f / 2.0);
+        {
+          SetRedPixelComponent(q,GetRedPixelComponent(q)-(int) (f/2.0));
+          SetGreenPixelComponent(q,GetRedPixelComponent(q));
+        }
     }
     p++;
     q++;

diff --git a/coders/matte.c b/coders/matte.c
index c3956537a54551abde9de98cd7c28dcbbca877c3..4f9ddb1b355983f446ee48a9f83bb2befef1ab04 100644 (file)
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -159,9 +159,6 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
   Image
     *matte_image;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -174,6 +171,9 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
   register PixelPacket
     *q;
 
+  ssize_t
+    y;
+
   if (image->matte == MagickFalse)
     ThrowWriterException(CoderError,"ImageDoesNotHaveAAlphaChannel");
   matte_image=CloneImage(image,image->columns,image->rows,MagickTrue,
@@ -194,9 +194,9 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      q->red=GetOpacityPixelComponent(p);
-      q->green=GetOpacityPixelComponent(p);
-      q->blue=GetOpacityPixelComponent(p);
+      SetRedPixelComponent(q,GetOpacityPixelComponent(p));
+      SetGreenPixelComponent(q,GetOpacityPixelComponent(p));
+      SetBluePixelComponent(q,GetOpacityPixelComponent(p));
       SetOpacityPixelComponent(q,OpaqueOpacity);
       p++;
       q++;
@@ -204,7 +204,7 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
     if (SyncAuthenticPixels(matte_image,exception) == MagickFalse)
       break;
     status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
+      image->rows);
     if (status == MagickFalse)
       break;
   }

diff --git a/coders/meta.c b/coders/meta.c
index 373c3a0bee0b71aa0eb53b8e681b1d5b40633611..2785d1486682dc38dc527dbd4bc6b9c2b65b778b 100644 (file)
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -311,14 +311,14 @@ static ssize_t parse8BIM(Image *ifile, Image *ofile)
   int
     inputlen = BUFFER_SZ;
 
-  ssize_t
-    savedolen = 0L,
-    outputlen = 0L;
-
   MagickOffsetType
     savedpos,
     currentpos;
 
+  ssize_t
+    savedolen = 0L,
+    outputlen = 0L;
+
   TokenInfo
     *token_info;