diff --git a/coders/aai.c b/coders/aai.c
index f4367a8..490d812 100644
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -132,7 +132,7 @@
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)
{
@@ -215,7 +215,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/art.c b/coders/art.c
index 42ccd5e..c102f02 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -128,7 +128,7 @@
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)
{
diff --git a/coders/avs.c b/coders/avs.c
index 20cb237..2127d90 100644
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -131,7 +131,7 @@
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)
{
@@ -212,7 +212,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/bgr.c b/coders/bgr.c
index 774a612..d598b86 100644
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -138,7 +138,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
image->colorspace=RGBColorspace;
@@ -929,7 +929,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/bmp.c b/coders/bmp.c
index 1448fe6..6efd7f9 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -539,7 +539,7 @@
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)
{
@@ -1323,7 +1323,7 @@
/*
Acquire next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/cals.c b/coders/cals.c
index c3ad21c..f32e61f 100644
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -185,7 +185,7 @@
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)
{
diff --git a/coders/caption.c b/coders/caption.c
index 61826ad..b12136d 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -125,7 +125,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if (image->columns == 0)
ThrowReaderException(OptionError,"MustSpecifyImageSize");
(void) ResetImagePage(image,"0x0+0+0");
diff --git a/coders/cin.c b/coders/cin.c
index 0ec21d4..5a2202f 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -425,7 +425,7 @@
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)
{
diff --git a/coders/clipboard.c b/coders/clipboard.c
index 57838fe..66fcb94 100644
--- a/coders/clipboard.c
+++ b/coders/clipboard.c
@@ -123,7 +123,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
{
HBITMAP
bitmapH;
diff --git a/coders/cmyk.c b/coders/cmyk.c
index e9d1bba..5a102c2 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -137,7 +137,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
image->colorspace=CMYKColorspace;
@@ -1046,7 +1046,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/cut.c b/coders/cut.c
index 2b7b934..6c4c977 100644
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -325,7 +325,7 @@
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)
{
@@ -417,7 +417,7 @@
}
}
- if( (palette=AcquireImage(clone_info))==NULL ) goto NoPalette;
+ if( (palette=AcquireImage(clone_info,exception))==NULL ) goto NoPalette;
status=OpenBlob(clone_info,palette,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
diff --git a/coders/dcm.c b/coders/dcm.c
index c03710d..3cf291e 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -2873,7 +2873,7 @@
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)
{
@@ -4068,7 +4068,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/dds.c b/coders/dds.c
index 0421b75..56385a4 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -266,7 +266,7 @@
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)
{
@@ -370,7 +370,7 @@
if (n != 0)
{
/* Start a new image */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image = DestroyImageList(image);
diff --git a/coders/dib.c b/coders/dib.c
index 7cf148c..80019d2 100644
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -501,7 +501,7 @@
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)
{
diff --git a/coders/djvu.c b/coders/djvu.c
index 2f803a5..2a664c8 100644
--- a/coders/djvu.c
+++ b/coders/djvu.c
@@ -780,7 +780,7 @@
logging = LogMagickEvent(CoderEvent,GetMagickModule(),"enter ReadDJVUImage()");
(void) logging;
- image = AcquireImage(image_info); /* mmc: ?? */
+ image = AcquireImage(image_info,exception); /* mmc: ?? */
lc = (LoadContext *) NULL;
diff --git a/coders/dng.c b/coders/dng.c
index fc29a69..97e4514 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -114,7 +114,7 @@
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)
{
@@ -126,7 +126,7 @@
/*
Convert DNG to PPM with delegate.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
(void) InvokeDelegate(read_info,image,"dng:decode",(char *) NULL,exception);
diff --git a/coders/dot.c b/coders/dot.c
index 180d8f2..eea9cc6 100644
--- a/coders/dot.c
+++ b/coders/dot.c
@@ -125,7 +125,7 @@
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)
return((Image *) NULL);
diff --git a/coders/dps.c b/coders/dps.c
index 7bebc29..7dcdb09 100644
--- a/coders/dps.c
+++ b/coders/dps.c
@@ -179,7 +179,7 @@
/*
Open image file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
return((Image *) NULL);
diff --git a/coders/dpx.c b/coders/dpx.c
index 7cb751a..014451b 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -587,7 +587,7 @@
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)
{
diff --git a/coders/emf.c b/coders/emf.c
index 737091a..70fb875 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -467,7 +467,7 @@
width,
y;
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
hemf=ReadEnhMetaFile(image_info->filename,&width,&height);
if (hemf == (HENHMETAFILE) NULL)
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
diff --git a/coders/ept.c b/coders/ept.c
index b2527cb..2f378f8 100644
--- a/coders/ept.c
+++ b/coders/ept.c
@@ -184,7 +184,7 @@
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)
{
diff --git a/coders/exr.c b/coders/exr.c
index 94a6cf5..d54f3ab 100644
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -174,7 +174,7 @@
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)
{
diff --git a/coders/fax.c b/coders/fax.c
index ad02240..f618c20 100644
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -145,7 +145,7 @@
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)
{
diff --git a/coders/fits.c b/coders/fits.c
index 1bb86ca..39f108a 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -288,7 +288,7 @@
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)
{
@@ -477,7 +477,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/fpx.c b/coders/fpx.c
index 289f550..28d8d70 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -218,7 +218,7 @@
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)
{
diff --git a/coders/gif.c b/coders/gif.c
index 4b5caf1..16b4247 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -1007,7 +1007,7 @@
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)
{
@@ -1205,7 +1205,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/gradient.c b/coders/gradient.c
index 7f2e1b2..8e71e33 100644
--- a/coders/gradient.c
+++ b/coders/gradient.c
@@ -94,13 +94,16 @@
char
colorname[MaxTextExtent];
+ Image
+ *image;
+
+ MagickBooleanType
+ status;
+
PixelPacket
start_color,
stop_color;
- Image
- *image;
-
/*
Initialize Image structure.
*/
@@ -111,14 +114,15 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
(void) SetImageOpacity(image,(Quantum) TransparentAlpha);
(void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
(void) CopyMagickString(colorname,image_info->filename,MaxTextExtent);
(void) sscanf(image_info->filename,"%[^-]",colorname);
- if (QueryColorDatabase(colorname,&start_color,exception) == MagickFalse)
+ status=QueryColorCompliance(colorname,AllCompliance,&start_color,exception);
+ if (status == MagickFalse)
{
image=DestroyImage(image);
return((Image *) NULL);
@@ -127,7 +131,8 @@
if (GetPixelPacketIntensity(&start_color) > (Quantum) (QuantumRange/2))
(void) CopyMagickString(colorname,"black",MaxTextExtent);
(void) sscanf(image_info->filename,"%*[^-]-%s",colorname);
- if (QueryColorDatabase(colorname,&stop_color,exception) == MagickFalse)
+ status=QueryColorCompliance(colorname,AllCompliance,&stop_color,exception);
+ if (status == MagickFalse)
{
image=DestroyImage(image);
return((Image *) NULL);
diff --git a/coders/gray.c b/coders/gray.c
index 2983c28..8b2c310 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -135,7 +135,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -255,7 +255,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/hald.c b/coders/hald.c
index ddd870d..f441153 100644
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -113,7 +113,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
level=0;
if (*image_info->filename != '\0')
level=StringToUnsignedLong(image_info->filename);
diff --git a/coders/hdr.c b/coders/hdr.c
index 8281e40..06ab46d 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -182,7 +182,7 @@
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)
{
diff --git a/coders/histogram.c b/coders/histogram.c
index 405e645..be8b2bf 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -292,8 +292,8 @@
/*
Initialize histogram image.
*/
- (void) QueryColorDatabase("#000000",&histogram_image->background_color,
- exception);
+ (void) QueryColorCompliance("#000000",AllCompliance,
+ &histogram_image->background_color,exception);
(void) SetImageBackgroundColor(histogram_image);
for (x=0; x < (ssize_t) histogram_image->columns; x++)
{
diff --git a/coders/hrz.c b/coders/hrz.c
index 4cc6ce8..32c5b2b 100644
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -129,7 +129,7 @@
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)
{
diff --git a/coders/icon.c b/coders/icon.c
index 7d23860..0ed47e4 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -214,7 +214,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"%s",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)
{
@@ -635,7 +635,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/inline.c b/coders/inline.c
index 4ed5e8c..2c7f23a 100644
--- a/coders/inline.c
+++ b/coders/inline.c
@@ -126,7 +126,7 @@
assert(exception->signature == MagickSignature);
if (LocaleNCompare(image_info->filename,"data:",5) == 0)
return(ReadInlineImage(image_info,image_info->filename,exception));
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
diff --git a/coders/ipl.c b/coders/ipl.c
index e6c0ebe..dcaa9a6 100644
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -205,7 +205,7 @@
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)
{
@@ -396,7 +396,7 @@
/*
Proceed to next image.
*/
- AcquireNextImage(image_info, image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/jbig.c b/coders/jbig.c
index 4ccf631..1304e9b 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -147,7 +147,7 @@
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)
{
diff --git a/coders/jp2.c b/coders/jp2.c
index 2835152..cc8d33c 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -383,7 +383,7 @@
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)
{
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 42c80e4..060c8ba 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -997,7 +997,7 @@
assert(exception->signature == MagickSignature);
debug=IsEventLogging();
(void) debug;
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
diff --git a/coders/label.c b/coders/label.c
index f3bd5eb..04a3a63 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -121,7 +121,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
(void) ResetImagePage(image,"0x0+0+0");
property=InterpretImageProperties(image_info,image,image_info->filename,
exception);
diff --git a/coders/mac.c b/coders/mac.c
index 5ddcf7e..7f629d3 100644
--- a/coders/mac.c
+++ b/coders/mac.c
@@ -127,7 +127,7 @@
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)
{
diff --git a/coders/map.c b/coders/map.c
index 7ee63f9..f864b57 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -143,7 +143,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
diff --git a/coders/mat.c b/coders/mat.c
index 6555992..f5a852b 100644
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -550,7 +550,7 @@
RelinquishMagickMemory(DecompressBlock);
if((clone_info->file=fopen(clone_info->filename,"rb"))==NULL) goto UnlinkFile;
- if( (image2 = AcquireImage(clone_info))==NULL ) goto EraseFile;
+ if( (image2 = AcquireImage(clone_info,exception))==NULL ) goto EraseFile;
status = OpenBlob(clone_info,image2,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
@@ -644,7 +644,7 @@
/*
Open image file.
*/
- image = AcquireImage(image_info);
+ image = AcquireImage(image_info,exception);
status = OpenBlob(image_info, image, ReadBinaryBlobMode, exception);
if (status == MagickFalse)
@@ -1005,7 +1005,7 @@
}
/* Allocate next image structure. */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (image->next == (Image *) NULL) break;
image=SyncNextImageInList(image);
image->columns=image->rows=0;
diff --git a/coders/meta.c b/coders/meta.c
index 7881012..86a2cc9 100644
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1093,7 +1093,7 @@
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)
{
@@ -1114,7 +1114,7 @@
/*
Read 8BIM binary metadata.
*/
- buff=AcquireImage((ImageInfo *) NULL);
+ buff=AcquireImage((ImageInfo *) NULL,exception);
if (buff == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(unsigned char));
@@ -1164,7 +1164,7 @@
name[MaxTextExtent];
(void) FormatLocaleString(name,MaxTextExtent,"APP%d",1);
- buff=AcquireImage((ImageInfo *) NULL);
+ buff=AcquireImage((ImageInfo *) NULL,exception);
if (buff == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(unsigned char));
@@ -1190,7 +1190,7 @@
ThrowReaderException(CoderError,"NoIPTCProfileAvailable");
}
profile=CloneStringInfo((StringInfo *) image_info->profile);
- iptc=AcquireImage((ImageInfo *) NULL);
+ iptc=AcquireImage((ImageInfo *) NULL,exception);
if (iptc == (Image *) NULL)
{
blob=DetachBlob(buff->blob);
@@ -1270,7 +1270,7 @@
if ((LocaleCompare(image_info->magick,"ICC") == 0) ||
(LocaleCompare(image_info->magick,"ICM") == 0))
{
- buff=AcquireImage((ImageInfo *) NULL);
+ buff=AcquireImage((ImageInfo *) NULL,exception);
if (buff == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(unsigned char));
@@ -1302,7 +1302,7 @@
register unsigned char
*p;
- buff=AcquireImage((ImageInfo *) NULL);
+ buff=AcquireImage((ImageInfo *) NULL,exception);
if (buff == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(unsigned char));
@@ -1354,7 +1354,7 @@
}
if (LocaleCompare(image_info->magick,"XMP") == 0)
{
- buff=AcquireImage((ImageInfo *) NULL);
+ buff=AcquireImage((ImageInfo *) NULL,exception);
if (buff == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(unsigned char));
@@ -2315,7 +2315,7 @@
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
- buff=AcquireImage((ImageInfo *) NULL);
+ buff=AcquireImage((ImageInfo *) NULL,exception);
if (buff == (Image *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
AttachBlob(buff->blob,GetStringInfoDatum(profile),
@@ -2349,7 +2349,7 @@
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
- buff=AcquireImage((ImageInfo *) NULL);
+ buff=AcquireImage((ImageInfo *) NULL,exception);
if (buff == (Image *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
AttachBlob(buff->blob,info,length);
diff --git a/coders/miff.c b/coders/miff.c
index f262686..dcbcfbd 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -480,7 +480,7 @@
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)
{
@@ -608,8 +608,8 @@
{
if (LocaleCompare(keyword,"background-color") == 0)
{
- (void) QueryColorDatabase(options,&image->background_color,
- exception);
+ (void) QueryColorCompliance(options,AllCompliance,
+ &image->background_color,exception);
break;
}
if (LocaleCompare(keyword,"blue-primary") == 0)
@@ -624,8 +624,8 @@
}
if (LocaleCompare(keyword,"border-color") == 0)
{
- (void) QueryColorDatabase(options,&image->border_color,
- exception);
+ (void) QueryColorCompliance(options,AllCompliance,
+ &image->border_color,exception);
break;
}
(void) SetImageProperty(image,keyword,options);
@@ -795,8 +795,8 @@
}
if (LocaleCompare(keyword,"matte-color") == 0)
{
- (void) QueryColorDatabase(options,&image->matte_color,
- exception);
+ (void) QueryColorCompliance(options,AllCompliance,
+ &image->matte_color,exception);
break;
}
if (LocaleCompare(keyword,"montage") == 0)
@@ -1520,7 +1520,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/mono.c b/coders/mono.c
index 3cea1bb..aa0b0a6 100644
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -127,7 +127,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
diff --git a/coders/mpc.c b/coders/mpc.c
index c3b03ab..c2d17a2 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -196,7 +196,7 @@
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)
{
@@ -324,8 +324,8 @@
{
if (LocaleCompare(keyword,"background-color") == 0)
{
- (void) QueryColorDatabase(options,&image->background_color,
- exception);
+ (void) QueryColorCompliance(options,AllCompliance,
+ &image->background_color,exception);
break;
}
if (LocaleCompare(keyword,"blue-primary") == 0)
@@ -340,8 +340,8 @@
}
if (LocaleCompare(keyword,"border-color") == 0)
{
- (void) QueryColorDatabase(options,&image->border_color,
- exception);
+ (void) QueryColorCompliance(options,AllCompliance,
+ &image->border_color,exception);
break;
}
(void) SetImageProperty(image,keyword,options);
@@ -505,8 +505,8 @@
}
if (LocaleCompare(keyword,"matte-color") == 0)
{
- (void) QueryColorDatabase(options,&image->matte_color,
- exception);
+ (void) QueryColorCompliance(options,AllCompliance,
+ &image->matte_color,exception);
break;
}
if (LocaleCompare(keyword,"maximum-error") == 0)
@@ -919,7 +919,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/mpeg.c b/coders/mpeg.c
index be44a92..99e34be 100644
--- a/coders/mpeg.c
+++ b/coders/mpeg.c
@@ -188,7 +188,7 @@
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)
{
@@ -201,7 +201,7 @@
Convert MPEG to PAM with delegate.
*/
read_info=CloneImageInfo(image_info);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
(void) InvokeDelegate(read_info,image,"mpeg:decode",(char *) NULL,exception);
image=DestroyImage(image);
(void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.%s",
diff --git a/coders/msl.c b/coders/msl.c
index 220e48c..71b9558 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -49,8 +49,8 @@
#include "MagickCore/cache.h"
#include "MagickCore/cache-view.h"
#include "MagickCore/color.h"
-#include "MagickCore/colormap.h"
#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
#include "MagickCore/composite.h"
#include "MagickCore/constitute.h"
#include "MagickCore/decorate.h"
@@ -571,7 +571,8 @@
msl_info->draw_info[n]=CloneDrawInfo(msl_info->image_info[n-1],
msl_info->draw_info[n-1]);
if (image == (Image *) NULL)
- msl_info->attributes[n]=AcquireImage(msl_info->image_info[n]);
+ msl_info->attributes[n]=AcquireImage(msl_info->image_info[n],
+ &image->exception);
else
msl_info->attributes[n]=CloneImage(image,0,0,MagickTrue,&image->exception);
msl_info->image[n]=(Image *) image;
@@ -860,8 +861,8 @@
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->fill,&exception);
break;
}
if (LocaleCompare(keyword,"family") == 0)
@@ -958,8 +959,8 @@
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseCommandOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
@@ -968,8 +969,8 @@
}
if (LocaleCompare(keyword, "stroke") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->stroke,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->stroke,&exception);
break;
}
if (LocaleCompare(keyword,"strokewidth") == 0)
@@ -1017,8 +1018,8 @@
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -1295,7 +1296,7 @@
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->border_color,&exception);
break;
}
@@ -1400,7 +1401,7 @@
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryColorDatabase(value,&target,
+ (void) QueryColorCompliance(value,AllCompliance,&target,
&msl_info->image[n]->exception);
break;
}
@@ -1658,7 +1659,8 @@
{
if (LocaleCompare(keyword,"bordercolor") == 0)
{
- (void) QueryMagickColor(value,&target,&exception);
+ (void) QueryMagickColorCompliance(value,AllCompliance,
+ &target,&exception);
paint_method=FillToBorderMethod;
break;
}
@@ -1671,8 +1673,8 @@
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->fill,&exception);
break;
}
if (LocaleCompare(keyword,"fuzz") == 0)
@@ -1862,7 +1864,7 @@
}
if (LocaleCompare(keyword, "color") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&composite_image->background_color,&exception);
break;
}
@@ -2480,8 +2482,8 @@
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->fill,&exception);
break;
}
if (LocaleCompare(keyword,"family") == 0)
@@ -2583,8 +2585,8 @@
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseCommandOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
@@ -2593,8 +2595,8 @@
}
if (LocaleCompare(keyword, "stroke") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->stroke,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->stroke,&exception);
break;
}
if (LocaleCompare(keyword,"strokewidth") == 0)
@@ -2642,8 +2644,8 @@
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -3070,7 +3072,7 @@
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->matte_color,&exception);
break;
}
@@ -3694,7 +3696,8 @@
{
if (LocaleCompare(keyword,"bordercolor") == 0)
{
- (void) QueryMagickColor(value,&target,&exception);
+ (void) QueryMagickColorCompliance(value,AllCompliance,
+ &target,&exception);
paint_method=FillToBorderMethod;
break;
}
@@ -4230,8 +4233,10 @@
(const char *) tag);
break;
}
- (void) QueryMagickColor("none",&target,&exception);
- (void) QueryMagickColor("none",&fill_color,&exception);
+ (void) QueryMagickColorCompliance("none",AllCompliance,&target,
+ &exception);
+ (void) QueryMagickColorCompliance("none",AllCompliance,&fill_color,
+ &exception);
if (attributes != (const xmlChar **) NULL)
for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
{
@@ -4263,7 +4268,8 @@
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryMagickColor(value,&fill_color,&exception);
+ (void) QueryMagickColorCompliance(value,AllCompliance,
+ &fill_color,&exception);
break;
}
if (LocaleCompare(keyword,"fuzz") == 0)
@@ -4649,8 +4655,8 @@
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->fill,&exception);
break;
}
if (LocaleCompare(keyword,"family") == 0)
@@ -4747,8 +4753,8 @@
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseCommandOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
@@ -4757,8 +4763,8 @@
}
if (LocaleCompare(keyword, "stroke") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->stroke,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->stroke,&exception);
break;
}
if (LocaleCompare(keyword,"strokewidth") == 0)
@@ -4806,8 +4812,8 @@
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -6551,7 +6557,7 @@
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->background_color,&exception);
break;
}
@@ -7200,7 +7206,8 @@
PixelInfo
target;
- (void) QueryMagickColor(value,&target,&exception);
+ (void) QueryMagickColorCompliance(value,AllCompliance,&target,
+ &exception);
(void) TransparentPaintImage(msl_info->image[n],&target,
TransparentAlpha,MagickFalse,&msl_info->image[n]->exception);
break;
@@ -7699,7 +7706,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(image != (Image **) NULL);
- msl_image=AcquireImage(image_info);
+ msl_image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,msl_image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
@@ -7733,7 +7740,7 @@
"UnableToInterpretMSLImage");
*msl_info.image_info=CloneImageInfo(image_info);
*msl_info.draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
- *msl_info.attributes=AcquireImage(image_info);
+ *msl_info.attributes=AcquireImage(image_info,exception);
msl_info.group_info[0].numImages=0;
/* the first slot is used to point to the MSL file image */
*msl_info.image=msl_image;
@@ -7992,8 +7999,8 @@
{
if (LocaleCompare(keyword,"background") == 0)
{
- (void) QueryColorDatabase(value,&image_info->background_color,
- exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &image_info->background_color,exception);
break;
}
if (LocaleCompare(keyword,"bias") == 0)
@@ -8017,8 +8024,8 @@
}
if (LocaleCompare(keyword,"bordercolor") == 0)
{
- (void) QueryColorDatabase(value,&image_info->border_color,
- exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &image_info->border_color,exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -8041,7 +8048,8 @@
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,exception);
+ (void) QueryColorCompliance(value,AllCompliance,&draw_info->fill,
+ exception);
(void) SetImageOption(image_info,keyword,value);
break;
}
@@ -8091,8 +8099,8 @@
}
if (LocaleCompare(keyword,"mattecolor") == 0)
{
- (void) QueryColorDatabase(value,&image_info->matte_color,
- exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &image_info->matte_color,exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -8133,7 +8141,8 @@
}
if (LocaleCompare(keyword,"stroke") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->stroke,exception);
+ (void) QueryColorCompliance(value,AllCompliance,&draw_info->stroke,
+ exception);
(void) SetImageOption(image_info,keyword,value);
break;
}
diff --git a/coders/mtv.c b/coders/mtv.c
index 1bffc84..6a0ebe1 100644
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -133,7 +133,7 @@
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)
{
@@ -213,7 +213,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/mvg.c b/coders/mvg.c
index 1591a2e..9245a7b 100644
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -147,7 +147,7 @@
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)
{
diff --git a/coders/null.c b/coders/null.c
index b78f1a3..842d1d9 100644
--- a/coders/null.c
+++ b/coders/null.c
@@ -121,7 +121,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if (image->columns == 0)
image->columns=1;
if (image->rows == 0)
diff --git a/coders/otb.c b/coders/otb.c
index 0443396..6985426 100644
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -131,7 +131,7 @@
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)
{
diff --git a/coders/palm.c b/coders/palm.c
index b8fceb3..a9f45b9 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -309,7 +309,7 @@
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)
{
@@ -546,7 +546,7 @@
/*
Allocate next image structure. Copied from coders/pnm.c
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
(void) DestroyImageList(image);
diff --git a/coders/pattern.c b/coders/pattern.c
index 896c519..5101404 100644
--- a/coders/pattern.c
+++ b/coders/pattern.c
@@ -988,7 +988,7 @@
Tile pattern across image canvas.
*/
pattern_image=image;
- image=AcquireImage(blob_info);
+ image=AcquireImage(blob_info,exception);
image->background_color=pattern_image->background_color;
(void) SetImageBackgroundColor(image);
(void) TextureImage(image,pattern_image);
diff --git a/coders/pcd.c b/coders/pcd.c
index 4828eb3..bc6ed8e 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -529,7 +529,7 @@
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)
{
@@ -689,7 +689,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/pcl.c b/coders/pcl.c
index 914af1b..50d64a3 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -204,7 +204,7 @@
/*
Open image file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
diff --git a/coders/pcx.c b/coders/pcx.c
index 41a173d..42feec6 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -278,7 +278,7 @@
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)
{
@@ -653,7 +653,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/pdb.c b/coders/pdb.c
index 9ad4ad1..f1d9079 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -316,7 +316,7 @@
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)
{
diff --git a/coders/pdf.c b/coders/pdf.c
index 9b26488..410495d 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -377,7 +377,7 @@
/*
Open image file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
diff --git a/coders/pes.c b/coders/pes.c
index a722d72..414eec9 100644
--- a/coders/pes.c
+++ b/coders/pes.c
@@ -478,7 +478,7 @@
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)
{
diff --git a/coders/pict.c b/coders/pict.c
index 69c754e..143fca6 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -845,7 +845,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
image->depth=8;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/pix.c b/coders/pix.c
index e432819..0797845 100644
--- a/coders/pix.c
+++ b/coders/pix.c
@@ -125,7 +125,7 @@
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)
{
@@ -227,7 +227,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/png.c b/coders/png.c
index 20c1866..aa5f73b 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -3633,7 +3633,7 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadPNGImage()");
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -3834,7 +3834,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" AcquireNextImage()");
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
return((Image *) NULL);
@@ -3995,7 +3995,7 @@
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
GetImageInfo(color_image_info);
- color_image=AcquireImage(color_image_info);
+ color_image=AcquireImage(color_image_info,exception);
if (color_image == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
@@ -4020,7 +4020,7 @@
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
GetImageInfo(alpha_image_info);
- alpha_image=AcquireImage(alpha_image_info);
+ alpha_image=AcquireImage(alpha_image_info,exception);
if (alpha_image == (Image *) NULL)
{
@@ -4498,7 +4498,7 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadJNGImage()");
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -4674,7 +4674,7 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadMNGImage()");
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -4876,7 +4876,7 @@
if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/* Allocate next image structure. */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
return((Image *) NULL);
@@ -5327,7 +5327,7 @@
/* Allocate next image structure. */
if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
@@ -5881,7 +5881,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
@@ -5934,7 +5934,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
@@ -5983,7 +5983,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
@@ -6178,7 +6178,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Allocate magnified image");
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
@@ -6750,7 +6750,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
@@ -7657,27 +7657,6 @@
data[53],data[54],data[55]);
}
- else if (length == 60960)
- {
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " got a 60960-byte ICC profile (potentially sRGB)");
-
- data=GetStringInfoDatum(profile);
-
- if (data[269]=='s' && data[271]=='R' &&
- data[273]=='G' && data[275]=='B')
- {
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " It is the ICC v4 sRGB)");
- if (image->rendering_intent==UndefinedIntent)
- image->rendering_intent=PerceptualIntent;
- }
- else
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " It is not sRGB (%c%c%c%c)",
- data[269],data[271],data[273],data[275]);
-
- }
else if (length == 3052)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -7695,8 +7674,8 @@
}
else
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " It is not sRGB (%c%c%c%c)",data[336],
- data[337],data[338],data[339]);
+ " It is not sRGB (%c%c%c%c)",data[52],
+ data[53],data[54],data[55]);
}
else
diff --git a/coders/pnm.c b/coders/pnm.c
index 85eb53b..7a41a0f 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -271,7 +271,7 @@
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)
{
@@ -1275,7 +1275,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/ps.c b/coders/ps.c
index cb34224..1f08428 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -422,7 +422,7 @@
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)
{
diff --git a/coders/psd.c b/coders/psd.c
index e168e5f..3054257 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -784,7 +784,7 @@
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)
{
diff --git a/coders/pwp.c b/coders/pwp.c
index 14a9b19..0276533 100644
--- a/coders/pwp.c
+++ b/coders/pwp.c
@@ -165,7 +165,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- pwp_image=AcquireImage(image_info);
+ pwp_image=AcquireImage(image_info,exception);
image=pwp_image;
status=OpenBlob(image_info,pwp_image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/raw.c b/coders/raw.c
index e726329..1ab9087 100644
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -133,7 +133,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -252,7 +252,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/rgb.c b/coders/rgb.c
index 4782dfc..ff1c65f 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -138,7 +138,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
image->colorspace=RGBColorspace;
@@ -936,7 +936,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/rla.c b/coders/rla.c
index a9645a2..8addb70 100644
--- a/coders/rla.c
+++ b/coders/rla.c
@@ -197,7 +197,7 @@
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)
{
diff --git a/coders/rle.c b/coders/rle.c
index 5c0d5cb..e2900cd 100644
--- a/coders/rle.c
+++ b/coders/rle.c
@@ -189,7 +189,7 @@
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)
{
@@ -573,7 +573,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/scr.c b/coders/scr.c
index 9d44d92..25b8a1e 100644
--- a/coders/scr.c
+++ b/coders/scr.c
@@ -147,7 +147,7 @@
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)
{
diff --git a/coders/sct.c b/coders/sct.c
index d33c937..0f1b411 100644
--- a/coders/sct.c
+++ b/coders/sct.c
@@ -166,7 +166,7 @@
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)
{
diff --git a/coders/sfw.c b/coders/sfw.c
index 9db762b..4c2c516 100644
--- a/coders/sfw.c
+++ b/coders/sfw.c
@@ -242,7 +242,7 @@
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)
{
diff --git a/coders/sgi.c b/coders/sgi.c
index 6a67fd9..50445f7 100644
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -306,7 +306,7 @@
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)
{
@@ -685,7 +685,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/stegano.c b/coders/stegano.c
index f0c52c0..a4c4591 100644
--- a/coders/stegano.c
+++ b/coders/stegano.c
@@ -148,7 +148,7 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
one=1;
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
read_info=CloneImageInfo(image_info);
diff --git a/coders/sun.c b/coders/sun.c
index 9ad0204..b5cb539 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -279,7 +279,7 @@
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)
{
@@ -584,7 +584,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/svg.c b/coders/svg.c
index 209221b..faa3f52 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2778,7 +2778,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
diff --git a/coders/tga.c b/coders/tga.c
index c737794..2e93d8c 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -179,7 +179,7 @@
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)
{
diff --git a/coders/tiff.c b/coders/tiff.c
index 0d7e76a..8cb745e 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -319,7 +319,7 @@
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)
{
@@ -829,7 +829,7 @@
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)
{
@@ -859,7 +859,7 @@
for (i=0; i < (ssize_t) image_info->scene; i++)
{
(void) TIFFReadDirectory(tiff);
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
@@ -1652,7 +1652,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/tile.c b/coders/tile.c
index cb90f47..cd0e42b 100644
--- a/coders/tile.c
+++ b/coders/tile.c
@@ -111,7 +111,7 @@
read_info=DestroyImageInfo(read_info);
if (tile_image == (Image *) NULL)
return((Image *) NULL);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
if (*image_info->filename == '\0')
diff --git a/coders/tim.c b/coders/tim.c
index 3b9cb77..3e49e9d 100644
--- a/coders/tim.c
+++ b/coders/tim.c
@@ -149,7 +149,7 @@
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)
{
@@ -399,7 +399,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/ttf.c b/coders/ttf.c
index 0307c08..104e0ae 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -213,7 +213,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
image->columns=800;
image->rows=480;
type_info=GetTypeInfo(image_info->filename,exception);
diff --git a/coders/txt.c b/coders/txt.c
index 84c341b..1b6e2d4 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -298,7 +298,7 @@
*/
*draw_info->text='\0';
offset=2*page.y;
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
@@ -408,7 +408,7 @@
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)
{
@@ -490,7 +490,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/uyvy.c b/coders/uyvy.c
index 03724ec..f09d934 100644
--- a/coders/uyvy.c
+++ b/coders/uyvy.c
@@ -127,7 +127,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
if ((image->columns % 2) != 0)
diff --git a/coders/vicar.c b/coders/vicar.c
index ddfcb73..2e7bb74 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -187,7 +187,7 @@
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)
{
diff --git a/coders/vid.c b/coders/vid.c
index 469ee8a..f4ba630 100644
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -138,7 +138,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
filelist=(char **) AcquireMagickMemory(sizeof(*filelist));
if (filelist == (char **) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
diff --git a/coders/viff.c b/coders/viff.c
index dc8c0ec..5d2c579 100644
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -261,7 +261,7 @@
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)
{
@@ -743,7 +743,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/wbmp.c b/coders/wbmp.c
index 1a157a0..2f77d2f 100644
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -151,7 +151,7 @@
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)
{
diff --git a/coders/webp.c b/coders/webp.c
index f1d92bf..6c32ed2 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -144,7 +144,7 @@
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)
{
diff --git a/coders/wmf.c b/coders/wmf.c
index e229944..bc71bae 100644
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -150,7 +150,7 @@
/*
Read WMF image.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
diff --git a/coders/wpg.c b/coders/wpg.c
index 5fde906..b8e784b 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -962,7 +962,7 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
one=1;
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
image->depth=8;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1168,7 +1168,7 @@
}
/* Allocate next image structure. */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
image->depth=8;
if (image->next == (Image *) NULL)
goto Finish;
@@ -1345,7 +1345,7 @@
/* Allocate next image structure. */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
image->depth=8;
if (image->next == (Image *) NULL)
goto Finish;
diff --git a/coders/xbm.c b/coders/xbm.c
index ababf6a..eed9831 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -214,7 +214,7 @@
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)
{
diff --git a/coders/xc.c b/coders/xc.c
index 4e25970..eadd53d 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -121,13 +121,14 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if (image->columns == 0)
image->columns=1;
if (image->rows == 0)
image->rows=1;
(void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
- status=QueryMagickColor((char *) image_info->filename,&color,exception);
+ status=QueryMagickColorCompliance((char *) image_info->filename,AllCompliance,
+ &color,exception);
if (status == MagickFalse)
{
image=DestroyImage(image);
diff --git a/coders/xcf.c b/coders/xcf.c
index 7de9d59..2ad1663 100644
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -1005,7 +1005,7 @@
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)
{
diff --git a/coders/xpm.c b/coders/xpm.c
index bf8deb8..09ae938 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -269,7 +269,7 @@
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)
{
diff --git a/coders/xps.c b/coders/xps.c
index 0207862..274b278 100644
--- a/coders/xps.c
+++ b/coders/xps.c
@@ -157,7 +157,7 @@
/*
Open image file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
diff --git a/coders/xwd.c b/coders/xwd.c
index dfdde5f..1623e676 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -209,7 +209,7 @@
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)
{
diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index b0fa64f..9ff4db3 100644
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -144,7 +144,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
image->colorspace=YCbCrColorspace;
@@ -833,7 +833,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
diff --git a/coders/yuv.c b/coders/yuv.c
index a0dc1af..331c028 100644
--- a/coders/yuv.c
+++ b/coders/yuv.c
@@ -141,7 +141,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
quantum=image->depth <= 8 ? 1 : 2;
@@ -439,7 +439,7 @@
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);