commit 802d364f093d693396e7052869766dd9fbe4d94b
author cristy <urban-warrior@git.imagemagick.org> Wed Apr 27 02:02:41 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Wed Apr 27 02:02:41 2011 +0000
tree a45d0ad126152f4c435389d5cb2f267dab029541
parent d483c4680af84815a38eccf4abd739f70f9e57cb

coders/ps2.c

diff --git a/coders/ps2.c b/coders/ps2.c
index a9391b3..d1c23e6 100644
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -391,10 +391,6 @@
   GeometryInfo
     geometry_info;
 
-  ssize_t
-    j,
-    y;
-
   MagickOffsetType
     scene,
     start,
@@ -439,7 +435,13 @@
     bounds;
 
   size_t
-    length;
+    length,
+    page,
+    text_size;
+
+  ssize_t
+    j,
+    y;
 
   time_t
     timer;
@@ -447,10 +449,6 @@
   unsigned char
     *pixels;
 
-  size_t
-    page,
-    text_size;
-
   /*
     Open output image file.
   */
@@ -790,7 +788,8 @@
                 *q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
                 p++;
               }
-              progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
+              progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+                image->rows);
               if (progress == MagickFalse)
                 break;
             }
@@ -821,8 +820,8 @@
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
-                Ascii85Encode(image,
-                  ScaleQuantumToChar(PixelIntensityToQuantum(p)));
+                Ascii85Encode(image,ScaleQuantumToChar(
+                  PixelIntensityToQuantum(p)));
                 p++;
               }
               progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
@@ -903,11 +902,13 @@
                         *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
                         *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
                         *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
-                        *q++=ScaleQuantumToChar(indexes[x]);
+                        *q++=ScaleQuantumToChar(GetIndexPixelComponent(
+                          indexes+x));
                       }
                   p++;
                 }
-                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
+                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
+                  y,image->rows);
                 if (progress == MagickFalse)
                   break;
               }
@@ -952,20 +953,27 @@
                   else
                     if (image->colorspace != CMYKColorspace)
                       {
-                        Ascii85Encode(image,ScaleQuantumToChar(GetRedPixelComponent(p)));
-                        Ascii85Encode(image,ScaleQuantumToChar(GetGreenPixelComponent(p)));
-                        Ascii85Encode(image,ScaleQuantumToChar(GetBluePixelComponent(p)));
+                        Ascii85Encode(image,ScaleQuantumToChar(
+                          GetRedPixelComponent(p)));
+                        Ascii85Encode(image,ScaleQuantumToChar(
+                          GetGreenPixelComponent(p)));
+                        Ascii85Encode(image,ScaleQuantumToChar(
+                          GetBluePixelComponent(p)));
                       }
                     else
                       {
-                        Ascii85Encode(image,ScaleQuantumToChar(GetRedPixelComponent(p)));
-                        Ascii85Encode(image,ScaleQuantumToChar(GetGreenPixelComponent(p)));
-                        Ascii85Encode(image,ScaleQuantumToChar(GetBluePixelComponent(p)));
+                        Ascii85Encode(image,ScaleQuantumToChar(
+                          GetRedPixelComponent(p)));
+                        Ascii85Encode(image,ScaleQuantumToChar(
+                          GetGreenPixelComponent(p)));
+                        Ascii85Encode(image,ScaleQuantumToChar(
+                          GetBluePixelComponent(p)));
                         Ascii85Encode(image,ScaleQuantumToChar(indexes[x]));
                       }
                   p++;
                 }
-                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
+                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
+                  y,image->rows);
                 if (progress == MagickFalse)
                   break;
               }
@@ -1027,7 +1035,8 @@
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
                   *q++=(unsigned char) GetIndexPixelComponent(indexes+x);
-                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
+                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
+                  y,image->rows);
                 if (progress == MagickFalse)
                   break;
               }
@@ -1058,8 +1067,10 @@
                   break;
                 indexes=GetVirtualIndexQueue(image);
                 for (x=0; x < (ssize_t) image->columns; x++)
-                  Ascii85Encode(image,(unsigned char) indexes[x]);
-                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows);
+                  Ascii85Encode(image,(unsigned char) GetIndexPixelComponent(
+                    indexes+x));
+                progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
+                  y,image->rows);
                 if (progress == MagickFalse)
                   break;
               }