#include "zlib.h"
#endif
\f
+/*
+ Define declarations.
+*/
+#if !defined(LZMA_OK)
+#define LZMA_OK 0
+#endif
+\f
/*
Forward declarations.
*/
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;
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,
+ units=ParseCommandOption(MagickResolutionOptions,MagickFalse,
options);
if (units < 0)
break;
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
code=lzma_auto_decoder(&lzma_info,-1,0);
if (code != LZMA_OK)
status=MagickFalse;
- 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);
*/
(void) WriteBlobString(image,"id=ImageMagick version=1.0\n");
(void) FormatMagickString(buffer,MaxTextExtent,
- "class=%s colors=%.20g matte=%s\n",MagickOptionToMnemonic(
+ "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 "
"depth=%.20g\n",(double) image->columns,(double) image->rows,(double)
if (image->type != UndefinedType)
{
(void) FormatMagickString(buffer,MaxTextExtent,"type=%s\n",
- MagickOptionToMnemonic(MagickTypeOptions,image->type));
+ CommandOptionToMnemonic(MagickTypeOptions,image->type));
(void) WriteBlobString(image,buffer);
}
if (image->colorspace != UndefinedColorspace)
{
(void) FormatMagickString(buffer,MaxTextExtent,"colorspace=%s\n",
- MagickOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
+ CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
(void) WriteBlobString(image,buffer);
}
if (compression != UndefinedCompression)
{
(void) FormatMagickString(buffer,MaxTextExtent,"compression=%s "
- "quality=%.20g\n",MagickOptionToMnemonic(MagickCompressOptions,
+ "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));
+ CommandOptionToMnemonic(MagickResolutionOptions,image->units));
(void) WriteBlobString(image,buffer);
}
if ((image->x_resolution != 0) || (image->y_resolution != 0))
if (image->gravity != UndefinedGravity)
{
(void) FormatMagickString(buffer,MaxTextExtent,"gravity=%s\n",
- MagickOptionToMnemonic(MagickGravityOptions,image->gravity));
+ CommandOptionToMnemonic(MagickGravityOptions,image->gravity));
(void) WriteBlobString(image,buffer);
}
if (image->dispose != UndefinedDispose)
{
(void) FormatMagickString(buffer,MaxTextExtent,"dispose=%s\n",
- MagickOptionToMnemonic(MagickDisposeOptions,image->dispose));
+ CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
(void) WriteBlobString(image,buffer);
}
if (image->rendering_intent != UndefinedIntent)
{
(void) FormatMagickString(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)
if (image->orientation != UndefinedOrientation)
{
(void) FormatMagickString(buffer,MaxTextExtent,"orientation=%s\n",
- MagickOptionToMnemonic(MagickOrientationOptions,image->orientation));
+ CommandOptionToMnemonic(MagickOrientationOptions,image->orientation));
(void) WriteBlobString(image,buffer);
}
if (image->profiles != (void *) NULL)
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);