X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=coders%2Fmono.c;h=835c4912182efc2e389899e24158ded4916b5513;hb=45ef08fd6a09813e4a8f5ddadf85ba9e0ec2cdc7;hp=3af6cbee1a1505487686e34f5bf7349c9bb39af7;hpb=ef61831f94757bbb7fd66e3f5d1aca8a19c0b58e;p=imagemagick diff --git a/coders/mono.c b/coders/mono.c index 3af6cbee1..835c49121 100644 --- a/coders/mono.c +++ b/coders/mono.c @@ -17,7 +17,7 @@ % July 1992 % % % % % -% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization % +% Copyright 1999-2013 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,32 +39,35 @@ /* Include declarations. */ -#include "magick/studio.h" -#include "magick/blob.h" -#include "magick/blob-private.h" -#include "magick/cache.h" -#include "magick/color-private.h" -#include "magick/colormap.h" -#include "magick/colorspace.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/attribute.h" +#include "MagickCore/blob.h" +#include "MagickCore/blob-private.h" +#include "MagickCore/cache.h" +#include "MagickCore/color-private.h" +#include "MagickCore/colormap.h" +#include "MagickCore/colorspace.h" +#include "MagickCore/colorspace-private.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" /* Forward declarations. */ static MagickBooleanType - WriteMONOImage(const ImageInfo *,Image *); + WriteMONOImage(const ImageInfo *,Image *,ExceptionInfo *); /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -102,10 +105,7 @@ static Image *ReadMONOImage(const ImageInfo *image_info, MagickBooleanType status; - register IndexPacket - *indexes; - - register PixelPacket + register Quantum *q; register ssize_t @@ -128,7 +128,7 @@ static Image *ReadMONOImage(const ImageInfo *image_info, image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); - image=AcquireImage(image_info); + image=AcquireImage(image_info,exception); if ((image->columns == 0) || (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); @@ -144,7 +144,7 @@ static Image *ReadMONOImage(const ImageInfo *image_info, Initialize image colormap. */ image->depth=1; - if (AcquireImageColormap(image,2) == MagickFalse) + if (AcquireImageColormap(image,2,exception) == MagickFalse) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); if (image_info->ping != MagickFalse) { @@ -157,9 +157,8 @@ static Image *ReadMONOImage(const ImageInfo *image_info, for (y=0; y < (ssize_t) image->rows; y++) { q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); - if (q == (PixelPacket *) NULL) + if (q == (Quantum *) NULL) break; - indexes=GetAuthenticIndexQueue(image); bit=0; byte=0; for (x=0; x < (ssize_t) image->columns; x++) @@ -167,22 +166,23 @@ static Image *ReadMONOImage(const ImageInfo *image_info, if (bit == 0) byte=(size_t) ReadBlobByte(image); if (image_info->endian == LSBEndian) - SetPixelIndex(indexes+x,((byte & 0x01) != 0) ? 0x00 : 0x01); + SetPixelIndex(image,((byte & 0x01) != 0) ? 0x00 : 0x01,q); else - SetPixelIndex(indexes+x,((byte & 0x01) != 0) ? 0x01 : 0x00); + SetPixelIndex(image,((byte & 0x01) != 0) ? 0x01 : 0x00,q); bit++; if (bit == 8) bit=0; byte>>=1; + q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) break; status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, - image->rows); + image->rows); if (status == MagickFalse) break; } - (void) SyncImage(image); + (void) SyncImage(image,exception); if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); @@ -270,7 +270,7 @@ ModuleExport void UnregisterMONOImage(void) % The format of the WriteMONOImage method is: % % MagickBooleanType WriteMONOImage(const ImageInfo *image_info, -% Image *image) +% Image *image,ExceptionInfo *exception) % % A description of each parameter follows. % @@ -278,14 +278,16 @@ ModuleExport void UnregisterMONOImage(void) % % o image: The image. % +% o exception: return any errors or warnings in this structure. +% */ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info, - Image *image) + Image *image,ExceptionInfo *exception) { MagickBooleanType status; - register const PixelPacket + register const Quantum *p; register ssize_t @@ -307,19 +309,21 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info, assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception); + assert(exception != (ExceptionInfo *) NULL); + assert(exception->signature == MagickSignature); + status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); - if (image->colorspace != RGBColorspace) - (void) TransformImageColorspace(image,RGBColorspace); + if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Convert image to a bi-level image. */ - (void) SetImageType(image,BilevelType); + (void) SetImageType(image,BilevelType,exception); for (y=0; y < (ssize_t) image->rows; y++) { - p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception); - if (p == (const PixelPacket *) NULL) + p=GetVirtualPixels(image,0,y,image->columns,1,exception); + if (p == (const Quantum *) NULL) break; bit=0; byte=0; @@ -328,11 +332,11 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info, byte>>=1; if (image->endian == LSBEndian) { - if (PixelIntensity(p) < ((Quantum) QuantumRange/2.0)) + if (GetPixelIntensity(image,p) < (QuantumRange/2.0)) byte|=0x80; } else - if (PixelIntensity(p) >= ((Quantum) QuantumRange/2.0)) + if (GetPixelIntensity(image,p) >= (QuantumRange/2.0)) byte|=0x80; bit++; if (bit == 8) @@ -341,7 +345,7 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info, bit=0; byte=0; } - p++; + p+=GetPixelChannels(image); } if (bit != 0) (void) WriteBlobByte(image,(unsigned char) (byte >> (8-bit)));