% Read/Write X Windows System Bitmap Format %
% %
% Software Design %
-% John Cristy %
+% Cristy %
% July 1992 %
% %
% %
-% Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2017 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-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 "magick/utility.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"
+#include "MagickCore/utility.h"
\f
/*
Forward declarations.
*/
static MagickBooleanType
- WriteXBMImage(const ImageInfo *,Image *);
+ WriteXBMImage(const ImageInfo *,Image *,ExceptionInfo *);
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
*/
-static int XBMInteger(Image *image,short int *hex_digits)
-{
+static unsigned int XBMInteger(Image *image,short int *hex_digits)
+{
int
- c,
- flag,
+ c;
+
+ unsigned int
value;
-
- value=0;
- flag=0;
- for ( ; ; )
- {
+
+ /*
+ Skip any leading whitespace.
+ */
+ do
+ {
c=ReadBlobByte(image);
if (c == EOF)
- {
- value=(-1);
- break;
- }
+ return(0);
+ } while ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\r'));
+ /*
+ Evaluate number.
+ */
+ value=0;
+ do
+ {
+ if (value > (unsigned int) (INT_MAX/10))
+ break;
+ value*=16;
c&=0xff;
- if (isxdigit(c) != MagickFalse)
- {
- value=(int) ((size_t) value << 4)+hex_digits[c];
- flag++;
- continue;
- }
- if ((hex_digits[c]) < 0 && (flag != 0))
+ if (value > (unsigned int) (INT_MAX-hex_digits[c]))
break;
- }
+ value+=hex_digits[c];
+ c=ReadBlobByte(image);
+ if (c == EOF)
+ return(0);
+ } while (hex_digits[c] >= 0);
return(value);
}
static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
- name[MaxTextExtent];
+ buffer[MagickPathExtent],
+ name[MagickPathExtent];
Image
*image;
- ssize_t
- y;
-
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
short int
hex_digits[256];
- size_t
- length;
+ ssize_t
+ y;
unsigned char
*data;
- size_t
+ unsigned int
bit,
byte,
bytes_per_line,
+ height,
+ length,
padding,
value,
- version;
-
- unsigned long
- height,
+ version,
width;
/*
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);
- image=AcquireImage(image_info);
+ assert(exception->signature == MagickCoreSignature);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
width=0;
height=0;
while (ReadBlobString(image,buffer) != (char *) NULL)
- if (sscanf(buffer,"#define %s %lu",name,&width) == 2)
+ if (sscanf(buffer,"#define %32s %u",name,&width) == 2)
if ((strlen(name) >= 6) &&
(LocaleCompare(name+strlen(name)-6,"_width") == 0))
break;
while (ReadBlobString(image,buffer) != (char *) NULL)
- if (sscanf(buffer,"#define %s %lu",name,&height) == 2)
+ if (sscanf(buffer,"#define %32s %u",name,&height) == 2)
if ((strlen(name) >= 7) &&
(LocaleCompare(name+strlen(name)-7,"_height") == 0))
break;
image->columns=width;
- image->rows=width;
+ image->rows=height;
image->depth=8;
image->storage_class=PseudoClass;
image->colors=2;
version=11;
while (ReadBlobString(image,buffer) != (char *) NULL)
{
- if (sscanf(buffer,"static short %s = {",name) == 1)
+ if (sscanf(buffer,"static short %32s = {",name) == 1)
version=10;
else
- if (sscanf(buffer,"static unsigned char %s = {",name) == 1)
+ if (sscanf(buffer,"static unsigned char %32s = {",name) == 1)
version=11;
else
- if (sscanf(buffer,"static char %s = {",name) == 1)
+ if (sscanf(buffer,"static char %32s = {",name) == 1)
version=11;
else
continue;
/*
Initialize image structure.
*/
- if (AcquireImageColormap(image,image->colors) == MagickFalse)
+ if (AcquireImageColormap(image,image->colors,exception) == MagickFalse)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
/*
Initialize colormap.
*/
- image->colormap[0].red=(Quantum) QuantumRange;
- image->colormap[0].green=(Quantum) QuantumRange;
- image->colormap[0].blue=(Quantum) QuantumRange;
+ image->colormap[0].red=QuantumRange;
+ image->colormap[0].green=QuantumRange;
+ image->colormap[0].blue=QuantumRange;
image->colormap[1].red=(Quantum) 0;
image->colormap[1].green=(Quantum) 0;
image->colormap[1].blue=(Quantum) 0;
(void) CloseBlob(image);
return(GetFirstImageInList(image));
}
+ status=SetImageExtent(image,image->columns,image->rows,exception);
+ if (status == MagickFalse)
+ return(DestroyImageList(image));
/*
Initialize hex values.
*/
Read hex image data.
*/
padding=0;
- if (((image->columns % 16) != 0) &&
- ((image->columns % 16) < 9) && (version == 10))
+ if (((image->columns % 16) != 0) && ((image->columns % 16) < 9) &&
+ (version == 10))
padding=1;
- bytes_per_line=(image->columns+7)/8+padding;
- length=(size_t) image->rows;
+ bytes_per_line=(unsigned int) (image->columns+7)/8+padding;
+ length=(unsigned int) image->rows;
data=(unsigned char *) AcquireQuantumMemory(length,bytes_per_line*
sizeof(*data));
if (data == (unsigned char *) NULL)
if (version == 10)
for (i=0; i < (ssize_t) (bytes_per_line*image->rows); (i+=2))
{
- value=(size_t) XBMInteger(image,hex_digits);
+ value=XBMInteger(image,hex_digits);
*p++=(unsigned char) value;
if ((padding == 0) || (((i+2) % bytes_per_line) != 0))
*p++=(unsigned char) (value >> 8);
else
for (i=0; i < (ssize_t) (bytes_per_line*image->rows); i++)
{
- value=(size_t) XBMInteger(image,hex_digits);
+ value=XBMInteger(image,hex_digits);
*p++=(unsigned char) value;
}
/*
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++)
{
if (bit == 0)
byte=(size_t) (*p++);
- indexes[x]=(IndexPacket) ((byte & 0x01) != 0 ? 0x01 : 0x00);
+ SetPixelIndex(image,(Quantum) ((byte & 0x01) != 0 ? 0x01 : 0x00),q);
bit++;
byte>>=1;
if (bit == 8)
bit=0;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
+ image->rows);
if (status == MagickFalse)
break;
}
data=(unsigned char *) RelinquishMagickMemory(data);
- (void) SyncImage(image);
+ (void) SyncImage(image,exception);
(void) CloseBlob(image);
return(GetFirstImageInList(image));
}
MagickInfo
*entry;
- entry=SetMagickInfo("XBM");
+ entry=AcquireMagickInfo("XBM","XBM",
+ "X Windows system bitmap (black and white)");
entry->decoder=(DecodeImageHandler *) ReadXBMImage;
entry->encoder=(EncodeImageHandler *) WriteXBMImage;
entry->magick=(IsImageFormatHandler *) IsXBM;
- entry->adjoin=MagickFalse;
- entry->description=ConstantString(
- "X Windows system bitmap (black and white)");
- entry->module=ConstantString("XBM");
+ entry->flags^=CoderAdjoinFlag;
(void) RegisterMagickInfo(entry);
return(MagickImageCoderSignature);
}
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Procedure WriteXBMImage() writes an image to a file in the X bitmap format.
+% WriteXBMImage() writes an image to a file in the X bitmap format.
%
% The format of the WriteXBMImage method is:
%
-% MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteXBMImage(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 WriteXBMImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
char
- basename[MaxTextExtent],
- buffer[MaxTextExtent];
-
- ssize_t
- y;
+ basename[MagickPathExtent],
+ buffer[MagickPathExtent];
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
- ssize_t
- count;
-
size_t
bit,
byte;
+ ssize_t
+ count,
+ y;
+
/*
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);
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
+ assert(exception != (ExceptionInfo *) NULL);
+ assert(exception->signature == MagickCoreSignature);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
- if (image->colorspace != RGBColorspace)
- (void) TransformImageColorspace(image,RGBColorspace);
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
/*
Write X bitmap header.
*/
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatMagickString(buffer,MaxTextExtent,"#define %s_width %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"#define %s_width %.20g\n",
basename,(double) image->columns);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"#define %s_height %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"#define %s_height %.20g\n",
basename,(double) image->rows);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"static char %s_bits[] = {\n",basename);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
- (void) CopyMagickString(buffer," ",MaxTextExtent);
+ (void) CopyMagickString(buffer," ",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
/*
Convert MIFF to X bitmap pixels.
*/
- (void) SetImageType(image,BilevelType);
+ (void) SetImageType(image,BilevelType,exception);
bit=0;
byte=0;
count=0;
x=0;
y=0;
- (void) CopyMagickString(buffer," ",MaxTextExtent);
+ (void) CopyMagickString(buffer," ",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
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;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte>>=1;
- if (PixelIntensity(p) < ((MagickRealType) QuantumRange/2.0))
+ if (GetPixelLuma(image,p) < (QuantumRange/2))
byte|=0x80;
bit++;
if (bit == 8)
/*
Write a bitmap byte to the image file.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"0x%02X, ",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"0x%02X, ",
(unsigned int) (byte & 0xff));
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count++;
if (count == 12)
{
- (void) CopyMagickString(buffer,"\n ",MaxTextExtent);
+ (void) CopyMagickString(buffer,"\n ",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count=0;
};
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
Write a bitmap byte to the image file.
*/
byte>>=(8-bit);
- (void) FormatMagickString(buffer,MaxTextExtent,"0x%02X, ",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"0x%02X, ",
(unsigned int) (byte & 0xff));
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count++;
if (count == 12)
{
- (void) CopyMagickString(buffer,"\n ",MaxTextExtent);
+ (void) CopyMagickString(buffer,"\n ",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count=0;
};
byte=0;
};
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
- image->rows);
+ image->rows);
if (status == MagickFalse)
break;
}
- (void) CopyMagickString(buffer,"};\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"};\n",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
(void) CloseBlob(image);
return(MagickTrue);
projects / imagemagick / blobdiff