(no commit message)

[imagemagick] / coders / scr.c

diff --git a/coders/scr.c b/coders/scr.c
index b8456f9d4b98141e29e3f80ced308a585ad1a5a7..d7e014c0151482a9527a2246468d93cc1b56592c 100644 (file)
--- a/coders/scr.c
+++ b/coders/scr.c
@@ -17,7 +17,7 @@
 %                               October 2003                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -39,23 +39,24 @@
 /*
   Include declarations.
 */
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -106,21 +107,21 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception)
     int bright;
 
   unsigned char colour_palette[] = {
-    000,000,000,
-    000,000,192,
-    192,000,000,
-    192,000,192,
-    000,192,000,
-    000,192,192,
-    192,192,000,
+      0,  0,  0,
+      0,  0,192,
+    192,  0,  0,
+    192,  0,192,
+      0,192,  0,
+      0,192,192,
+    192,192,  0,
     192,192,192,
-    000,000,000,
-    000,000,255,
-    255,000,000,
-    255,000,255,
-    000,255,000,
-    000,255,255,
-    255,255,000,
+      0,  0,  0,
+      0,  0,255,
+    255,  0,  0,
+    255,  0,255,
+      0,255,  0,
+      0,255,255,
+    255,255,  0,
     255,255,255
   };
 
@@ -130,7 +131,7 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception)
   MagickBooleanType
     status;
 
-  register PixelPacket
+  register Quantum
     *q;
 
   ssize_t
@@ -146,7 +147,7 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception)
       image_info->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickSignature);
-  image=AcquireImage(image_info);
+  image=AcquireImage(image_info,exception);
   status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
   if (status == MagickFalse)
     {
@@ -156,6 +157,7 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception)
   image->columns = 256;
   image->rows = 192;
   count=ReadBlob(image,6144,(unsigned char *) zxscr);
+  (void) count;
   count=ReadBlob(image,768,(unsigned char *) zxattr);
   for(zonenr=0;zonenr<3;zonenr++)
   {
@@ -214,13 +216,19 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
               if(binar[z])
             {
-                q->red=(Quantum) QuantumRange*(colour_palette[3*ink]);
-                q->green=(Quantum) QuantumRange*(colour_palette[1+(3*ink)]);
-                q->blue=(Quantum) QuantumRange*(colour_palette[2+(3*ink)]);
+                SetPixelRed(image,ScaleCharToQuantum(
+                  colour_palette[3*ink]),q);
+                SetPixelGreen(image,ScaleCharToQuantum(
+                  colour_palette[1+(3*ink)]),q);
+                SetPixelBlue(image,ScaleCharToQuantum(
+                  colour_palette[2+(3*ink)]),q);
             } else {
-                q->red=(Quantum) QuantumRange*(colour_palette[3*paper]);
-                q->green=(Quantum) QuantumRange*(colour_palette[1+(3*paper)]);
-                q->blue=(Quantum) QuantumRange*(colour_palette[2+(3*paper)]);
+                SetPixelRed(image,ScaleCharToQuantum(
+                  colour_palette[3*paper]),q);
+                SetPixelGreen(image,ScaleCharToQuantum(
+                  colour_palette[1+(3*paper)]),q);
+                SetPixelBlue(image,ScaleCharToQuantum(
+                  colour_palette[2+(3*paper)]),q);
             }
 
               pix++;
@@ -253,10 +261,10 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception)
 %
 %  The format of the RegisterSCRImage method is:
 %
-%      unsigned long RegisterSCRImage(void)
+%      size_t RegisterSCRImage(void)
 %
 */
-ModuleExport unsigned long RegisterSCRImage(void)
+ModuleExport size_t RegisterSCRImage(void)
 {
   MagickInfo
     *entry;