% July 1992 %
% %
% %
-% Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.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/nt-feature.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.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/nt-base-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_JBIG_DELEGATE)
#include "jbig.h"
#endif
*/
#if defined(MAGICKCORE_JBIG_DELEGATE)
static MagickBooleanType
- WriteJBIGImage(const ImageInfo *,Image *);
+ WriteJBIGImage(const ImageInfo *,Image *,ExceptionInfo *);
#endif
\f
#if defined(MAGICKCORE_JBIG_DELEGATE)
Image
*image;
- IndexPacket
- index;
-
- long
- length,
- y;
-
- MagickBooleanType
+ MagickStatusType
status;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
- register long
+ register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
*p;
ssize_t
- count;
+ length,
+ y;
struct jbg_dec_state
jbig_info;
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)
{
status=JBG_EAGAIN;
do
{
- length=(long) ReadBlob(image,MagickMaxBufferExtent,buffer);
+ length=(ssize_t) ReadBlob(image,MagickMaxBufferExtent,buffer);
if (length == 0)
break;
p=buffer;
- count=0;
while ((length > 0) && ((status == JBG_EAGAIN) || (status == JBG_EOK)))
{
size_t
status=jbg_dec_in(&jbig_info,p,length,&count);
p+=count;
- length-=(long) count;
+ length-=(ssize_t) count;
}
} while ((status == JBG_EAGAIN) || (status == JBG_EOK));
/*
*/
image->columns=jbg_dec_getwidth(&jbig_info);
image->rows=jbg_dec_getheight(&jbig_info);
- if (AcquireImageColormap(image,2) == MagickFalse)
+ image->compression=JBIG2Compression;
+ if (AcquireImageColormap(image,2,exception) == MagickFalse)
{
buffer=(unsigned char *) RelinquishMagickMemory(buffer);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
image->colormap[1].red=QuantumRange;
image->colormap[1].green=QuantumRange;
image->colormap[1].blue=QuantumRange;
- image->x_resolution=300;
- image->y_resolution=300;
+ image->resolution.x=300;
+ image->resolution.y=300;
if (image_info->ping != MagickFalse)
{
(void) CloseBlob(image);
Convert X bitmap image to pixel packets.
*/
p=jbg_dec_getimage(&jbig_info,0);
- for (y=0; y < (long) image->rows; y++)
+ 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 < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
if (bit == 0)
byte=(*p++);
byte<<=1;
if (bit == 8)
bit=0;
- indexes[x]=index;
- *q++=image->colormap[(long) index];
+ SetPixelIndex(image,index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
%
% The format of the RegisterJBIGImage method is:
%
-% unsigned long RegisterJBIGImage(void)
+% size_t RegisterJBIGImage(void)
%
*/
-ModuleExport unsigned long RegisterJBIGImage(void)
+ModuleExport size_t RegisterJBIGImage(void)
{
#define JBIGDescription "Joint Bi-level Image experts Group interchange format"
%
% The format of the WriteJBIGImage method is:
%
-% MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteJBIGImage(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 WriteJBIGImage(const ImageInfo *image_info,
- Image *image)
+ Image *image,ExceptionInfo *exception)
{
double
version;
- long
- y;
-
MagickBooleanType
status;
MagickOffsetType
scene;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
- register long
+ register ssize_t
x;
register unsigned char
*q;
+ size_t
+ number_packets;
+
+ ssize_t
+ y;
+
struct jbg_enc_state
jbig_info;
byte,
*pixels;
- unsigned long
- number_packets;
-
/*
Open 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);
- version=strtod(JBG_VERSION,(char **) NULL);
+ version=StringToDouble(JBG_VERSION,(char **) NULL);
scene=0;
do
{
/*
Allocate pixel data.
*/
- if (image->colorspace != RGBColorspace)
- (void) TransformImageColorspace(image,RGBColorspace);
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
number_packets=(image->columns+7)/8;
pixels=(unsigned char *) AcquireQuantumMemory(number_packets,
image->rows*sizeof(*pixels));
/*
Convert pixels to a bitmap.
*/
- (void) SetImageType(image,BilevelType);
+ (void) SetImageType(image,BilevelType,exception);
q=pixels;
- for (y=0; y < (long) image->rows; y++)
+ 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;
- indexes=GetVirtualIndexQueue(image);
bit=0;
byte=0;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (PixelIntensity(p) < (QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) < (QuantumRange/2.0))
byte|=0x01;
bit++;
if (bit == 8)
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte << (8-bit);
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
/*
Initialize JBIG info structure.
*/
- jbg_enc_init(&jbig_info,image->columns,image->rows,1,&pixels,
- (void (*)(unsigned char *,size_t,void *)) JBIGEncode,image);
+ jbg_enc_init(&jbig_info,(unsigned long) image->columns,(unsigned long)
+ image->rows,1,&pixels,(void (*)(unsigned char *,size_t,void *))
+ JBIGEncode,image);
if (image_info->scene != 0)
jbg_enc_layers(&jbig_info,(int) image_info->scene);
else
{
- long
- sans_offset;
-
- unsigned long
+ size_t
x_resolution,
y_resolution;
x_resolution=640;
y_resolution=480;
- sans_offset=0;
if (image_info->density != (char *) NULL)
{
GeometryInfo
}
if (image->units == PixelsPerCentimeterResolution)
{
- x_resolution*=2.54;
- y_resolution*=2.54;
+ x_resolution=(size_t) (100.0*2.54*x_resolution+0.5)/100.0;
+ y_resolution=(size_t) (100.0*2.54*y_resolution+0.5)/100.0;
}
- (void) jbg_enc_lrlmax(&jbig_info,x_resolution,y_resolution);
+ (void) jbg_enc_lrlmax(&jbig_info,(unsigned long) x_resolution,
+ (unsigned long) y_resolution);
}
(void) jbg_enc_lrange(&jbig_info,-1,-1);
jbg_enc_options(&jbig_info,JBG_ILEAVE | JBG_SMID,JBG_TPDON | JBG_TPBON |
projects / imagemagick / blobdiff