% October 2003 %
% %
% %
-% Copyright 1999-2010 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 %
/*
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
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
MagickBooleanType
status;
- register PixelPacket
+ register Quantum
*q;
ssize_t
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)
{
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++)
{
if(binar[z])
{
- q->red=ScaleCharToQuantum(colour_palette[3*ink]);
- q->green=ScaleCharToQuantum(colour_palette[1+(3*ink)]);
- q->blue=ScaleCharToQuantum(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=ScaleCharToQuantum(colour_palette[3*paper]);
- q->green=ScaleCharToQuantum(colour_palette[1+(3*paper)]);
- q->blue=ScaleCharToQuantum(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++;