#include "zlib.h"
#endif
\f
+/*
+ Define declarations.
+*/
+#if !defined(LZMA_OK)
+#define LZMA_OK 0
+#endif
+\f
/*
Forward declarations.
*/
quantum;
p=PushCharPixel(p,&quantum);
- pixel->red=ScaleCharToQuantum(quantum);
+ SetRedPixelComponent(pixel,ScaleCharToQuantum(quantum));
p=PushCharPixel(p,&quantum);
- pixel->green=ScaleCharToQuantum(quantum);
+ SetGreenPixelComponent(pixel,ScaleCharToQuantum(quantum));
p=PushCharPixel(p,&quantum);
- pixel->blue=ScaleCharToQuantum(quantum);
+ SetBluePixelComponent(pixel,ScaleCharToQuantum(quantum));
if (image->matte != MagickFalse)
{
p=PushCharPixel(p,&quantum);
- pixel->opacity=ScaleCharToQuantum(quantum);
+ SetOpacityPixelComponent(pixel,ScaleCharToQuantum(quantum));
}
if (image->colorspace == CMYKColorspace)
{
p=PushCharPixel(p,&quantum);
- *index=ScaleCharToQuantum(quantum);
+ SetBlackPixelComponent(index,ScaleCharToQuantum(quantum));
}
break;
}
quantum;
p=PushShortPixel(MSBEndian,p,&quantum);
- pixel->red=(Quantum) (quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH));
+ SetRedPixelComponent(pixel,quantum >> (image->depth-
+ MAGICKCORE_QUANTUM_DEPTH));
p=PushShortPixel(MSBEndian,p,&quantum);
- pixel->green=(Quantum) (quantum >> (image->depth-
+ SetGreenPixelComponent(pixel,quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
p=PushShortPixel(MSBEndian,p,&quantum);
- pixel->blue=(Quantum) (quantum >> (image->depth-
+ SetBluePixelComponent(pixel,quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
if (image->matte != MagickFalse)
{
p=PushShortPixel(MSBEndian,p,&quantum);
- pixel->opacity=(Quantum) (quantum >> (image->depth-
+ SetOpacityPixelComponent(pixel,quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
}
if (image->colorspace == CMYKColorspace)
{
p=PushShortPixel(MSBEndian,p,&quantum);
- *index=(IndexPacket) (quantum >> (image->depth-
+ SetBlackPixelComponent(index,quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
}
break;
quantum;
p=PushLongPixel(MSBEndian,p,&quantum);
- pixel->red=(Quantum) (quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH));
+ SetRedPixelComponent(pixel,quantum >> (image->depth-
+ MAGICKCORE_QUANTUM_DEPTH));
p=PushLongPixel(MSBEndian,p,&quantum);
- pixel->green=(Quantum) (quantum >> (image->depth-
+ SetGreenPixelComponent(pixel,quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
p=PushLongPixel(MSBEndian,p,&quantum);
- pixel->blue=(Quantum) (quantum >> (image->depth-
+ SetBluePixelComponent(pixel,quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
if (image->matte != MagickFalse)
{
p=PushLongPixel(MSBEndian,p,&quantum);
- pixel->opacity=(Quantum) (quantum >> (image->depth-
+ SetOpacityPixelComponent(pixel,quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
}
if (image->colorspace == CMYKColorspace)
{
p=PushLongPixel(MSBEndian,p,&quantum);
- *index=(IndexPacket) (quantum >> (image->depth-
+ SetIndexPixelComponent(index,quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
}
break;
p=keyword;
do
{
- if (isspace((int) ((unsigned char) c)) != 0)
- break;
if (c == (int) '=')
break;
if ((size_t) (p-keyword) < (MaxTextExtent-1))
ssize_t
storage_class;
- storage_class=ParseMagickOption(MagickClassOptions,
+ storage_class=ParseCommandOption(MagickClassOptions,
MagickFalse,options);
if (storage_class < 0)
break;
ssize_t
colorspace;
- colorspace=ParseMagickOption(MagickColorspaceOptions,
+ colorspace=ParseCommandOption(MagickColorspaceOptions,
MagickFalse,options);
if (colorspace < 0)
break;
ssize_t
compression;
- compression=ParseMagickOption(MagickCompressOptions,
+ compression=ParseCommandOption(MagickCompressOptions,
MagickFalse,options);
if (compression < 0)
break;
ssize_t
dispose;
- dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,
+ dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,
options);
if (dispose < 0)
break;
ssize_t
endian;
- endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
+ endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
options);
if (endian < 0)
break;
{
if (LocaleCompare(keyword,"gamma") == 0)
{
- image->gamma=StringToDouble(options);
+ image->gamma=LocaleToDouble(options,(char **) NULL);
break;
}
if (LocaleCompare(keyword,"gravity") == 0)
ssize_t
gravity;
- gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,
+ gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,
options);
if (gravity < 0)
break;
ssize_t
matte;
- matte=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ matte=ParseCommandOption(MagickBooleanOptions,MagickFalse,
options);
if (matte < 0)
break;
ssize_t
matte;
- matte=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ matte=ParseCommandOption(MagickBooleanOptions,MagickFalse,
options);
if (matte < 0)
break;
ssize_t
orientation;
- orientation=ParseMagickOption(MagickOrientationOptions,
+ orientation=ParseCommandOption(MagickOrientationOptions,
MagickFalse,options);
if (orientation < 0)
break;
ssize_t
format;
- format=ParseMagickOption(MagickQuantumFormatOptions,
+ format=ParseCommandOption(MagickQuantumFormatOptions,
MagickFalse,options);
if (format < 0)
break;
ssize_t
rendering_intent;
- rendering_intent=ParseMagickOption(MagickIntentOptions,
+ rendering_intent=ParseCommandOption(MagickIntentOptions,
MagickFalse,options);
if (rendering_intent < 0)
break;
ssize_t
type;
- type=ParseMagickOption(MagickTypeOptions,MagickFalse,
+ type=ParseCommandOption(MagickTypeOptions,MagickFalse,
options);
if (type < 0)
break;
ssize_t
units;
- units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
- options);
+ units=ParseCommandOption(MagickResolutionOptions,
+ MagickFalse,options);
if (units < 0)
break;
image->units=(ResolutionType) units;
{
if (LocaleCompare(keyword,"version") == 0)
{
- version=StringToDouble(options);
+ version=LocaleToDouble(options,(char **) NULL);
break;
}
(void) SetImageProperty(image,keyword,options);
p=GetStringInfoDatum(profile);
count=ReadBlob(image,GetStringInfoLength(profile),p);
+ (void) count;
}
name=(const char *) GetNextValueInLinkedList(profiles);
}
MagickFalse);
if (code != BZ_OK)
status=MagickFalse;
- bzip_info.avail_in=0;
break;
}
#endif
#if defined(MAGICKCORE_LZMA_DELEGATE)
case LZMACompression:
{
+ (void) ResetMagickMemory(&allocator,0,sizeof(allocator));
+ allocator.alloc=AcquireLZMAMemory;
+ allocator.free=RelinquishLZMAMemory;
lzma_info=initialize_lzma;
+ lzma_info.allocator=(&allocator);
code=lzma_auto_decoder(&lzma_info,-1,0);
if (code != LZMA_OK)
status=MagickFalse;
- allocator.alloc=AcquireLZMAMemory;
- allocator.free=RelinquishLZMAMemory;
- allocator.opaque=(void *) NULL;
- lzma_info.allocator=(&allocator);
- lzma_info.avail_in=0;
break;
}
#endif
code=inflateInit(&zip_info);
if (code != Z_OK)
status=MagickFalse;
- zip_info.avail_in=0;
break;
}
#endif
length--;
if ((image->storage_class == PseudoClass) ||
(image->colorspace == CMYKColorspace))
- indexes[x]=index;
- *q++=pixel;
+ SetIndexPixelComponent(indexes+x,index);
+ SetRedPixelComponent(q,pixel.red);
+ SetGreenPixelComponent(q,pixel.green);
+ SetBluePixelComponent(q,pixel.blue);
+ SetOpacityPixelComponent(q,pixel.opacity);
+ q++;
}
break;
}
#if defined(MAGICKCORE_LZMA_DELEGATE)
case LZMACompression:
{
+ code=lzma_code(&lzma_info,LZMA_FINISH);
+ if ((code != LZMA_STREAM_END) && (code != LZMA_OK))
+ status=MagickFalse;
lzma_end(&lzma_info);
break;
}
entry->decoder=(DecodeImageHandler *) ReadMIFFImage;
entry->encoder=(EncodeImageHandler *) WriteMIFFImage;
entry->magick=(IsImageFormatHandler *) IsMIFF;
+ entry->seekable_stream=MagickTrue;
entry->description=ConstantString("Magick Image File Format");
if (*version != '\0')
entry->version=ConstantString(version);
Write MIFF header.
*/
(void) WriteBlobString(image,"id=ImageMagick version=1.0\n");
- (void) FormatMagickString(buffer,MaxTextExtent,
- "class=%s colors=%.20g matte=%s\n",MagickOptionToMnemonic(
+ (void) FormatLocaleString(buffer,MaxTextExtent,
+ "class=%s colors=%.20g matte=%s\n",CommandOptionToMnemonic(
MagickClassOptions,image->storage_class),(double) image->colors,
- MagickOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte));
+ CommandOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte));
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,"columns=%.20g rows=%.20g "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"columns=%.20g rows=%.20g "
"depth=%.20g\n",(double) image->columns,(double) image->rows,(double)
image->depth);
(void) WriteBlobString(image,buffer);
if (image->type != UndefinedType)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"type=%s\n",
- MagickOptionToMnemonic(MagickTypeOptions,image->type));
+ (void) FormatLocaleString(buffer,MaxTextExtent,"type=%s\n",
+ CommandOptionToMnemonic(MagickTypeOptions,image->type));
(void) WriteBlobString(image,buffer);
}
if (image->colorspace != UndefinedColorspace)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"colorspace=%s\n",
- MagickOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
+ (void) FormatLocaleString(buffer,MaxTextExtent,"colorspace=%s\n",
+ CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
(void) WriteBlobString(image,buffer);
}
if (compression != UndefinedCompression)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"compression=%s "
- "quality=%.20g\n",MagickOptionToMnemonic(MagickCompressOptions,
+ (void) FormatLocaleString(buffer,MaxTextExtent,"compression=%s "
+ "quality=%.20g\n",CommandOptionToMnemonic(MagickCompressOptions,
compression),(double) image->quality);
(void) WriteBlobString(image,buffer);
}
if (image->units != UndefinedResolution)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"units=%s\n",
- MagickOptionToMnemonic(MagickResolutionOptions,image->units));
+ (void) FormatLocaleString(buffer,MaxTextExtent,"units=%s\n",
+ CommandOptionToMnemonic(MagickResolutionOptions,image->units));
(void) WriteBlobString(image,buffer);
}
if ((image->x_resolution != 0) || (image->y_resolution != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"resolution=%gx%g\n",image->x_resolution,image->y_resolution);
(void) WriteBlobString(image,buffer);
}
if ((image->page.width != 0) || (image->page.height != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"page=%.20gx%.20g%+.20g%+.20g\n",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
(void) WriteBlobString(image,buffer);
else
if ((image->page.x != 0) || (image->page.y != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"page=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"page=%+ld%+ld\n",
(long) image->page.x,(long) image->page.y);
(void) WriteBlobString(image,buffer);
}
if ((image->tile_offset.x != 0) || (image->tile_offset.y != 0))
{
- (void) FormatMagickString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n",
(long) image->tile_offset.x,(long) image->tile_offset.y);
(void) WriteBlobString(image,buffer);
}
(GetPreviousImageInList(image) != (Image *) NULL))
{
if (image->scene == 0)
- (void) FormatMagickString(buffer,MaxTextExtent,"iterations=%.20g "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g "
"delay=%.20g ticks-per-second=%.20g\n",(double) image->iterations,
(double) image->delay,(double) image->ticks_per_second);
else
- (void) FormatMagickString(buffer,MaxTextExtent,"scene=%.20g "
+ (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g "
"iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",(double)
image->scene,(double) image->iterations,(double) image->delay,
(double) image->ticks_per_second);
{
if (image->scene != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"scene=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
}
if (image->iterations != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"iterations=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g\n",
(double) image->iterations);
(void) WriteBlobString(image,buffer);
}
if (image->delay != 0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"delay=%.20g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"delay=%.20g\n",
(double) image->delay);
(void) WriteBlobString(image,buffer);
}
if (image->ticks_per_second != UndefinedTicksPerSecond)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"ticks-per-second=%.20g\n",(double) image->ticks_per_second);
(void) WriteBlobString(image,buffer);
}
}
if (image->gravity != UndefinedGravity)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"gravity=%s\n",
- MagickOptionToMnemonic(MagickGravityOptions,image->gravity));
+ (void) FormatLocaleString(buffer,MaxTextExtent,"gravity=%s\n",
+ CommandOptionToMnemonic(MagickGravityOptions,image->gravity));
(void) WriteBlobString(image,buffer);
}
if (image->dispose != UndefinedDispose)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"dispose=%s\n",
- MagickOptionToMnemonic(MagickDisposeOptions,image->dispose));
+ (void) FormatLocaleString(buffer,MaxTextExtent,"dispose=%s\n",
+ CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
(void) WriteBlobString(image,buffer);
}
if (image->rendering_intent != UndefinedIntent)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"rendering-intent=%s\n",
- MagickOptionToMnemonic(MagickIntentOptions,image->rendering_intent));
+ CommandOptionToMnemonic(MagickIntentOptions,image->rendering_intent));
(void) WriteBlobString(image,buffer);
}
if (image->gamma != 0.0)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"gamma=%g\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"gamma=%g\n",
image->gamma);
(void) WriteBlobString(image,buffer);
}
/*
Note chomaticity points.
*/
- (void) FormatMagickString(buffer,MaxTextExtent,"red-primary=%g,"
+ (void) FormatLocaleString(buffer,MaxTextExtent,"red-primary=%g,"
"%g green-primary=%g,%g blue-primary=%g,%g\n",
image->chromaticity.red_primary.x,image->chromaticity.red_primary.y,
image->chromaticity.green_primary.x,
image->chromaticity.blue_primary.x,
image->chromaticity.blue_primary.y);
(void) WriteBlobString(image,buffer);
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"white-point=%g,%g\n",image->chromaticity.white_point.x,
image->chromaticity.white_point.y);
(void) WriteBlobString(image,buffer);
}
if (image->orientation != UndefinedOrientation)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"orientation=%s\n",
- MagickOptionToMnemonic(MagickOrientationOptions,image->orientation));
+ (void) FormatLocaleString(buffer,MaxTextExtent,"orientation=%s\n",
+ CommandOptionToMnemonic(MagickOrientationOptions,image->orientation));
(void) WriteBlobString(image,buffer);
}
if (image->profiles != (void *) NULL)
profile=GetImageProfile(image,name);
if (profile != (StringInfo *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MaxTextExtent,
"profile:%s=%.20g\n",name,(double)
GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
}
if (image->montage != (char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"montage=%s\n",
+ (void) FormatLocaleString(buffer,MaxTextExtent,"montage=%s\n",
image->montage);
(void) WriteBlobString(image,buffer);
}
property=GetNextImageProperty(image);
while (property != (const char *) NULL)
{
- (void) FormatMagickString(buffer,MaxTextExtent,"%s=",property);
+ (void) FormatLocaleString(buffer,MaxTextExtent,"%s=",property);
(void) WriteBlobString(image,buffer);
value=GetImageProperty(image,property);
if (value != (const char *) NULL)
#if defined(MAGICKCORE_LZMA_DELEGATE)
case LZMACompression:
{
- lzma_info=initialize_lzma;
- code=lzma_easy_encoder(&lzma_info,image->quality/10,LZMA_CHECK_SHA256);
- if (code != LZMA_OK)
- status=MagickTrue;
(void) ResetMagickMemory(&allocator,0,sizeof(allocator));
allocator.alloc=AcquireLZMAMemory;
allocator.free=RelinquishLZMAMemory;
+ lzma_info=initialize_lzma;
lzma_info.allocator=&allocator;
+ code=lzma_easy_encoder(&lzma_info,image->quality/10,LZMA_CHECK_SHA256);
+ if (code != LZMA_OK)
+ status=MagickTrue;
break;
}
#endif
if ((length < 255) && (x < (ssize_t) (image->columns-1)) &&
(IsColorEqual(p,&pixel) != MagickFalse) &&
((image->matte == MagickFalse) ||
- (p->opacity == pixel.opacity)) &&
- ((indexes == (IndexPacket *) NULL) || (index == indexes[x])))
+ (GetOpacityPixelComponent(p) == pixel.opacity)) &&
+ ((indexes == (IndexPacket *) NULL) ||
+ (index == GetIndexPixelComponent(indexes+x))))
length++;
else
{
}
pixel=(*p);
if (indexes != (IndexPacket *) NULL)
- index=indexes[x];
+ index=GetIndexPixelComponent(indexes+x);
p++;
}
q=PopRunlengthPacket(image,q,length,pixel,index);
projects / imagemagick / blobdiff