% July 1992 %
% %
% %
-% Copyright 1999-2009 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 %
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.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/pixel-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.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.h"
+#include "MagickCore/color-private.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/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
\f
/*
Forward declarations.
*/
static MagickBooleanType
- WritePNMImage(const ImageInfo *,Image *);
+ WritePNMImage(const ImageInfo *,Image *,ExceptionInfo *);
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
*/
-static inline long ConstrainPixel(Image *image,const long offset,
- const unsigned long extent)
+static inline ssize_t ConstrainPixel(Image *image,const ssize_t offset,
+ const size_t extent,ExceptionInfo *exception)
{
- if ((offset < 0) || (offset > (long) extent))
+ if ((offset < 0) || (offset > (ssize_t) extent))
{
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- CorruptImageError,"InvalidPixel","`%s'",image->filename);
+ (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError,
+ "InvalidPixel","`%s'",image->filename);
return(0);
}
return(offset);
}
-static unsigned long PNMInteger(Image *image,const unsigned int base)
+static size_t PNMInteger(Image *image,const unsigned int base,
+ ExceptionInfo *exception)
{
char
*comment;
*p;
size_t
- extent;
-
- unsigned long
+ extent,
value;
/*
p=comment+strlen(comment);
}
c=ReadBlobByte(image);
- *p=(char) c;
- *(p+1)='\0';
+ if (c != (int) '\n')
+ {
+ *p=(char) c;
+ *(p+1)='\0';
+ }
}
if (comment == (char *) NULL)
return(0);
} while (isdigit(c) == MagickFalse);
if (comment != (char *) NULL)
{
- (void) SetImageProperty(image,"comment",comment);
+ (void) SetImageProperty(image,"comment",comment,exception);
comment=DestroyString(comment);
}
if (base == 2)
- return((unsigned long) (c-(int) '0'));
+ return((size_t) (c-(int) '0'));
/*
Evaluate number.
*/
Image
*image;
- long
- row,
- y;
-
MagickBooleanType
status;
QuantumType
quantum_type;
- register long
+ register ssize_t
i;
size_t
+ depth,
extent,
+ max_value,
packet_size;
ssize_t
- count;
-
- unsigned long
- depth,
- max_value;
-
- CacheView
- *image_view;
+ count,
+ row,
+ y;
/*
Open image file.
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)
{
/*
PBM, PGM, PPM, and PNM.
*/
- image->columns=PNMInteger(image,10);
- image->rows=PNMInteger(image,10);
+ image->columns=PNMInteger(image,10,exception);
+ image->rows=PNMInteger(image,10,exception);
if ((format == 'f') || (format == 'F'))
{
char
scale[MaxTextExtent];
(void) ReadBlobString(image,scale);
- quantum_scale=atof(scale);
+ quantum_scale=StringToDouble(scale,(char **) NULL);
}
else
{
if ((format == '1') || (format == '4'))
max_value=1; /* bitmap */
else
- max_value=PNMInteger(image,10);
+ max_value=PNMInteger(image,10,exception);
}
}
else
Assign a value to the specified keyword.
*/
if (LocaleCompare(keyword,"depth") == 0)
- packet_size=(unsigned long) atol(value);
+ packet_size=StringToUnsignedLong(value);
+ (void) packet_size;
if (LocaleCompare(keyword,"height") == 0)
- image->rows=(unsigned long) atol(value);
+ image->rows=StringToUnsignedLong(value);
if (LocaleCompare(keyword,"maxval") == 0)
- max_value=(unsigned long) atol(value);
+ max_value=StringToUnsignedLong(value);
if (LocaleCompare(keyword,"TUPLTYPE") == 0)
{
if (LocaleCompare(value,"BLACKANDWHITE") == 0)
- quantum_type=GrayQuantum;
+ {
+ SetImageColorspace(image,GRAYColorspace,exception);
+ quantum_type=GrayQuantum;
+ }
if (LocaleCompare(value,"BLACKANDWHITE_ALPHA") == 0)
{
+ SetImageColorspace(image,GRAYColorspace,exception);
+ image->alpha_trait=BlendPixelTrait;
quantum_type=GrayAlphaQuantum;
- image->matte=MagickTrue;
}
if (LocaleCompare(value,"GRAYSCALE") == 0)
- quantum_type=GrayQuantum;
+ {
+ quantum_type=GrayQuantum;
+ SetImageColorspace(image,GRAYColorspace,exception);
+ }
if (LocaleCompare(value,"GRAYSCALE_ALPHA") == 0)
{
+ SetImageColorspace(image,GRAYColorspace,exception);
+ image->alpha_trait=BlendPixelTrait;
quantum_type=GrayAlphaQuantum;
- image->matte=MagickTrue;
}
if (LocaleCompare(value,"RGB_ALPHA") == 0)
{
+ image->alpha_trait=BlendPixelTrait;
quantum_type=RGBAQuantum;
- image->matte=MagickTrue;
}
if (LocaleCompare(value,"CMYK") == 0)
{
+ SetImageColorspace(image,CMYKColorspace,exception);
quantum_type=CMYKQuantum;
- image->colorspace=CMYKColorspace;
}
if (LocaleCompare(value,"CMYK_ALPHA") == 0)
{
+ SetImageColorspace(image,CMYKColorspace,exception);
+ image->alpha_trait=BlendPixelTrait;
quantum_type=CMYKAQuantum;
- image->colorspace=CMYKColorspace;
- image->matte=MagickTrue;
}
}
if (LocaleCompare(keyword,"width") == 0)
- image->columns=(unsigned long) atol(value);
+ image->columns=StringToUnsignedLong(value);
}
}
if ((image->columns == 0) || (image->rows == 0))
/*
Convert PBM image to pixel packets.
*/
- for (y=0; y < (long) image->rows; y++)
+ SetImageColorspace(image,GRAYColorspace,exception);
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register long
+ register ssize_t
x;
- register PixelPacket
- *__restrict q;
+ register Quantum
+ *restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- q->red=(Quantum) (PNMInteger(image,2) == 0 ? QuantumRange : 0);
- q->green=q->red;
- q->blue=q->red;
- q++;
+ SetPixelGray(image,PNMInteger(image,2,exception) == 0 ?
+ QuantumRange : 0,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
}
case '2':
{
- unsigned long
+ size_t
intensity;
/*
Convert PGM image to pixel packets.
*/
+ SetImageColorspace(image,GRAYColorspace,exception);
scale=(Quantum *) NULL;
if (max_value != (1U*QuantumRange))
{
sizeof(*scale));
if (scale == (Quantum *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- for (i=0; i <= (long) max_value; i++)
+ for (i=0; i <= (ssize_t) max_value; i++)
scale[i]=(Quantum) (((double) QuantumRange*i)/max_value+0.5);
}
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register long
+ register ssize_t
x;
- register PixelPacket
- *__restrict q;
+ register Quantum
+ *restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- intensity=PNMInteger(image,10);
+ intensity=PNMInteger(image,10,exception);
+ SetPixelGray(image,intensity,q);
if (scale != (Quantum *) NULL)
- intensity=(unsigned long) scale[ConstrainPixel(image,(long)
- intensity,max_value)];
- q->red=(Quantum) intensity;
- q->green=q->red;
- q->blue=q->red;
- q++;
+ SetPixelGray(image,scale[ConstrainPixel(image,(ssize_t) intensity,
+ max_value,exception)],q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
}
case '3':
{
- MagickPixelPacket
+ PixelInfo
pixel;
/*
sizeof(*scale));
if (scale == (Quantum *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- for (i=0; i <= (long) max_value; i++)
+ for (i=0; i <= (ssize_t) max_value; i++)
scale[i]=(Quantum) (((double) QuantumRange*i)/max_value+0.5);
}
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register long
+ register ssize_t
x;
- register PixelPacket
- *__restrict q;
+ register Quantum
+ *restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel.red=(MagickRealType) PNMInteger(image,10);
- pixel.green=(MagickRealType) PNMInteger(image,10);
- pixel.blue=(MagickRealType) PNMInteger(image,10);
+ pixel.red=(double) PNMInteger(image,10,exception);
+ pixel.green=(double) PNMInteger(image,10,exception);
+ pixel.blue=(double) PNMInteger(image,10,exception);
if (scale != (Quantum *) NULL)
{
- pixel.red=(MagickRealType) scale[ConstrainPixel(image,(long)
- pixel.red,max_value)];
- pixel.green=(MagickRealType) scale[ConstrainPixel(image,(long)
- pixel.green,max_value)];
- pixel.blue=(MagickRealType) scale[ConstrainPixel(image,(long)
- pixel.blue,max_value)];
+ pixel.red=(double) scale[ConstrainPixel(image,(ssize_t)
+ pixel.red,max_value,exception)];
+ pixel.green=(double) scale[ConstrainPixel(image,
+ (ssize_t) pixel.green,max_value,exception)];
+ pixel.blue=(double) scale[ConstrainPixel(image,(ssize_t)
+ pixel.blue,max_value,exception)];
}
- q->red=(Quantum) pixel.red;
- q->green=(Quantum) pixel.green;
- q->blue=(Quantum) pixel.blue;
- q++;
+ SetPixelRed(image,ClampToQuantum(pixel.red),q);
+ SetPixelGreen(image,ClampToQuantum(pixel.green),q);
+ SetPixelBlue(image,ClampToQuantum(pixel.blue),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
/*
Convert PBM raw image to pixel packets.
*/
+ SetImageColorspace(image,GRAYColorspace,exception);
quantum_type=GrayQuantum;
if (image->storage_class == PseudoClass)
quantum_type=IndexQuantum;
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
SetQuantumMinIsWhite(quantum_info,MagickTrue);
extent=GetQuantumExtent(image,quantum_info,quantum_type);
- image_view=AcquireCacheView(image);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type)
-#endif
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- long
- offset;
-
MagickBooleanType
sync;
- register PixelPacket
- *__restrict q;
+ register Quantum
+ *restrict q;
ssize_t
- count;
+ count,
+ offset;
size_t
length;
if (status == MagickFalse)
continue;
pixels=GetQuantumPixels(quantum_info);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp critical (MagickCore_ReadPNMImage)
-#endif
{
count=ReadBlob(image,extent,pixels);
if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
}
if (count != (ssize_t) extent)
status=MagickFalse;
- q=QueueCacheViewAuthenticPixels(image_view,0,offset,image->columns,1,
- exception);
- if (q == (PixelPacket *) NULL)
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- length=ImportQuantumPixels(image,image_view,quantum_info,quantum_type,
- pixels,exception);
+ length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,exception);
if (length != extent)
status=MagickFalse;
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
+ sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
status=MagickFalse;
}
- image_view=DestroyCacheView(image_view);
quantum_info=DestroyQuantumInfo(quantum_info);
if (status == MagickFalse)
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
/*
Convert PGM raw image to pixel packets.
*/
+ SetImageColorspace(image,GRAYColorspace,exception);
range=GetQuantumRange(image->depth);
quantum_type=GrayQuantum;
extent=(image->depth <= 8 ? 1 : 2)*image->columns;
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- image_view=AcquireCacheView(image);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type)
-#endif
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- long
- offset;
-
MagickBooleanType
sync;
register const unsigned char
- *p;
+ *restrict p;
- register long
+ register ssize_t
x;
- register PixelPacket
- *__restrict q;
+ register Quantum
+ *restrict q;
ssize_t
- count;
+ count,
+ offset;
unsigned char
*pixels;
if (status == MagickFalse)
continue;
pixels=GetQuantumPixels(quantum_info);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp critical (MagickCore_ReadPNMImage)
-#endif
{
count=ReadBlob(image,extent,pixels);
if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
}
if (count != (ssize_t) extent)
status=MagickFalse;
- q=QueueCacheViewAuthenticPixels(image_view,0,offset,image->columns,1,
- exception);
- if (q == (PixelPacket *) NULL)
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
p=pixels;
if ((image->depth == 8) || (image->depth == 16))
- (void) ImportQuantumPixels(image,image_view,quantum_info,
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,exception);
else
if (image->depth <= 8)
unsigned char
pixel;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- q->red=ScaleAnyToQuantum(pixel,range);
- q->green=q->red;
- q->blue=q->red;
- q++;
+ SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=GetPixelChannels(image);
}
}
else
unsigned short
pixel;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- q->red=ScaleAnyToQuantum(pixel,range);
- q->green=q->red;
- q->blue=q->red;
- q++;
+ SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=GetPixelChannels(image);
}
}
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
+ sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
status=MagickFalse;
}
- image_view=DestroyCacheView(image_view);
quantum_info=DestroyQuantumInfo(quantum_info);
if (status == MagickFalse)
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
}
case '6':
{
- ImageType
- type;
-
QuantumAny
range;
/*
Convert PNM raster image to pixel packets.
*/
- type=BilevelType;
quantum_type=RGBQuantum;
extent=3*(image->depth <= 8 ? 1 : 2)*image->columns;
range=GetQuantumRange(image->depth);
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- image_view=AcquireCacheView(image);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp parallel for schedule(static,1) shared(row,status,type)
-#endif
- for (y=0; y < (long) image->rows; y++)
+ (void) SetQuantumEndian(image,quantum_info,MSBEndian);
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- long
- offset;
-
MagickBooleanType
sync;
register const unsigned char
- *p;
+ *restrict p;
- register long
+ register ssize_t
x;
- register PixelPacket
- *__restrict q;
+ register Quantum
+ *restrict q;
ssize_t
- count;
-
- size_t
- length;
+ count,
+ offset;
unsigned char
*pixels;
if (status == MagickFalse)
continue;
pixels=GetQuantumPixels(quantum_info);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp critical (MagickCore_ReadPNMImage)
-#endif
{
count=ReadBlob(image,extent,pixels);
if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
}
if (count != (ssize_t) extent)
status=MagickFalse;
- q=QueueCacheViewAuthenticPixels(image_view,0,offset,image->columns,1,
- exception);
- if (q == (PixelPacket *) NULL)
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
p=pixels;
- if ((image->depth == 8) || (image->depth == 16))
+ if (image->depth == 8)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- length=ImportQuantumPixels(image,image_view,quantum_info,
- quantum_type,pixels,exception);
- if (length != extent)
- status=MagickFalse;
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
else
- if (image->depth <= 8)
- {
- unsigned char
- pixel;
-
- register PixelPacket
- *__restrict r;
-
- r=q;
- for (x=0; x < (long) image->columns; x++)
- {
- p=PushCharPixel(p,&pixel);
- r->red=ScaleAnyToQuantum(pixel,range);
- p=PushCharPixel(p,&pixel);
- r->green=ScaleAnyToQuantum(pixel,range);
- p=PushCharPixel(p,&pixel);
- r->blue=ScaleAnyToQuantum(pixel,range);
- r++;
- }
- }
- else
+ if (image->depth == 16)
{
unsigned short
pixel;
- register PixelPacket
- *__restrict r;
-
- r=q;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- r->red=ScaleAnyToQuantum(pixel,range);
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- r->green=ScaleAnyToQuantum(pixel,range);
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- r->blue=ScaleAnyToQuantum(pixel,range);
- r++;
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
}
- if ((type == BilevelType) || (type == GrayscaleType))
- for (x=0; x < (long) image->columns; x++)
- {
- if ((type == BilevelType) &&
- (IsMonochromePixel(q) == MagickFalse))
- type=IsGrayPixel(q) == MagickFalse ? UndefinedType :
- GrayscaleType;
- if ((type == GrayscaleType) && (IsGrayPixel(q) == MagickFalse))
- type=UndefinedType;
- if ((type != BilevelType) && (type != GrayscaleType))
- break;
- q++;
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
+ else
+ if (image->depth <= 8)
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushCharPixel(p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushCharPixel(p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
+ }
+ }
+ else
+ {
+ unsigned short
+ pixel;
+
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ p=PushShortPixel(MSBEndian,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushShortPixel(MSBEndian,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushShortPixel(MSBEndian,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
+ }
+ }
+ sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
status=MagickFalse;
}
- image_view=DestroyCacheView(image_view);
quantum_info=DestroyQuantumInfo(quantum_info);
if (status == MagickFalse)
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
- if (type != UndefinedType)
- image->type=type;
break;
}
case '7':
{
- register IndexPacket
- *indexes;
-
QuantumAny
range;
- unsigned long
+ size_t
channels;
/*
break;
}
}
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
channels++;
extent=channels*(image->depth <= 8 ? 1 : 2)*image->columns;
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- image_view=AcquireCacheView(image);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type)
-#endif
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- long
- offset;
-
MagickBooleanType
sync;
register const unsigned char
- *p;
+ *restrict p;
- register long
+ register ssize_t
x;
- register PixelPacket
- *__restrict q;
+ register Quantum
+ *restrict q;
ssize_t
- count;
+ count,
+ offset;
unsigned char
*pixels;
if (status == MagickFalse)
continue;
pixels=GetQuantumPixels(quantum_info);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp critical (MagickCore_ReadPNMImage)
-#endif
{
count=ReadBlob(image,extent,pixels);
if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
}
if (count != (ssize_t) extent)
status=MagickFalse;
- q=QueueCacheViewAuthenticPixels(image_view,0,offset,image->columns,1,
- exception);
- if (q == (PixelPacket *) NULL)
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
p=pixels;
if ((image->depth == 8) || (image->depth == 16))
- (void) ImportQuantumPixels(image,image_view,quantum_info,
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,exception);
else
switch (quantum_type)
unsigned char
pixel;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- q->red=ScaleAnyToQuantum(pixel,range);
- q->green=q->red;
- q->blue=q->red;
- q->opacity=OpaqueOpacity;
- if (image->matte != MagickFalse)
+ SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ if (image->alpha_trait == BlendPixelTrait)
{
p=PushCharPixel(p,&pixel);
- q->opacity=ScaleAnyToQuantum(pixel,range);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
else
unsigned short
pixel;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- q->red=ScaleAnyToQuantum(pixel,range);
- q->green=q->red;
- q->blue=q->red;
- q->opacity=OpaqueOpacity;
- if (image->matte != MagickFalse)
+ SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ if (image->alpha_trait == BlendPixelTrait)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- q->opacity=ScaleAnyToQuantum(pixel,range);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
break;
unsigned char
pixel;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- q->red=ScaleAnyToQuantum(pixel,range);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- q->green=ScaleAnyToQuantum(pixel,range);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- q->blue=ScaleAnyToQuantum(pixel,range);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- indexes[x]=ScaleAnyToQuantum(pixel,range);
- q->opacity=OpaqueOpacity;
- if (image->matte != MagickFalse)
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ if (image->alpha_trait == BlendPixelTrait)
{
p=PushCharPixel(p,&pixel);
- q->opacity=ScaleAnyToQuantum(pixel,range);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
else
unsigned short
pixel;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- q->red=ScaleAnyToQuantum(pixel,range);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- q->green=ScaleAnyToQuantum(pixel,range);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- q->blue=ScaleAnyToQuantum(pixel,range);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- indexes[x]=ScaleAnyToQuantum(pixel,range);
- q->opacity=OpaqueOpacity;
- if (image->matte != MagickFalse)
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ if (image->alpha_trait == BlendPixelTrait)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- q->opacity=ScaleAnyToQuantum(pixel,range);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
break;
unsigned char
pixel;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- q->red=ScaleAnyToQuantum(pixel,range);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- q->green=ScaleAnyToQuantum(pixel,range);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- q->blue=ScaleAnyToQuantum(pixel,range);
- q->opacity=OpaqueOpacity;
- if (image->matte != MagickFalse)
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ if (image->alpha_trait == BlendPixelTrait)
{
p=PushCharPixel(p,&pixel);
- q->opacity=ScaleAnyToQuantum(pixel,range);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
else
unsigned short
pixel;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- q->red=ScaleAnyToQuantum(pixel,range);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- q->green=ScaleAnyToQuantum(pixel,range);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- q->blue=ScaleAnyToQuantum(pixel,range);
- q->opacity=OpaqueOpacity;
- if (image->matte != MagickFalse)
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ if (image->alpha_trait == BlendPixelTrait)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- q->opacity=ScaleAnyToQuantum(pixel,range);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
break;
}
}
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
+ sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
status=MagickFalse;
}
- image_view=DestroyCacheView(image_view);
quantum_info=DestroyQuantumInfo(quantum_info);
if (status == MagickFalse)
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
/*
Convert PFM raster image to pixel packets.
*/
+ if (format == 'f')
+ SetImageColorspace(image,GRAYColorspace,exception);
quantum_type=format == 'f' ? GrayQuantum : RGBQuantum;
image->endian=quantum_scale < 0.0 ? LSBEndian : MSBEndian;
image->depth=32;
status=SetQuantumFormat(image,quantum_info,FloatingPointQuantumFormat);
if (status == MagickFalse)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- SetQuantumScale(quantum_info,(MagickRealType) QuantumRange*
- fabs(quantum_scale));
+ SetQuantumScale(quantum_info,(double) QuantumRange*fabs(quantum_scale));
extent=GetQuantumExtent(image,quantum_info,quantum_type);
- image_view=AcquireCacheView(image);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type)
-#endif
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- long
- offset;
-
MagickBooleanType
sync;
- register PixelPacket
- *__restrict q;
+ register Quantum
+ *restrict q;
ssize_t
- count;
+ count,
+ offset;
size_t
length;
if (status == MagickFalse)
continue;
pixels=GetQuantumPixels(quantum_info);
-#if defined(_OPENMP) && (_OPENMP > 200505)
- #pragma omp critical (MagickCore_ReadPNMImage)
-#endif
{
count=ReadBlob(image,extent,pixels);
if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
}
if ((size_t) count != extent)
status=MagickFalse;
- q=QueueCacheViewAuthenticPixels(image_view,0,(long) (image->rows-
- offset-1),image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ q=QueueAuthenticPixels(image,0,(ssize_t) (image->rows-offset-1),
+ image->columns,1,exception);
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- length=ImportQuantumPixels(image,image_view,quantum_info,quantum_type,
- pixels,exception);
+ length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,exception);
if (length != extent)
status=MagickFalse;
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
+ sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
status=MagickFalse;
}
- image_view=DestroyCacheView(image_view);
quantum_info=DestroyQuantumInfo(quantum_info);
if (status == MagickFalse)
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
}
if (EOFBlob(image) != MagickFalse)
- (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError,
- "UnexpectedEndOfFile","`%s'",image->filename);
+ {
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ CorruptImageError,"UnexpectedEndOfFile","`%s'",image->filename);
+ break;
+ }
/*
Proceed to next image.
*/
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
%
% The format of the RegisterPNMImage method is:
%
-% unsigned long RegisterPNMImage(void)
+% size_t RegisterPNMImage(void)
%
*/
-ModuleExport unsigned long RegisterPNMImage(void)
+ModuleExport size_t RegisterPNMImage(void)
{
MagickInfo
*entry;
entry=SetMagickInfo("PFM");
entry->decoder=(DecodeImageHandler *) ReadPNMImage;
entry->encoder=(EncodeImageHandler *) WritePNMImage;
+ entry->endian_support=MagickTrue;
entry->description=ConstantString("Portable float format");
entry->module=ConstantString("PFM");
(void) RegisterMagickInfo(entry);
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Procedure WritePNMImage() writes an image to a file in the PNM rasterfile
-% format.
+% WritePNMImage() writes an image to a file in the PNM rasterfile format.
%
% The format of the WritePNMImage method is:
%
-% MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WritePNMImage(const ImageInfo *image_info,
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows.
%
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
char
buffer[MaxTextExtent],
const char
*value;
- IndexPacket
- index;
-
- long
- y;
-
MagickBooleanType
status;
MagickOffsetType
scene;
+ Quantum
+ index;
+
QuantumAny
pixel;
QuantumType
quantum_type;
- register long
- i;
-
register unsigned char
*pixels,
*q;
- ssize_t
- count;
-
size_t
extent,
packet_size;
+ ssize_t
+ count,
+ y;
+
/*
Open output image file.
*/
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);
scene=0;
case 'f':
{
format='F';
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,exception) != MagickFalse)
format='f';
break;
}
case 'n':
{
if ((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,exception) != MagickFalse))
{
format='5';
if (image_info->compression == NoCompression)
format='2';
- if (IsMonochromeImage(image,&image->exception) != MagickFalse)
+ if (IsImageMonochrome(image,exception) != MagickFalse)
{
format='4';
if (image_info->compression == NoCompression)
break;
}
}
- (void) FormatMagickString(buffer,MaxTextExtent,"P%c\n",format);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"P%c\n",format);
(void) WriteBlobString(image,buffer);
- value=GetImageProperty(image,"comment");
+ value=GetImageProperty(image,"comment",exception);
if (value != (const char *) NULL)
{
register const char
}
if (format != '7')
{
- if (image->colorspace != RGBColorspace)
- (void) TransformImageColorspace(image,RGBColorspace);
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n",
- image->columns,image->rows);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",
+ (double) image->columns,(double) image->rows);
(void) WriteBlobString(image,buffer);
}
else
/*
PAM header.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,
- "WIDTH %lu\nHEIGHT %lu\n",image->columns,image->rows);
+ (void) FormatLocaleString(buffer,MaxTextExtent,
+ "WIDTH %.20g\nHEIGHT %.20g\n",(double) image->columns,(double)
+ image->rows);
(void) WriteBlobString(image,buffer);
- quantum_type=GetQuantumType(image,&image->exception);
+ quantum_type=GetQuantumType(image,exception);
switch (quantum_type)
{
case CMYKQuantum:
default:
{
quantum_type=RGBQuantum;
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
quantum_type=RGBAQuantum;
packet_size=3;
(void) CopyMagickString(type,"RGB",MaxTextExtent);
break;
}
}
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
{
packet_size++;
(void) ConcatenateMagickString(type,"_ALPHA",MaxTextExtent);
}
if (image->depth > 16)
image->depth=16;
- (void) FormatMagickString(buffer,MaxTextExtent,
- "DEPTH %lu\nMAXVAL %lu\n",(unsigned long) packet_size,(unsigned long)
- GetQuantumRange(image->depth));
+ (void) FormatLocaleString(buffer,MaxTextExtent,
+ "DEPTH %.20g\nMAXVAL %.20g\n",(double) packet_size,(double)
+ ((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"TUPLTYPE %s\nENDHDR\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"TUPLTYPE %s\nENDHDR\n",
type);
(void) WriteBlobString(image,buffer);
}
/*
Convert image to a PBM image.
*/
+ if (IsImageGray(image,exception) == MagickFalse)
+ (void) TransformImageColorspace(image,GRAYColorspace,exception);
q=pixels;
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *__restrict indexes;
-
- register const PixelPacket
- *__restrict p;
+ register const Quantum
+ *restrict p;
- register long
+ register ssize_t
x;
- 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;
- indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=PixelIntensityToQuantum(p);
+ pixel=GetPixelIntensity(image,p);
*q++=(unsigned char) (pixel >= (Quantum) (QuantumRange/2) ?
'0' : '1');
*q++=' ';
*q++='\n';
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
- i=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
/*
Convert image to a PGM image.
*/
+ if (IsImageGray(image,exception) == MagickFalse)
+ (void) TransformImageColorspace(image,GRAYColorspace,exception);
if (image->depth <= 8)
(void) WriteBlobString(image,"255\n");
else
(void) WriteBlobString(image,"65535\n");
q=pixels;
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
- *__restrict p;
+ register const Quantum
+ *restrict p;
- register long
+ register ssize_t
x;
- 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;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- index=PixelIntensityToQuantum(p);
+ index=GetPixelIntensity(image,p);
if (image->depth <= 8)
- count=(ssize_t) FormatMagickString(buffer,MaxTextExtent,"%u ",
+ count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
ScaleQuantumToChar(index));
else
- count=(ssize_t) FormatMagickString(buffer,MaxTextExtent,"%u ",
+ count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
ScaleQuantumToShort(index));
extent=(size_t) count;
(void) strncpy((char *) q,buffer,extent);
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
/*
Convert image to a PNM image.
*/
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
if (image->depth <= 8)
(void) WriteBlobString(image,"255\n");
else
(void) WriteBlobString(image,"65535\n");
q=pixels;
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
- *__restrict p;
+ register const Quantum
+ *restrict p;
- register long
+ register ssize_t
x;
- 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;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->depth <= 8)
- count=(ssize_t) FormatMagickString(buffer,MaxTextExtent,
- "%u %u %u ",ScaleQuantumToChar(p->red),
- ScaleQuantumToChar(p->green),ScaleQuantumToChar(p->blue));
+ count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
+ "%u %u %u ",ScaleQuantumToChar(GetPixelRed(image,p)),
+ ScaleQuantumToChar(GetPixelGreen(image,p)),
+ ScaleQuantumToChar(GetPixelBlue(image,p)));
else
- count=(ssize_t) FormatMagickString(buffer,MaxTextExtent,
- "%u %u %u ",ScaleQuantumToShort(p->red),
- ScaleQuantumToShort(p->green),ScaleQuantumToShort(p->blue));
+ count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
+ "%u %u %u ",ScaleQuantumToShort(GetPixelRed(image,p)),
+ ScaleQuantumToShort(GetPixelGreen(image,p)),
+ ScaleQuantumToShort(GetPixelBlue(image,p)));
extent=(size_t) count;
(void) strncpy((char *) q,buffer,extent);
q+=extent;
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
/*
Convert image to a PBM image.
*/
+ if (IsImageGray(image,exception) == MagickFalse)
+ (void) TransformImageColorspace(image,GRAYColorspace,exception);
image->depth=1;
quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
quantum_info->min_is_white=MagickTrue;
pixels=GetQuantumPixels(quantum_info);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
- *__restrict p;
+ register const Quantum
+ *restrict p;
- 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;
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayQuantum,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GrayQuantum,pixels,exception);
count=WriteBlob(image,extent,pixels);
if (count != (ssize_t) extent)
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
/*
Convert image to a PGM image.
*/
+ if (IsImageGray(image,exception) == MagickFalse)
+ (void) TransformImageColorspace(image,GRAYColorspace,exception);
if (image->depth > 8)
image->depth=16;
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long)
- GetQuantumRange(image->depth));
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ ((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
if (quantum_info == (QuantumInfo *) NULL)
pixels=GetQuantumPixels(quantum_info);
extent=GetQuantumExtent(image,quantum_info,GrayQuantum);
range=GetQuantumRange(image->depth);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
- *__restrict p;
+ register const Quantum
+ *restrict p;
- register long
+ register ssize_t
x;
- 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;
q=pixels;
if ((image->depth == 8) || (image->depth == 16))
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayQuantum,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GrayQuantum,pixels,exception);
else
{
if (image->depth <= 8)
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- if (IsGrayPixel(p) == MagickFalse)
- pixel=ScaleQuantumToAny(PixelIntensityToQuantum(p),range);
+ if (IsPixelGray(image,p) == MagickFalse)
+ pixel=ScaleQuantumToAny(GetPixelIntensity(image,p),range);
else
{
if (image->depth == 8)
- pixel=ScaleQuantumToChar(p->red);
+ pixel=ScaleQuantumToChar(GetPixelRed(image,p));
else
- pixel=ScaleQuantumToAny(p->red,range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
}
q=PopCharPixel((unsigned char) pixel,q);
- p++;
+ p+=GetPixelChannels(image);
}
else
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- if (IsGrayPixel(p) == MagickFalse)
- pixel=ScaleQuantumToAny(PixelIntensityToQuantum(p),range);
+ if (IsPixelGray(image,p) == MagickFalse)
+ pixel=ScaleQuantumToAny(GetPixelIntensity(image,p),range);
else
{
if (image->depth == 16)
- pixel=ScaleQuantumToShort(p->red);
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
else
- pixel=ScaleQuantumToAny(p->red,range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
}
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- p++;
+ p+=GetPixelChannels(image);
}
extent=(size_t) (q-pixels);
}
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
/*
Convert image to a PNM image.
*/
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
if (image->depth > 8)
image->depth=16;
- (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long)
- GetQuantumRange(image->depth));
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ ((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+ (void) SetQuantumEndian(image,quantum_info,MSBEndian);
pixels=GetQuantumPixels(quantum_info);
extent=GetQuantumExtent(image,quantum_info,quantum_type);
range=GetQuantumRange(image->depth);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
- *__restrict p;
+ register const Quantum
+ *restrict p;
- register long
+ register ssize_t
x;
- 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;
q=pixels;
if ((image->depth == 8) || (image->depth == 16))
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,exception);
else
{
if (image->depth <= 8)
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(p->red,range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(p->green,range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(p->blue,range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- if (image->matte != MagickFalse)
- {
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- p->opacity),range);
- q=PopCharPixel((unsigned char) pixel,q);
- }
- p++;
+ p+=GetPixelChannels(image);
}
else
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(p->red,range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(p->green,range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(p->blue,range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- if (image->matte != MagickFalse)
- {
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- p->opacity),range);
- q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- }
- p++;
+ p+=GetPixelChannels(image);
}
extent=(size_t) (q-pixels);
}
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
pixels=GetQuantumPixels(quantum_info);
range=GetQuantumRange(image->depth);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *__restrict indexes;
-
- register const PixelPacket
- *__restrict p;
+ register const Quantum
+ *restrict p;
- register long
+ register ssize_t
x;
- 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;
- indexes=GetVirtualIndexQueue(image);
q=pixels;
if ((image->depth == 8) || (image->depth == 16))
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,exception);
else
{
switch (quantum_type)
case GrayAlphaQuantum:
{
if (image->depth <= 8)
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(PixelIntensityToQuantum(p),range);
+ pixel=ScaleQuantumToAny(GetPixelIntensity(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
{
- pixel=(unsigned char) ScaleQuantumToAny(p->opacity,
- range);
+ pixel=(unsigned char) ScaleQuantumToAny(
+ GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
else
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(PixelIntensityToQuantum(p),range);
+ pixel=ScaleQuantumToAny(GetPixelIntensity(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
{
- pixel=(unsigned char) ScaleQuantumToAny(p->opacity,
- range);
+ pixel=(unsigned char) ScaleQuantumToAny(
+ GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
break;
}
case CMYKAQuantum:
{
if (image->depth <= 8)
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(p->red,range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(p->green,range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(p->blue,range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(indexes[x],range);
+ pixel=ScaleQuantumToAny(GetPixelBlack(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
{
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- p->opacity),range);
+ pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
else
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(p->red,range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(p->green,range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(p->blue,range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(indexes[x],range);
+ pixel=ScaleQuantumToAny(GetPixelBlack(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
{
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- p->opacity),range);
+ pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
break;
}
default:
{
if (image->depth <= 8)
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(p->red,range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(p->green,range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(p->blue,range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
{
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- p->opacity),range);
+ pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
else
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(p->red,range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(p->green,range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(p->blue,range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
{
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- p->opacity),range);
+ pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
break;
}
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
case 'F':
case 'f':
{
- (void) WriteBlobString(image,image->endian != LSBEndian ? "1.0\n" :
- "-1.0\n");
+ (void) WriteBlobString(image,image->endian == LSBEndian ? "-1.0\n" :
+ "1.0\n");
image->depth=32;
quantum_type=format == 'f' ? GrayQuantum : RGBQuantum;
quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
if (status == MagickFalse)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
pixels=GetQuantumPixels(quantum_info);
- for (y=(long) image->rows-1; y >= 0; y--)
+ for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
- register const PixelPacket
- *__restrict p;
+ register const Quantum
+ *restrict p;
- 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;
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,exception);
(void) WriteBlob(image,extent,pixels);
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
projects / imagemagick / blobdiff