% July 1992 %
% %
% %
-% Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2018 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 %
% obtain a copy of the License at %
% %
-% http://www.imagemagick.org/script/license.php %
+% https://www.imagemagick.org/script/license.php %
% %
% Unless required by applicable law or agreed to in writing, software %
% distributed under the License is distributed on an "AS IS" BASIS, %
% o exception: return any errors or warnings in this structure.
%
*/
-static void PNMComment(Image *image,ExceptionInfo *exception)
+
+static int PNMComment(Image *image,ExceptionInfo *exception)
{
int
c;
Read comment.
*/
comment=AcquireString(GetImageProperty(image,"comment",exception));
- extent=MaxTextExtent;
p=comment+strlen(comment);
- for (c='#'; (c != EOF) && (c != (int) '\n'); p++)
+ extent=strlen(comment)+MagickPathExtent;
+ for (c='#'; (c != EOF) && (c != (int) '\n') && (c != (int) '\r'); p++)
{
if ((size_t) (p-comment+1) >= extent)
{
extent<<=1;
- comment=(char *) ResizeQuantumMemory(comment,extent+MaxTextExtent,
+ comment=(char *) ResizeQuantumMemory(comment,extent+MagickPathExtent,
sizeof(*comment));
if (comment == (char *) NULL)
break;
}
}
if (comment == (char *) NULL)
- return;
+ return(c);
(void) SetImageProperty(image,"comment",comment,exception);
comment=DestroyString(comment);
+ return(c);
}
static unsigned int PNMInteger(Image *image,const unsigned int base,
if (c == EOF)
return(0);
if (c == (int) '#')
- PNMComment(image,exception);
- } while (isdigit(c) == MagickFalse);
+ c=PNMComment(image,exception);
+ } while ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'));
if (base == 2)
return((unsigned int) (c-(int) '0'));
/*
Evaluate number.
*/
value=0;
- do
+ while (isdigit(c) != 0)
{
- if (value > (unsigned int) (INT_MAX/10))
- break;
- value*=10;
- if (value > (INT_MAX-c))
- break;
- value+=c-(int) '0';
+ if (value <= (unsigned int) (INT_MAX/10))
+ {
+ value*=10;
+ if (value <= (unsigned int) (INT_MAX-(c-(int) '0')))
+ value+=c-(int) '0';
+ }
c=ReadBlobByte(image);
- } while (isdigit(c) != 0);
+ if (c == EOF)
+ return(0);
+ }
+ if (c == (int) '#')
+ c=PNMComment(image,exception);
return(value);
}
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
if ((format == 'f') || (format == 'F'))
{
char
- scale[MaxTextExtent];
+ scale[MagickPathExtent];
(void) ReadBlobString(image,scale);
quantum_scale=StringToDouble(scale,(char **) NULL);
else
{
char
- keyword[MaxTextExtent],
- value[MaxTextExtent];
+ keyword[MagickPathExtent],
+ value[MagickPathExtent];
int
c;
/*
Comment.
*/
- PNMComment(image,exception);
+ c=PNMComment(image,exception);
c=ReadBlobByte(image);
while (isspace((int) ((unsigned char) c)) != 0)
c=ReadBlobByte(image);
p=keyword;
do
{
- if ((size_t) (p-keyword) < (MaxTextExtent-1))
+ if ((size_t) (p-keyword) < (MagickPathExtent-1))
*p++=c;
c=ReadBlobByte(image);
} while (isalnum(c));
p=value;
while (isalnum(c) || (c == '_'))
{
- if ((size_t) (p-value) < (MaxTextExtent-1))
+ if ((size_t) (p-value) < (MagickPathExtent-1))
*p++=c;
c=ReadBlobByte(image);
}
}
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(CorruptImageError,"NegativeOrZeroImageSize");
- if ((max_value == 0) || (max_value > 4294967295))
+ if ((max_value == 0) || (max_value > 4294967295UL))
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
for (depth=1; GetQuantumRange(depth) < max_value; depth++) ;
image->depth=depth;
Convert PNM pixels to runextent-encoded MIFF packets.
*/
row=0;
+ y=0;
switch (format)
{
case '1':
x;
register Quantum
- *restrict q;
+ *magick_restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
{
SetPixelGray(image,PNMInteger(image,2,exception) == 0 ?
QuantumRange : 0,q);
+ if (EOFBlob(image) != MagickFalse)
+ break;
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
if (status == MagickFalse)
break;
}
+ if (EOFBlob(image) != MagickFalse)
+ break;
}
image->type=BilevelType;
break;
x;
register Quantum
- *restrict q;
+ *magick_restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
{
intensity=ScaleAnyToQuantum(PNMInteger(image,10,exception),
max_value);
+ if (EOFBlob(image) != MagickFalse)
+ break;
SetPixelGray(image,intensity,q);
q+=GetPixelChannels(image);
}
if (status == MagickFalse)
break;
}
+ if (EOFBlob(image) != MagickFalse)
+ break;
}
image->type=GrayscaleType;
break;
x;
register Quantum
- *restrict q;
+ *magick_restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
pixel;
pixel=ScaleAnyToQuantum(PNMInteger(image,10,exception),max_value);
+ if (EOFBlob(image) != MagickFalse)
+ break;
SetPixelRed(image,pixel,q);
pixel=ScaleAnyToQuantum(PNMInteger(image,10,exception),max_value);
SetPixelGreen(image,pixel,q);
if (status == MagickFalse)
break;
}
+ if (EOFBlob(image) != MagickFalse)
+ break;
}
break;
}
extent=GetQuantumExtent(image,quantum_info,quantum_type);
for (y=0; y < (ssize_t) image->rows; y++)
{
+ const unsigned char
+ *pixels;
+
MagickBooleanType
sync;
register Quantum
- *restrict q;
+ *magick_restrict q;
ssize_t
count,
size_t
length;
- unsigned char
- *pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetQuantumPixels(quantum_info);
- {
- count=ReadBlob(image,extent,pixels);
- if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
- (image->previous == (Image *) NULL))
- {
- MagickBooleanType
- proceed;
-
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
- row,image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- offset=row++;
- }
+ pixels=(unsigned char *) ReadBlobStream(image,extent,
+ GetQuantumPixels(quantum_info),&count);
if (count != (ssize_t) extent)
- status=MagickFalse;
- q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (Quantum *) NULL)
+ break;
+ if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
+ (image->previous == (Image *) NULL))
{
- status=MagickFalse;
- continue;
+ MagickBooleanType
+ proceed;
+
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
+ if (proceed == MagickFalse)
+ break;
}
+ offset=row++;
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,exception);
if (length != extent)
- status=MagickFalse;
+ break;
sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
- status=MagickFalse;
+ break;
}
quantum_info=DestroyQuantumInfo(quantum_info);
- if (status == MagickFalse)
- ThrowReaderException(CorruptImageError,"UnableToReadImageData");
SetQuantumImageType(image,quantum_type);
break;
}
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
for (y=0; y < (ssize_t) image->rows; y++)
{
+ const unsigned char
+ *pixels;
+
MagickBooleanType
sync;
register const unsigned char
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
register Quantum
- *restrict q;
+ *magick_restrict q;
ssize_t
count,
offset;
- unsigned char
- *pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetQuantumPixels(quantum_info);
- {
- count=ReadBlob(image,extent,pixels);
- if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
- (image->previous == (Image *) NULL))
- {
- MagickBooleanType
- proceed;
-
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
- row,image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- offset=row++;
- }
+ pixels=(unsigned char *) ReadBlobStream(image,extent,
+ GetQuantumPixels(quantum_info),&count);
if (count != (ssize_t) extent)
- status=MagickFalse;
- q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (Quantum *) NULL)
+ break;
+ if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
+ (image->previous == (Image *) NULL))
{
- status=MagickFalse;
- continue;
+ MagickBooleanType
+ proceed;
+
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
+ if (proceed == MagickFalse)
+ break;
}
+ offset=row++;
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
p=pixels;
switch (image->depth)
{
}
sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
- status=MagickFalse;
+ break;
}
quantum_info=DestroyQuantumInfo(quantum_info);
- if (status == MagickFalse)
- ThrowReaderException(CorruptImageError,"UnableToReadImageData");
SetQuantumImageType(image,quantum_type);
break;
}
(void) SetQuantumEndian(image,quantum_info,MSBEndian);
for (y=0; y < (ssize_t) image->rows; y++)
{
+ const unsigned char
+ *pixels;
+
MagickBooleanType
sync;
register const unsigned char
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
register Quantum
- *restrict q;
+ *magick_restrict q;
ssize_t
count,
offset;
- unsigned char
- *pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetQuantumPixels(quantum_info);
- {
- count=ReadBlob(image,extent,pixels);
- if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
- (image->previous == (Image *) NULL))
- {
- MagickBooleanType
- proceed;
-
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
- row,image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- offset=row++;
- }
+ pixels=(unsigned char *) ReadBlobStream(image,extent,
+ GetQuantumPixels(quantum_info),&count);
if (count != (ssize_t) extent)
- status=MagickFalse;
- q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (Quantum *) NULL)
+ break;
+ if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
+ (image->previous == (Image *) NULL))
{
- status=MagickFalse;
- continue;
+ MagickBooleanType
+ proceed;
+
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
+ if (proceed == MagickFalse)
+ break;
}
+ offset=row++;
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
p=pixels;
switch (image->depth)
{
}
sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
- status=MagickFalse;
+ break;
}
quantum_info=DestroyQuantumInfo(quantum_info);
- if (status == MagickFalse)
- ThrowReaderException(CorruptImageError,"UnableToReadImageData");
break;
}
case '7':
break;
}
}
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
channels++;
if (image->depth <= 8)
extent=channels*image->columns;
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
for (y=0; y < (ssize_t) image->rows; y++)
{
+ const unsigned char
+ *pixels;
+
MagickBooleanType
sync;
register const unsigned char
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
register Quantum
- *restrict q;
+ *magick_restrict q;
ssize_t
count,
offset;
- unsigned char
- *pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetQuantumPixels(quantum_info);
- {
- count=ReadBlob(image,extent,pixels);
- if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
- (image->previous == (Image *) NULL))
- {
- MagickBooleanType
- proceed;
-
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
- row,image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- offset=row++;
- }
+ pixels=(unsigned char *) ReadBlobStream(image,extent,
+ GetQuantumPixels(quantum_info),&count);
if (count != (ssize_t) extent)
- status=MagickFalse;
- q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (Quantum *) NULL)
+ break;
+ if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
+ (image->previous == (Image *) NULL))
{
- status=MagickFalse;
- continue;
+ MagickBooleanType
+ proceed;
+
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
+ if (proceed == MagickFalse)
+ break;
}
+ offset=row++;
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
p=pixels;
switch (image->depth)
{
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelGray(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelGray(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushCharPixel(p,&pixel);
if (image->depth != 1)
SetPixelGray(image,ScaleAnyToQuantum(pixel,max_value),
q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,
p=PushLongPixel(MSBEndian,p,&pixel);
SetPixelGray(image,ScaleAnyToQuantum(pixel,max_value),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushLongPixel(MSBEndian,p,&pixel);
- SetPixelAlpha(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
}
q+=GetPixelChannels(image);
}
p=PushCharPixel(p,&pixel);
SetPixelRed(image,ScaleAnyToQuantum(pixel,max_value),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
p=PushCharPixel(p,&pixel);
- SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
p=PushCharPixel(p,&pixel);
- SetPixelBlack(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushCharPixel(p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelRed(image,ScaleAnyToQuantum(pixel,max_value),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelGreen(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelBlack(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,
p=PushLongPixel(MSBEndian,p,&pixel);
SetPixelBlack(image,ScaleAnyToQuantum(pixel,max_value),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushLongPixel(MSBEndian,p,&pixel);
- SetPixelAlpha(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
}
q+=GetPixelChannels(image);
}
p=PushCharPixel(p,&pixel);
SetPixelRed(image,ScaleAnyToQuantum(pixel,max_value),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
p=PushCharPixel(p,&pixel);
- SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushCharPixel(p,&pixel);
- SetPixelAlpha(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,
+ max_value),q);
}
q+=GetPixelChannels(image);
}
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelRed(image,ScaleAnyToQuantum(pixel,max_value),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelGreen(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,
p=PushLongPixel(MSBEndian,p,&pixel);
SetPixelBlue(image,ScaleAnyToQuantum(pixel,max_value),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
p=PushLongPixel(MSBEndian,p,&pixel);
- SetPixelAlpha(image,ScaleAnyToQuantum(pixel,max_value),q);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,max_value),
+ q);
}
q+=GetPixelChannels(image);
}
}
sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
- status=MagickFalse;
+ break;
}
quantum_info=DestroyQuantumInfo(quantum_info);
- if (status == MagickFalse)
- ThrowReaderException(CorruptImageError,"UnableToReadImageData");
SetQuantumImageType(image,quantum_type);
break;
}
extent=GetQuantumExtent(image,quantum_info,quantum_type);
for (y=0; y < (ssize_t) image->rows; y++)
{
+ const unsigned char
+ *pixels;
+
MagickBooleanType
sync;
register Quantum
- *restrict q;
+ *magick_restrict q;
ssize_t
count,
size_t
length;
- unsigned char
- *pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetQuantumPixels(quantum_info);
- {
- count=ReadBlob(image,extent,pixels);
- if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
- (image->previous == (Image *) NULL))
- {
- MagickBooleanType
- proceed;
+ pixels=(unsigned char *) ReadBlobStream(image,extent,
+ GetQuantumPixels(quantum_info),&count);
+ if (count != (ssize_t) extent)
+ break;
+ if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
+ (image->previous == (Image *) NULL))
+ {
+ MagickBooleanType
+ proceed;
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
- row,image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- offset=row++;
- }
- if ((size_t) count != extent)
- status=MagickFalse;
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
+ if (proceed == MagickFalse)
+ break;
+ }
+ offset=row++;
q=QueueAuthenticPixels(image,0,(ssize_t) (image->rows-offset-1),
image->columns,1,exception);
if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
+ break;
length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,exception);
if (length != extent)
- status=MagickFalse;
+ break;
sync=SyncAuthenticPixels(image,exception);
if (sync == MagickFalse)
- status=MagickFalse;
+ break;
}
quantum_info=DestroyQuantumInfo(quantum_info);
- if (status == MagickFalse)
- ThrowReaderException(CorruptImageError,"UnableToReadImageData");
SetQuantumImageType(image,quantum_type);
break;
}
default:
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
}
+ if (y < (ssize_t) image->rows)
+ ThrowReaderException(CorruptImageError,"UnableToReadImageData");
if (EOFBlob(image) != MagickFalse)
{
(void) ThrowMagickException(exception,GetMagickModule(),
Skip to end of line.
*/
count=ReadBlob(image,1,(unsigned char *) &format);
- if (count == 0)
+ if (count != 1)
break;
- if ((count != 0) && (format == 'P'))
+ if (format == 'P')
break;
} while (format != '\n');
count=ReadBlob(image,1,(unsigned char *) &format);
MagickInfo
*entry;
- entry=SetMagickInfo("PAM");
+ entry=AcquireMagickInfo("PNM","PAM","Common 2-dimensional bitmap format");
entry->decoder=(DecodeImageHandler *) ReadPNMImage;
entry->encoder=(EncodeImageHandler *) WritePNMImage;
- entry->description=ConstantString("Common 2-dimensional bitmap format");
entry->mime_type=ConstantString("image/x-portable-pixmap");
- entry->module=ConstantString("PNM");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("PBM");
+ entry=AcquireMagickInfo("PNM","PBM",
+ "Portable bitmap format (black and white)");
entry->decoder=(DecodeImageHandler *) ReadPNMImage;
entry->encoder=(EncodeImageHandler *) WritePNMImage;
- entry->description=ConstantString("Portable bitmap format (black and white)");
entry->mime_type=ConstantString("image/x-portable-bitmap");
- entry->module=ConstantString("PNM");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("PFM");
+ entry=AcquireMagickInfo("PNM","PFM","Portable float format");
entry->decoder=(DecodeImageHandler *) ReadPNMImage;
entry->encoder=(EncodeImageHandler *) WritePNMImage;
- entry->endian_support=MagickTrue;
- entry->description=ConstantString("Portable float format");
- entry->module=ConstantString("PFM");
+ entry->flags|=CoderEndianSupportFlag;
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("PGM");
+ entry=AcquireMagickInfo("PNM","PGM","Portable graymap format (gray scale)");
entry->decoder=(DecodeImageHandler *) ReadPNMImage;
entry->encoder=(EncodeImageHandler *) WritePNMImage;
- entry->description=ConstantString("Portable graymap format (gray scale)");
entry->mime_type=ConstantString("image/x-portable-greymap");
- entry->module=ConstantString("PNM");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("PNM");
+ entry=AcquireMagickInfo("PNM","PNM","Portable anymap");
entry->decoder=(DecodeImageHandler *) ReadPNMImage;
entry->encoder=(EncodeImageHandler *) WritePNMImage;
entry->magick=(IsImageFormatHandler *) IsPNM;
- entry->description=ConstantString("Portable anymap");
entry->mime_type=ConstantString("image/x-portable-pixmap");
- entry->module=ConstantString("PNM");
(void) RegisterMagickInfo(entry);
- entry=SetMagickInfo("PPM");
+ entry=AcquireMagickInfo("PNM","PPM","Portable pixmap format (color)");
entry->decoder=(DecodeImageHandler *) ReadPNMImage;
entry->encoder=(EncodeImageHandler *) WritePNMImage;
- entry->description=ConstantString("Portable pixmap format (color)");
entry->mime_type=ConstantString("image/x-portable-pixmap");
- entry->module=ConstantString("PNM");
(void) RegisterMagickInfo(entry);
return(MagickImageCoderSignature);
}
ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
+ buffer[MagickPathExtent],
format,
- magick[MaxTextExtent];
+ magick[MagickPathExtent];
const char
*value;
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
*/
packet_size=3;
quantum_type=RGBQuantum;
- (void) CopyMagickString(magick,image_info->magick,MaxTextExtent);
+ (void) CopyMagickString(magick,image_info->magick,MagickPathExtent);
max_value=GetQuantumRange(image->depth);
switch (magick[1])
{
case 'f':
{
format='F';
- if (IsImageGray(image,exception) != MagickFalse)
+ if (SetImageGray(image,exception) != MagickFalse)
format='f';
break;
}
case 'n':
{
if ((image_info->type != TrueColorType) &&
- (IsImageGray(image,exception) != MagickFalse))
+ (SetImageGray(image,exception) != MagickFalse))
{
format='5';
if (image_info->compression == NoCompression)
format='2';
- if (IsImageMonochrome(image,exception) != MagickFalse)
+ if (SetImageMonochrome(image,exception) != MagickFalse)
{
format='4';
if (image_info->compression == NoCompression)
break;
}
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"P%c\n",format);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"P%c\n",format);
(void) WriteBlobString(image,buffer);
value=GetImageProperty(image,"comment",exception);
if (value != (const char *) NULL)
}
if (format != '7')
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n",
(double) image->columns,(double) image->rows);
(void) WriteBlobString(image,buffer);
}
else
{
char
- type[MaxTextExtent];
+ type[MagickPathExtent];
/*
PAM header.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"WIDTH %.20g\nHEIGHT %.20g\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,buffer);
case CMYKAQuantum:
{
packet_size=4;
- (void) CopyMagickString(type,"CMYK",MaxTextExtent);
+ (void) CopyMagickString(type,"CMYK",MagickPathExtent);
break;
}
case GrayQuantum:
case GrayAlphaQuantum:
{
packet_size=1;
- (void) CopyMagickString(type,"GRAYSCALE",MaxTextExtent);
+ (void) CopyMagickString(type,"GRAYSCALE",MagickPathExtent);
+ if (IsImageMonochrome(image) != MagickFalse)
+ (void) CopyMagickString(type,"BLACKANDWHITE",MagickPathExtent);
break;
}
default:
{
quantum_type=RGBQuantum;
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
quantum_type=RGBAQuantum;
packet_size=3;
- (void) CopyMagickString(type,"RGB",MaxTextExtent);
+ (void) CopyMagickString(type,"RGB",MagickPathExtent);
break;
}
}
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
packet_size++;
- (void) ConcatenateMagickString(type,"_ALPHA",MaxTextExtent);
+ (void) ConcatenateMagickString(type,"_ALPHA",MagickPathExtent);
}
if (image->depth > 32)
image->depth=32;
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"DEPTH %.20g\nMAXVAL %.20g\n",(double) packet_size,(double)
((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"TUPLTYPE %s\nENDHDR\n",
- type);
+ (void) FormatLocaleString(buffer,MagickPathExtent,
+ "TUPLTYPE %s\nENDHDR\n",type);
(void) WriteBlobString(image,buffer);
}
/*
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
*q++=(unsigned char) (GetPixelLuma(image,p) >= (QuantumRange/2.0) ?
'0' : '1');
*q++=' ';
- if ((q-pixels+2) >= 80)
+ if ((q-pixels+1) >= (ssize_t) sizeof(pixels))
{
*q++='\n';
(void) WriteBlob(image,q-pixels,pixels);
}
p+=GetPixelChannels(image);
}
+ *q++='\n';
+ (void) WriteBlob(image,q-pixels,pixels);
+ q=pixels;
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
{
index=ClampToQuantum(GetPixelLuma(image,p));
if (image->depth <= 8)
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ",
ScaleQuantumToChar(index));
else
if (image->depth <= 16)
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
- ScaleQuantumToShort(index));
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
+ "%u ",ScaleQuantumToShort(index));
else
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
- ScaleQuantumToLong(index));
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
+ "%u ",ScaleQuantumToLong(index));
extent=(size_t) count;
(void) strncpy((char *) q,buffer,extent);
q+=extent;
- if ((q-pixels+extent) >= 80)
+ if ((q-pixels+extent+1) >= sizeof(pixels))
{
*q++='\n';
(void) WriteBlob(image,q-pixels,pixels);
}
p+=GetPixelChannels(image);
}
+ *q++='\n';
+ (void) WriteBlob(image,q-pixels,pixels);
+ q=pixels;
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->depth <= 8)
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
"%u %u %u ",ScaleQuantumToChar(GetPixelRed(image,p)),
ScaleQuantumToChar(GetPixelGreen(image,p)),
ScaleQuantumToChar(GetPixelBlue(image,p)));
else
if (image->depth <= 16)
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
"%u %u %u ",ScaleQuantumToShort(GetPixelRed(image,p)),
ScaleQuantumToShort(GetPixelGreen(image,p)),
ScaleQuantumToShort(GetPixelBlue(image,p)));
else
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
"%u %u %u ",ScaleQuantumToLong(GetPixelRed(image,p)),
ScaleQuantumToLong(GetPixelGreen(image,p)),
ScaleQuantumToLong(GetPixelBlue(image,p)));
extent=(size_t) count;
(void) strncpy((char *) q,buffer,extent);
q+=extent;
- if ((q-pixels+extent) >= 80)
+ if ((q-pixels+extent+1) >= sizeof(pixels))
{
*q++='\n';
(void) WriteBlob(image,q-pixels,pixels);
}
p+=GetPixelChannels(image);
}
+ *q++='\n';
+ (void) WriteBlob(image,q-pixels,pixels);
+ q=pixels;
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
- *restrict p;
+ *magick_restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
if (p == (const Quantum *) NULL)
*/
if (image->depth > 32)
image->depth=32;
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double)
((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
quantum_info=AcquireQuantumInfo(image_info,image);
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
pixel=ScaleQuantumToChar(GetPixelRed(image,p));
else
pixel=ScaleQuantumToAny(GetPixelRed(image,p),
- max_value);
+ max_value);
}
q=PopCharPixel((unsigned char) pixel,q);
p+=GetPixelChannels(image);
(void) TransformImageColorspace(image,sRGBColorspace,exception);
if (image->depth > 32)
image->depth=32;
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double)
((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
quantum_info=AcquireQuantumInfo(image_info,image);
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
- *restrict p;
+ *magick_restrict p;
register ssize_t
x;
pixel=ScaleQuantumToAny(ClampToQuantum(GetPixelLuma(
image,p)),max_value);
q=PopCharPixel((unsigned char) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=(unsigned char) ScaleQuantumToAny(
GetPixelAlpha(image,p),max_value);
pixel=ScaleQuantumToAny(ClampToQuantum(GetPixelLuma(
image,p)),max_value);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=(unsigned char) ScaleQuantumToAny(
GetPixelAlpha(image,p),max_value);
pixel=ScaleQuantumToAny(ClampToQuantum(GetPixelLuma(image,
p)),max_value);
q=PopLongPixel(MSBEndian,(unsigned int) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=(unsigned char) ScaleQuantumToAny(
GetPixelAlpha(image,p),max_value);
pixel=ScaleQuantumToAny(GetPixelBlack(image,p),
max_value);
q=PopCharPixel((unsigned char) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),
max_value);
pixel=ScaleQuantumToAny(GetPixelBlack(image,p),
max_value);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),
max_value);
q=PopLongPixel(MSBEndian,(unsigned int) pixel,q);
pixel=ScaleQuantumToAny(GetPixelBlack(image,p),max_value);
q=PopLongPixel(MSBEndian,(unsigned int) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),
max_value);
pixel=ScaleQuantumToAny(GetPixelBlue(image,p),
max_value);
q=PopCharPixel((unsigned char) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),
max_value);
pixel=ScaleQuantumToAny(GetPixelBlue(image,p),
max_value);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),
max_value);
q=PopLongPixel(MSBEndian,(unsigned int) pixel,q);
pixel=ScaleQuantumToAny(GetPixelBlue(image,p),max_value);
q=PopLongPixel(MSBEndian,(unsigned int) pixel,q);
- if (image->alpha_trait == BlendPixelTrait)
+ if (image->alpha_trait != UndefinedPixelTrait)
{
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),
max_value);
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
- (void) SetQuantumEndian(image,quantum_info,MSBEndian);
status=SetQuantumFormat(image,quantum_info,FloatingPointQuantumFormat);
if (status == MagickFalse)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
register const Quantum
- *restrict p;
+ *magick_restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
if (p == (const Quantum *) NULL)
projects / imagemagick / blobdiff