PixelPacket target_color;
ExceptionInfo exception;
GetExceptionInfo( &exception );
- if ( QueryColorDatabase( x11color_.c_str(), &target_color, &exception ) )
+ if ( QueryColorCompliance( x11color_.c_str(), AllCompliance, &target_color, &exception ) )
{
redQuantum( target_color.red );
greenQuantum( target_color.green );
PixelInfo pen;
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- (void) QueryMagickColor(std::string(opaqueColor_).c_str(),&opaque, &exceptionInfo);
- (void) QueryMagickColor(std::string(penColor_).c_str(),&pen, &exceptionInfo);
+ (void) QueryMagickColorCompliance(std::string(opaqueColor_).c_str(),
+ AllCompliance, &opaque, &exceptionInfo);
+ (void) QueryMagickColorCompliance(std::string(penColor_).c_str(),
+ AllCompliance, &pen, &exceptionInfo);
OpaquePaintImage ( image(), &opaque, &pen, MagickFalse, &exceptionInfo );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
std::string color = color_;
PixelInfo target;
- (void) QueryMagickColor(std::string(color_).c_str(),&target,&image()->exception);
+ (void) QueryMagickColorCompliance(std::string(color_).c_str(),AllCompliance,
+ &target,&image()->exception);
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
modifyImage();
PixelInfo targetLow;
PixelInfo targetHigh;
- (void) QueryMagickColor(std::string(colorLow_).c_str(),&targetLow,
- &image()->exception);
- (void) QueryMagickColor(std::string(colorHigh_).c_str(),&targetHigh,
- &image()->exception);
+ (void) QueryMagickColorCompliance(std::string(colorLow_).c_str(),
+ AllCompliance,&targetLow,&image()->exception);
+ (void) QueryMagickColorCompliance(std::string(colorHigh_).c_str(),
+ AllCompliance,&targetHigh,&image()->exception);
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
modifyImage();
if( replacement_ )
image = replacement_;
else
- image = AcquireImage(constImageInfo());
+ {
+ ExceptionInfo exceptionInfo;
+ GetExceptionInfo( &exceptionInfo );
+ image = AcquireImage(constImageInfo(), &exceptionInfo);
+ throwException( exceptionInfo );
+ (void) DestroyExceptionInfo( &exceptionInfo );
+ }
{
Lock( &_imgRef->_mutexLock );
_mutexLock()
{
// Allocate default image
- _image = AcquireImage( _options->imageInfo() );
+ _image = AcquireImage( _options->imageInfo(), &_image->exception );
// Test for error and throw exception (like throwImageException())
throwException(_image->exception);
using MagickCore::YPbPrColorspace;
using MagickCore::YUVColorspace;
+ // Compliance types
+ using MagickCore::AllCompliance;
+
// Composition operations
using MagickCore::AtopCompositeOp;
using MagickCore::BlendCompositeOp;
using MagickCore::QuantizeImage;
using MagickCore::QuantizeInfo;
using MagickCore::QuantumInfo;
- using MagickCore::QueryColorDatabase;
- using MagickCore::QueryMagickColor;
using MagickCore::QueueAuthenticPixels;
using MagickCore::QueueCacheViewAuthenticPixels;
using MagickCore::RaiseImage;
#include "MagickCore/image.h"
extern MagickPrivate MagickBooleanType
- ColorComponentGenesis(void),
- QueryMagickColorCompliance(const char *,const ComplianceType,PixelInfo *,
- ExceptionInfo *);
+ ColorComponentGenesis(void);
extern MagickPrivate void
ColorComponentTerminus(void);
{
if (LocaleCompare((char *) keyword,"color") == 0)
{
- (void) QueryMagickColor(token,&color_info->color,exception);
+ (void) QueryMagickColorCompliance(token,AllCompliance,
+ &color_info->color,exception);
break;
}
if (LocaleCompare((char *) keyword,"compliance") == 0)
% %
% %
% %
-% Q u e r y C o l o r D a t a b a s e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% QueryColorDatabase() returns the red, green, blue, and opacity intensities
-% for a given color name.
-%
-% The format of the QueryColorDatabase method is:
-%
-% MagickBooleanType QueryColorDatabase(const char *name,PixelPacket *color,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o name: the color name (e.g. white, blue, yellow).
-%
-% o color: the red, green, blue, and opacity intensities values of the
-% named color in this structure.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickBooleanType QueryColorDatabase(const char *name,
- PixelPacket *color,ExceptionInfo *exception)
-{
- return(QueryColorCompliance(name,AllCompliance,color,exception));
-}
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% Q u e r y C o l o r n a m e %
% %
% %
%
% The format of the QueryMagickColorCompliance method is:
%
-% MagickBooleanType QueryMagickColor(const char *name,
+% MagickBooleanType QueryMagickColorCompliance(const char *name,
% const ComplianceType compliance,PixelInfo *color,
% ExceptionInfo *exception)
%
% o exception: return any errors or warnings in this structure.
%
*/
-MagickPrivate MagickBooleanType QueryMagickColorCompliance(const char *name,
+MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name,
const ComplianceType compliance,PixelInfo *color,
ExceptionInfo *exception)
{
% %
% %
% %
-% Q u e r y M a g i c k C o l o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% QueryMagickColor() returns the red, green, blue, and opacity intensities
-% for a given color name.
-%
-% The format of the QueryMagickColor method is:
-%
-% MagickBooleanType QueryMagickColor(const char *name,
-% PixelInfo *color,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o name: the color name (e.g. white, blue, yellow).
-%
-% o color: the red, green, blue, and opacity intensities values of the
-% named color in this structure.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickBooleanType QueryMagickColor(const char *name,
- PixelInfo *color,ExceptionInfo *exception)
-{
- return(QueryMagickColorCompliance(name,AllCompliance,color,exception));
-}
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% Q u e r y M a g i c k C o l o r n a m e %
% %
% %
ListColorInfo(FILE *,ExceptionInfo *),
QueryColorCompliance(const char *,const ComplianceType,PixelPacket *,
ExceptionInfo *),
- QueryColorDatabase(const char *,PixelPacket *,ExceptionInfo *),
QueryColorname(const Image *,const PixelPacket *,const ComplianceType,char *,
ExceptionInfo *),
- QueryMagickColor(const char *,PixelInfo *,ExceptionInfo *),
+ QueryMagickColorCompliance(const char *,const ComplianceType,PixelInfo *,
+ ExceptionInfo *),
QueryMagickColorname(const Image *,const PixelInfo *,const ComplianceType,
char *,ExceptionInfo *);
return((Image *) NULL);
}
(void) SetImageAlphaChannel(highlight_image,OpaqueAlphaChannel,exception);
- (void) QueryMagickColor("#f1001ecc",&highlight,exception);
+ (void) QueryMagickColorCompliance("#f1001ecc",AllCompliance,&highlight,
+ exception);
artifact=GetImageArtifact(image,"highlight-color");
if (artifact != (const char *) NULL)
- (void) QueryMagickColor(artifact,&highlight,exception);
- (void) QueryMagickColor("#ffffffcc",&lowlight,exception);
+ (void) QueryMagickColorCompliance(artifact,AllCompliance,&highlight,
+ exception);
+ (void) QueryMagickColorCompliance("#ffffffcc",AllCompliance,&lowlight,
+ exception);
artifact=GetImageArtifact(image,"lowlight-color");
if (artifact != (const char *) NULL)
- (void) QueryMagickColor(artifact,&lowlight,exception);
+ (void) QueryMagickColorCompliance(artifact,AllCompliance,&lowlight,
+ exception);
if (highlight_image->colorspace == CMYKColorspace)
{
ConvertRGBToCMYK(&highlight);
assert(pixels != (void *) NULL);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage((ImageInfo *) NULL);
+ image=AcquireImage((ImageInfo *) NULL,exception);
if (image == (Image *) NULL)
return((Image *) NULL);
if ((columns == 0) || (rows == 0))
MagickBooleanType
status;
- image=AcquireImage(read_info);
+ image=AcquireImage(read_info,exception);
(void) CopyMagickString(image->filename,read_info->filename,
MaxTextExtent);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
/*
Let our decoding delegate process the image.
*/
- image=AcquireImage(read_info);
+ image=AcquireImage(read_info,exception);
if (image == (Image *) NULL)
{
read_info=DestroyImageInfo(read_info);
}
draw_info=CloneDrawInfo(resource_info->image_info,
(DrawInfo *) NULL);
- (void) QueryColorDatabase(resource_info->pen_colors[pen_id],
- &draw_info->fill,exception);
+ (void) QueryColorCompliance(resource_info->pen_colors[pen_id],
+ AllCompliance,&draw_info->fill,exception);
(void) FloodfillPaintImage(*image,draw_info,&target,(ssize_t)
x_offset,(ssize_t) y_offset,method == FloodfillMethod ?
MagickFalse : MagickTrue,exception);
/*
Save image before transformations are applied.
*/
- cache_image=AcquireImage((ImageInfo *) NULL);
+ cache_image=AcquireImage((ImageInfo *) NULL,exception);
if (cache_image == (Image *) NULL)
break;
XSetCursorState(display,windows,MagickTrue);
exception);
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) QueryColorDatabase(color,&(*image)->background_color,
- exception);
+ (void) QueryColorCompliance(color,AllCompliance,
+ &(*image)->background_color,exception);
flags=ParseGeometry(geometry,&geometry_info);
if ((flags & SigmaValue) == 0)
geometry_info.sigma=geometry_info.rho;
exception);
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) QueryColorDatabase(color,&(*image)->border_color,
+ (void) QueryColorCompliance(color,AllCompliance,&(*image)->border_color,
exception);
(void) ParsePageGeometry(*image,geometry,&page_geometry,
exception);
exception);
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) QueryColorDatabase(color,&(*image)->matte_color,
+ (void) QueryColorCompliance(color,AllCompliance,&(*image)->matte_color,
exception);
(void) ParsePageGeometry(*image,geometry,&page_geometry,
exception);
coordinates;
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
- (void) QueryColorDatabase("#0000",&clone_info->fill,&image->exception);
+ (void) QueryColorCompliance("#0000",AllCompliance,&clone_info->fill,
+ &image->exception);
resolution.x=DefaultResolution;
resolution.y=DefaultResolution;
if (clone_info->density != (char *) NULL)
for (i=0; i < (ssize_t) polygon_info->number_edges; i++)
{
if (polygon_info->edges[i].direction != 0)
- (void) QueryColorDatabase("red",&clone_info->stroke,
+ (void) QueryColorCompliance("red",AllCompliance,&clone_info->stroke,
&image->exception);
else
- (void) QueryColorDatabase("green",&clone_info->stroke,
+ (void) QueryColorCompliance("green",AllCompliance,&clone_info->stroke,
&image->exception);
start.x=(double) (polygon_info->edges[i].bounds.x1-mid);
start.y=(double) (polygon_info->edges[i].bounds.y1-mid);
(void) DrawPrimitive(image,clone_info,primitive_info);
}
}
- (void) QueryColorDatabase("blue",&clone_info->stroke,&image->exception);
+ (void) QueryColorCompliance("blue",AllCompliance,&clone_info->stroke,
+ &image->exception);
start.x=(double) (bounds.x1-mid);
start.y=(double) (bounds.y1-mid);
end.x=(double) (bounds.x2+mid);
(void) SetImageClipMask(image,clip_mask,exception);
clip_mask=DestroyImage(clip_mask);
}
- (void) QueryColorDatabase("#00000000",&image->clip_mask->background_color,
- &image->exception);
+ (void) QueryColorCompliance("#00000000",AllCompliance,
+ &image->clip_mask->background_color,&image->exception);
image->clip_mask->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(image->clip_mask);
if (image->debug != MagickFalse)
draw_info->clip_mask);
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
(void) CloneString(&clone_info->primitive,value);
- (void) QueryColorDatabase("#ffffff",&clone_info->fill,&image->exception);
+ (void) QueryColorCompliance("#ffffff",AllCompliance,&clone_info->fill,
+ &image->exception);
clone_info->clip_mask=(char *) NULL;
status=DrawImage(image->clip_mask,clone_info,exception);
status|=NegateImage(image->clip_mask,MagickFalse,&image->exception);
graphic_context[n]->viewbox.height=image->rows;
}
token=AcquireString(primitive);
- (void) QueryColorDatabase("#000000",&start_color,&image->exception);
+ (void) QueryColorCompliance("#000000",AllCompliance,&start_color,
+ &image->exception);
if (SetImageStorageClass(image,DirectClass,&image->exception) == MagickFalse)
return(MagickFalse);
status=MagickTrue;
if (LocaleCompare("border-color",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) QueryColorDatabase(token,&graphic_context[n]->border_color,
- &image->exception);
+ (void) QueryColorCompliance(token,AllCompliance,
+ &graphic_context[n]->border_color,&image->exception);
break;
}
status=MagickFalse;
&graphic_context[n]->fill_pattern,exception);
else
{
- status=QueryColorDatabase(token,&graphic_context[n]->fill,
- &image->exception);
+ status=QueryColorCompliance(token,AllCompliance,
+ &graphic_context[n]->fill,&image->exception);
if (status == MagickFalse)
{
ImageInfo
stop_color;
GetMagickToken(q,&q,token);
- (void) QueryColorDatabase(token,&stop_color,&image->exception);
+ (void) QueryColorCompliance(token,AllCompliance,&stop_color,
+ &image->exception);
(void) GradientImage(image,LinearGradient,ReflectSpread,
&start_color,&stop_color,&image->exception);
start_color=stop_color;
&graphic_context[n]->stroke_pattern,exception);
else
{
- status=QueryColorDatabase(token,&graphic_context[n]->stroke,
- &image->exception);
+ status=QueryColorCompliance(token,AllCompliance,
+ &graphic_context[n]->stroke,&image->exception);
if (status == MagickFalse)
{
ImageInfo
if (LocaleCompare("text-undercolor",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) QueryColorDatabase(token,&graphic_context[n]->undercolor,
- &image->exception);
+ (void) QueryColorCompliance(token,AllCompliance,
+ &graphic_context[n]->undercolor,&image->exception);
break;
}
if (LocaleCompare("translate",keyword) == 0)
*pattern=DestroyImage(*pattern);
image_info=AcquireImageInfo();
image_info->size=AcquireString(geometry);
- *pattern=AcquireImage(image_info);
+ *pattern=AcquireImage(image_info,&image->exception);
image_info=DestroyImageInfo(image_info);
- (void) QueryColorDatabase("#00000000",&(*pattern)->background_color,
- &image->exception);
+ (void) QueryColorCompliance("#00000000",AllCompliance,
+ &(*pattern)->background_color,&image->exception);
(void) SetImageBackgroundColor(*pattern);
if (image->debug != MagickFalse)
(void) LogMagickEvent(DrawEvent,GetMagickModule(),
clone_info=CloneImageInfo(image_info);
GetAffineMatrix(&draw_info->affine);
exception=AcquireExceptionInfo();
- (void) QueryColorDatabase("#000F",&draw_info->fill,exception);
- (void) QueryColorDatabase("#FFF0",&draw_info->stroke,exception);
+ (void) QueryColorCompliance("#000F",AllCompliance,&draw_info->fill,
+ exception);
+ (void) QueryColorCompliance("#FFF0",AllCompliance,&draw_info->stroke,
+ exception);
draw_info->stroke_antialias=clone_info->antialias;
draw_info->stroke_width=1.0;
draw_info->alpha=OpaqueAlpha;
MagickDirectionOptions,MagickFalse,option);
option=GetImageOption(clone_info,"fill");
if (option != (const char *) NULL)
- (void) QueryColorDatabase(option,&draw_info->fill,exception);
+ (void) QueryColorCompliance(option,AllCompliance,&draw_info->fill,
+ exception);
option=GetImageOption(clone_info,"stroke");
if (option != (const char *) NULL)
- (void) QueryColorDatabase(option,&draw_info->stroke,exception);
+ (void) QueryColorCompliance(option,AllCompliance,&draw_info->stroke,
+ exception);
option=GetImageOption(clone_info,"strokewidth");
if (option != (const char *) NULL)
draw_info->stroke_width=InterpretLocaleValue(option,(char **) NULL);
option=GetImageOption(clone_info,"undercolor");
if (option != (const char *) NULL)
- (void) QueryColorDatabase(option,&draw_info->undercolor,exception);
+ (void) QueryColorCompliance(option,AllCompliance,&draw_info->undercolor,
+ exception);
option=GetImageOption(clone_info,"gravity");
if (option != (const char *) NULL)
draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
(void) SetImageProperty(thumbnail,"label",DefaultTileLabel);
if (i == (NumberTiles/2))
{
- (void) QueryColorDatabase("#dfdfdf",&thumbnail->matte_color,exception);
+ (void) QueryColorCompliance("#dfdfdf",AllCompliance,
+ &thumbnail->matte_color,exception);
AppendImageToList(&images,thumbnail);
continue;
}
p+=strlen(name);
}
else
- if (QueryMagickColor(name,&pixel,fx_info->exception) != MagickFalse)
+ if (QueryMagickColorCompliance(name,AllCompliance,&pixel,fx_info->exception) != MagickFalse)
{
(void) AddValueToSplayTree(fx_info->colors,ConstantString(name),
ClonePixelInfo(&pixel));
quantum,(ssize_t) (image->rows+3*quantum/2));
caption_image=DestroyImage(caption_image);
}
- (void) QueryColorDatabase("none",&picture_image->background_color,exception);
+ (void) QueryColorCompliance("none",AllCompliance,
+ &picture_image->background_color,exception);
(void) SetImageAlphaChannel(picture_image,OpaqueAlphaChannel,exception);
rotate_image=RotateImage(picture_image,90.0,exception);
picture_image=DestroyImage(picture_image);
(void) CompositeImage(polaroid_image,OverCompositeOp,picture_image,
(ssize_t) (-0.01*picture_image->columns/2.0),0L);
picture_image=DestroyImage(picture_image);
- (void) QueryColorDatabase("none",&polaroid_image->background_color,exception);
+ (void) QueryColorCompliance("none",AllCompliance,
+ &polaroid_image->background_color,exception);
rotate_image=RotateImage(polaroid_image,angle,exception);
polaroid_image=DestroyImage(polaroid_image);
if (rotate_image == (Image *) NULL)
border_info.height=(size_t) floor(2.0*sigma+0.5);
border_info.x=0;
border_info.y=0;
- (void) QueryColorDatabase("none",&clone_image->border_color,exception);
+ (void) QueryColorCompliance("none",AllCompliance,&clone_image->border_color,
+ exception);
border_image=BorderImage(clone_image,&border_info,image->compose,exception);
clone_image=DestroyImage(clone_image);
if (border_image == (Image *) NULL)
canvas_image=DestroyImage(canvas_image);
return((Image *) NULL);
}
- (void) QueryColorDatabase("#000000",&oval_image->background_color,exception);
+ (void) QueryColorCompliance("#000000",AllCompliance,
+ &oval_image->background_color,exception);
(void) SetImageBackgroundColor(oval_image);
draw_info=CloneDrawInfo((const ImageInfo *) NULL,(const DrawInfo *) NULL);
- (void) QueryColorDatabase("#ffffff",&draw_info->fill,exception);
- (void) QueryColorDatabase("#ffffff",&draw_info->stroke,exception);
+ (void) QueryColorCompliance("#ffffff",AllCompliance,&draw_info->fill,
+ exception);
+ (void) QueryColorCompliance("#ffffff",AllCompliance,&draw_info->stroke,
+ exception);
(void) FormatLocaleString(ellipse,MaxTextExtent,
"ellipse %g,%g,%g,%g,0.0,360.0",image->columns/2.0,
image->rows/2.0,image->columns/2.0-x,image->rows/2.0-y);
%
% The format of the AcquireImage method is:
%
-% Image *AcquireImage(const ImageInfo *image_info)
+% Image *AcquireImage(const ImageInfo *image_info,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% structure. For example, filename, compression, depth, background color,
% and others.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-MagickExport Image *AcquireImage(const ImageInfo *image_info)
+MagickExport Image *AcquireImage(const ImageInfo *image_info,
+ ExceptionInfo *exception)
{
const char
*option;
image->compose=OverCompositeOp;
image->blur=1.0;
GetExceptionInfo(&image->exception);
- (void) QueryColorDatabase(BackgroundColor,&image->background_color,
- &image->exception);
- (void) QueryColorDatabase(BorderColor,&image->border_color,&image->exception);
- (void) QueryColorDatabase(MatteColor,&image->matte_color,&image->exception);
- (void) QueryColorDatabase(TransparentColor,&image->transparent_color,
- &image->exception);
+ (void) QueryColorCompliance(BackgroundColor,AllCompliance,
+ &image->background_color,exception);
+ (void) QueryColorCompliance(BorderColor,AllCompliance,&image->border_color,
+ exception);
+ (void) QueryColorCompliance(MatteColor,AllCompliance,&image->matte_color,
+ exception);
+ (void) QueryColorCompliance(TransparentColor,AllCompliance,
+ &image->transparent_color,exception);
image->x_resolution=DefaultResolution;
image->y_resolution=DefaultResolution;
image->units=PixelsPerInchResolution;
%
% The format of the AcquireNextImage method is:
%
-% void AcquireNextImage(const ImageInfo *image_info,Image *image)
+% void AcquireNextImage(const ImageInfo *image_info,Image *image,
+% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o image: the image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-MagickExport void AcquireNextImage(const ImageInfo *image_info,Image *image)
+MagickExport void AcquireNextImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
/*
Allocate image structure.
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- image->next=AcquireImage(image_info);
+ image->next=AcquireImage(image_info,exception);
if (GetNextImageInList(image) == (Image *) NULL)
return;
(void) CopyMagickString(GetNextImageInList(image)->filename,image->filename,
if (synchronize != (const char *) NULL)
image_info->synchronize=IsMagickTrue(synchronize);
exception=AcquireExceptionInfo();
- (void) QueryColorDatabase(BackgroundColor,&image_info->background_color,
- exception);
- (void) QueryColorDatabase(BorderColor,&image_info->border_color,exception);
- (void) QueryColorDatabase(MatteColor,&image_info->matte_color,exception);
- (void) QueryColorDatabase(TransparentColor,&image_info->transparent_color,
+ (void) QueryColorCompliance(BackgroundColor,AllCompliance,
+ &image_info->background_color,exception);
+ (void) QueryColorCompliance(BorderColor,AllCompliance,
+ &image_info->border_color,exception);
+ (void) QueryColorCompliance(MatteColor,AllCompliance,&image_info->matte_color,
exception);
+ (void) QueryColorCompliance(TransparentColor,AllCompliance,
+ &image_info->transparent_color,exception);
exception=DestroyExceptionInfo(exception);
image_info->debug=IsEventLogging();
image_info->signature=MagickSignature;
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(image_info->signature == MagickSignature);
assert(background != (const PixelInfo *) NULL);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
image->columns=width;
image->rows=height;
image->colorspace=background->colorspace;
/*
Determine the image format from the first few bytes of the file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
(void) CopyMagickString(image->filename,image_info->filename,
MaxTextExtent);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
option=GetImageOption(image_info,"background");
if (option != (const char *) NULL)
- (void) QueryColorDatabase(option,&image->background_color,
+ (void) QueryColorCompliance(option,AllCompliance,&image->background_color,
&image->exception);
option=GetImageOption(image_info,"bias");
if (option != (const char *) NULL)
}
option=GetImageOption(image_info,"bordercolor");
if (option != (const char *) NULL)
- (void) QueryColorDatabase(option,&image->border_color,&image->exception);
+ (void) QueryColorCompliance(option,AllCompliance,&image->border_color,
+ &image->exception);
option=GetImageOption(image_info,"colors");
if (option != (const char *) NULL)
image->colors=StringToUnsignedLong(option);
image->iterations=StringToUnsignedLong(option);
option=GetImageOption(image_info,"mattecolor");
if (option != (const char *) NULL)
- (void) QueryColorDatabase(option,&image->matte_color,&image->exception);
+ (void) QueryColorCompliance(option,AllCompliance,&image->matte_color,
+ &image->exception);
option=GetImageOption(image_info,"orient");
if (option != (const char *) NULL)
image->orientation=(OrientationType) ParseCommandOption(
}
option=GetImageOption(image_info,"transparent-color");
if (option != (const char *) NULL)
- (void) QueryColorDatabase(option,&image->transparent_color,
+ (void) QueryColorCompliance(option,AllCompliance,&image->transparent_color,
&image->exception);
option=GetImageOption(image_info,"type");
if (option != (const char *) NULL)
*GetImageInfoFile(const ImageInfo *);
extern MagickExport Image
- *AcquireImage(const ImageInfo *),
+ *AcquireImage(const ImageInfo *,ExceptionInfo *),
*AppendImages(const Image *,const MagickBooleanType,ExceptionInfo *),
*CloneImage(const Image *,const size_t,const size_t,const MagickBooleanType,
ExceptionInfo *),
SetImageVirtualPixelMethod(const Image *,const VirtualPixelMethod);
extern MagickExport void
- AcquireNextImage(const ImageInfo *,Image *),
+ AcquireNextImage(const ImageInfo *,Image *,ExceptionInfo *),
DestroyImagePixels(Image *),
DisassociateImageStream(Image *),
GetImageException(Image *,ExceptionInfo *),
/*
Open image file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
return(NULL);
/* #undef AUTOTRACE_DELEGATE */
/* Define if coders and filters are to be built as modules. */
-/* #undef BUILD_MODULES */
+#ifndef MAGICKCORE_BUILD_MODULES
+#define MAGICKCORE_BUILD_MODULES 1
+#endif
/* Define if you have the bzip2 library */
#ifndef MAGICKCORE_BZLIB_DELEGATE
#endif
/* Define if you have FFTW library */
-/* #undef FFTW_DELEGATE */
+#ifndef MAGICKCORE_FFTW_DELEGATE
+#define MAGICKCORE_FFTW_DELEGATE 1
+#endif
/* Location of filter modules */
#ifndef MAGICKCORE_FILTER_PATH
#endif
/* Define to 1 if you have the <CL/cl.h> header file. */
-/* #undef HAVE_CL_CL_H */
+#ifndef MAGICKCORE_HAVE_CL_CL_H
+#define MAGICKCORE_HAVE_CL_CL_H 1
+#endif
/* Define to 1 if you have the <complex.h> header file. */
#ifndef MAGICKCORE_HAVE_COMPLEX_H
#endif
/* Define if you have the <lcms2.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS2_H
-#define MAGICKCORE_HAVE_LCMS2_H 1
-#endif
+/* #undef HAVE_LCMS2_H */
/* Define if you have the <lcms2/lcms2.h> header file. */
/* #undef HAVE_LCMS2_LCMS2_H */
/* Define if you have the <lcms.h> header file. */
-/* #undef HAVE_LCMS_H */
+#ifndef MAGICKCORE_HAVE_LCMS_H
+#define MAGICKCORE_HAVE_LCMS_H 1
+#endif
/* Define if you have the <lcms/lcms.h> header file. */
/* #undef HAVE_LCMS_LCMS_H */
#endif
/* Define if you have JBIG library */
-/* #undef JBIG_DELEGATE */
+#ifndef MAGICKCORE_JBIG_DELEGATE
+#define MAGICKCORE_JBIG_DELEGATE 1
+#endif
/* Define if you have JPEG version 2 "Jasper" library */
#ifndef MAGICKCORE_JP2_DELEGATE
#endif
/* Define if you have LQR library */
-/* #undef LQR_DELEGATE */
+#ifndef MAGICKCORE_LQR_DELEGATE
+#define MAGICKCORE_LQR_DELEGATE 1
+#endif
/* Define if using libltdl to support dynamically loadable modules */
#ifndef MAGICKCORE_LTDL_DELEGATE
/* Define to the system default library search path. */
#ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/opt/intel/lib/intel64:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2"
#endif
/* The archive extension */
/* #undef NO_MINUS_C_MINUS_O */
/* Define if you have OPENEXR library */
-/* #undef OPENEXR_DELEGATE */
+#ifndef MAGICKCORE_OPENEXR_DELEGATE
+#define MAGICKCORE_OPENEXR_DELEGATE 1
+#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef MAGICKCORE_PACKAGE_BUGREPORT
#endif
/* Define if you have RSVG library */
-/* #undef RSVG_DELEGATE */
+#ifndef MAGICKCORE_RSVG_DELEGATE
+#define MAGICKCORE_RSVG_DELEGATE 1
+#endif
/* Define to the type of arg 1 for `select'. */
#ifndef MAGICKCORE_SELECT_TYPE_ARG1
/* Define if you have WEBP library */
-/* #undef WEBP_DELEGATE */
+#ifndef MAGICKCORE_WEBP_DELEGATE
+#define MAGICKCORE_WEBP_DELEGATE 1
+#endif
/* Define to use the Windows GDI32 library */
/* #undef WINGDI32_DELEGATE */
/* #undef WITH_DMALLOC */
/* Define if you have WMF library */
-/* #undef WMF_DELEGATE */
+#ifndef MAGICKCORE_WMF_DELEGATE
+#define MAGICKCORE_WMF_DELEGATE 1
+#endif
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
/* #undef _MINIX */
/* Define this for the OpenCL Accelerator */
-/* #undef _OPENCL */
+#ifndef MAGICKCORE__OPENCL
+#define MAGICKCORE__OPENCL 1
+#endif
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
/*
Allocate next structure.
*/
- tile_image=AcquireImage(NULL);
- montage=AcquireImage(clone_info);
+ tile_image=AcquireImage((ImageInfo *) NULL,exception);
+ montage=AcquireImage(clone_info,exception);
montage->background_color=montage_info->background_color;
montage->scene=0;
images_per_page=(number_images-1)/(tiles_per_row*tiles_per_column)+1;
/*
Shadow image.
*/
- (void) QueryColorDatabase("#00000000",&image->background_color,
- exception);
+ (void) QueryColorCompliance("#00000000",AllCompliance,
+ &image->background_color,exception);
shadow_image=ShadowImage(image,80.0,2.0,5,5,exception);
if (shadow_image != (Image *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(clone_info,montage);
+ AcquireNextImage(clone_info,montage,exception);
if (GetNextImageInList(montage) == (Image *) NULL)
{
montage=DestroyImageList(montage);
{
if (LocaleCompare(property,"background") == 0)
{
- (void) QueryColorDatabase(value,&image->background_color,exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &image->background_color,exception);
break;
}
if (LocaleCompare(property,"bias") == 0)
%
% The format of the AcquireStreamInfo method is:
%
-% StreamInfo *AcquireStreamInfo(const ImageInfo *image_info)
+% StreamInfo *AcquireStreamInfo(const ImageInfo *image_info,
+% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o image_info: the image info.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-MagickExport StreamInfo *AcquireStreamInfo(const ImageInfo *image_info)
+MagickExport StreamInfo *AcquireStreamInfo(const ImageInfo *image_info,
+ ExceptionInfo *exception)
{
StreamInfo
*stream_info;
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
stream_info->map=ConstantString("RGB");
stream_info->storage_type=CharPixel;
- stream_info->stream=AcquireImage(image_info);
+ stream_info->stream=AcquireImage(image_info,exception);
stream_info->signature=MagickSignature;
return(stream_info);
}
WriteStream(const ImageInfo *,Image *,StreamHandler);
extern MagickExport StreamInfo
- *AcquireStreamInfo(const ImageInfo *),
+ *AcquireStreamInfo(const ImageInfo *,ExceptionInfo *),
*DestroyStreamInfo(StreamInfo *);
extern MagickExport void
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision "5446"
+#define MagickSVNRevision "exported"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 7,0,0
#define MagickLibAddendum "-0"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
-#define MagickReleaseDate "2011-09-28"
+#define MagickReleaseDate "2011-10-01"
#define MagickChangeDate "20110801"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
const MagickSizeType,void *),
XMakeImage(Display *,const XResourceInfo *,XWindowInfo *,Image *,unsigned int,
unsigned int,ExceptionInfo *),
- XQueryColorDatabase(const char *,XColor *);
+ XQueryColorCompliance(const char *,XColor *);
extern MagickPrivate void
XBestIconSize(Display *,XWindowInfo *,Image *),
/*
Initialize annotated image.
*/
- annotate_image=AcquireImage((ImageInfo *) NULL);
+ annotate_image=AcquireImage((ImageInfo *) NULL,&image->exception);
if (annotate_image == (Image *) NULL)
return(MagickFalse);
annotate_image->columns=annotate_info->width;
/*
Initialize draw image.
*/
- draw_image=AcquireImage((ImageInfo *) NULL);
+ draw_image=AcquireImage((ImageInfo *) NULL,&image->exception);
if (draw_image == (Image *) NULL)
return(MagickFalse);
draw_image->columns=draw_info->width;
/*
Allocate image structure.
*/
- composite_image=AcquireImage((ImageInfo *) NULL);
+ composite_image=AcquireImage((ImageInfo *) NULL,&image->exception);
if (composite_image == (Image *) NULL)
{
XDestroyImage(ximage);
/*
Improve image appearance with error diffusion.
*/
- affinity_image=AcquireImage((ImageInfo *) NULL);
+ affinity_image=AcquireImage((ImageInfo *) NULL,&image->exception);
if (affinity_image == (Image *) NULL)
ThrowXWindowFatalException(ResourceLimitFatalError,
"UnableToDitherImage",image->filename);
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% XQueryColorDatabase() looks up a RGB values for a color given in the target
+% XQueryColorCompliance() looks up a RGB values for a color given in the target
% string.
%
% The format of the XQueryColorDatabase method is:
%
-% MagickBooleanType XQueryColorDatabase(const char *target,XColor *color)
+% MagickBooleanType XQueryColorCompliance(const char *target,XColor *color)
%
% A description of each parameter follows:
%
% color is returned as this value.
%
*/
-MagickPrivate MagickBooleanType XQueryColorDatabase(const char *target,
+MagickPrivate MagickBooleanType XQueryColorCompliance(const char *target,
XColor *color)
{
Colormap
wand->indent_depth=0;
wand->path_operation=PathDefaultOperation;
wand->path_mode=DefaultPathMode;
- wand->image=AcquireImage((const ImageInfo *) NULL);
+ wand->image=AcquireImage((const ImageInfo *) NULL,wand->exception);
ClearMagickException(wand->exception);
wand->destroy=MagickTrue;
wand->debug=IsEventLogging();
{
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
- (void) QueryColorDatabase(value,&CurrentContext->fill,wand->exception);
+ (void) QueryColorCompliance(value,AllCompliance,&CurrentContext->fill,
+ wand->exception);
}
child=GetXMLTreeChild(xml_info,"fill-opacity");
if (child != (XMLTreeInfo *) NULL)
{
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
- (void) QueryColorDatabase(value,&CurrentContext->stroke,
+ (void) QueryColorCompliance(value,AllCompliance,&CurrentContext->stroke,
wand->exception);
}
child=GetXMLTreeChild(xml_info,"stroke-antialias");
{
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
- (void) QueryColorDatabase(value,&CurrentContext->undercolor,
- wand->exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &CurrentContext->undercolor,wand->exception);
}
child=GetXMLTreeChild(xml_info,"vector-graphics");
if (child != (XMLTreeInfo *) NULL)
wand->indent_depth=0;
wand->path_operation=PathDefaultOperation;
wand->path_mode=DefaultPathMode;
- wand->image=AcquireImage((const ImageInfo *) NULL);
wand->exception=AcquireExceptionInfo();
+ wand->image=AcquireImage((const ImageInfo *) NULL,wand->exception);
wand->destroy=MagickTrue;
wand->debug=IsEventLogging();
wand->signature=WandSignature;
if ( token[0] == '\0' ) break;
if ( isalpha((int) token[0]) || token[0] == '#' ) {
/* Color string given */
- (void) QueryMagickColor(token,&color,exception);
+ (void) QueryMagickColorCompliance(token,AllCompliance,&color,exception);
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
sparse_arguments[x++] = QuantumScale*color.red;
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
if (*option == '+')
{
- (void) QueryColorDatabase(MogrifyBorderColor,
+ (void) QueryColorCompliance(MogrifyBorderColor,AllCompliance,
&draw_info->border_color,exception);
break;
}
- (void) QueryColorDatabase(argv[i+1],&draw_info->border_color,
- exception);
+ (void) QueryColorCompliance(argv[i+1],AllCompliance,
+ &draw_info->border_color,exception);
break;
}
if (LocaleCompare("box",option+1) == 0)
{
- (void) QueryColorDatabase(argv[i+1],&draw_info->undercolor,
- exception);
+ (void) QueryColorCompliance(argv[i+1],AllCompliance,
+ &draw_info->undercolor,exception);
break;
}
if (LocaleCompare("brightness-contrast",option+1) == 0)
GetPixelInfo(*image,&fill);
if (*option == '+')
{
- (void) QueryMagickColor("none",&fill,exception);
- (void) QueryColorDatabase("none",&draw_info->fill,exception);
+ (void) QueryMagickColorCompliance("none",AllCompliance,&fill,
+ exception);
+ (void) QueryColorCompliance("none",AllCompliance,
+ &draw_info->fill,exception);
if (draw_info->fill_pattern != (Image *) NULL)
draw_info->fill_pattern=DestroyImage(draw_info->fill_pattern);
break;
}
sans=AcquireExceptionInfo();
- (void) QueryMagickColor(argv[i+1],&fill,sans);
- status=QueryColorDatabase(argv[i+1],&draw_info->fill,sans);
+ (void) QueryMagickColorCompliance(argv[i+1],AllCompliance,&fill,
+ sans);
+ status=QueryColorCompliance(argv[i+1],AllCompliance,
+ &draw_info->fill,sans);
sans=DestroyExceptionInfo(sans);
if (status == MagickFalse)
draw_info->fill_pattern=GetImageCache(mogrify_info,argv[i+1],
*/
(void) SyncImageSettings(mogrify_info,*image);
(void) ParsePageGeometry(*image,argv[i+1],&geometry,exception);
- (void) QueryMagickColor(argv[i+2],&target,exception);
+ (void) QueryMagickColorCompliance(argv[i+2],AllCompliance,&target,
+ exception);
(void) FloodfillPaintImage(*image,draw_info,&target,geometry.x,
geometry.y,*option == '-' ? MagickFalse : MagickTrue,exception);
break;
p=(const char *) argv[i+1];
GetMagickToken(p,&p,token); /* get black point color */
if ((isalpha((int) *token) != 0) || ((*token == '#') != 0))
- (void) QueryMagickColor(token,&black_point,exception);
+ (void) QueryMagickColorCompliance(token,AllCompliance,
+ &black_point,exception);
else
- (void) QueryMagickColor("#000000",&black_point,exception);
+ (void) QueryMagickColorCompliance("#000000",AllCompliance,
+ &black_point,exception);
if (isalpha((int) token[0]) || (token[0] == '#'))
GetMagickToken(p,&p,token);
if (*token == '\0')
if ((isalpha((int) *token) == 0) && ((*token == '#') == 0))
GetMagickToken(p,&p,token); /* Get white point color. */
if ((isalpha((int) *token) != 0) || ((*token == '#') != 0))
- (void) QueryMagickColor(token,&white_point,exception);
+ (void) QueryMagickColorCompliance(token,AllCompliance,
+ &white_point,exception);
else
- (void) QueryMagickColor("#ffffff",&white_point,exception);
+ (void) QueryMagickColorCompliance("#ffffff",AllCompliance,
+ &white_point,exception);
}
(void) LevelImageColors(*image,&black_point,&white_point,
*option == '+' ? MagickTrue : MagickFalse,exception);
target;
(void) SyncImageSettings(mogrify_info,*image);
- (void) QueryMagickColor(argv[i+1],&target,exception);
+ (void) QueryMagickColorCompliance(argv[i+1],AllCompliance,&target,
+ exception);
(void) OpaquePaintImage(*image,&target,&fill,*option == '-' ?
MagickFalse : MagickTrue,exception);
break;
{
if (*option == '+')
{
- (void) QueryColorDatabase("none",&draw_info->fill,exception);
+ (void) QueryColorCompliance("none",AllCompliance,
+ &draw_info->fill,exception);
break;
}
- (void) QueryColorDatabase(argv[i+1],&draw_info->fill,exception);
+ (void) QueryColorCompliance(argv[i+1],AllCompliance,
+ &draw_info->fill,exception);
break;
}
if (LocaleCompare("pointsize",option+1) == 0)
if (*option == '+')
{
- (void) QueryColorDatabase("none",&draw_info->stroke,exception);
+ (void) QueryColorCompliance("none",AllCompliance,
+ &draw_info->stroke,exception);
if (draw_info->stroke_pattern != (Image *) NULL)
draw_info->stroke_pattern=DestroyImage(
draw_info->stroke_pattern);
break;
}
sans=AcquireExceptionInfo();
- status=QueryColorDatabase(argv[i+1],&draw_info->stroke,sans);
+ status=QueryColorCompliance(argv[i+1],AllCompliance,
+ &draw_info->stroke,sans);
sans=DestroyExceptionInfo(sans);
if (status == MagickFalse)
draw_info->stroke_pattern=GetImageCache(mogrify_info,argv[i+1],
target;
(void) SyncImageSettings(mogrify_info,*image);
- (void) QueryMagickColor(argv[i+1],&target,exception);
+ (void) QueryMagickColorCompliance(argv[i+1],AllCompliance,&target,
+ exception);
(void) TransparentPaintImage(*image,&target,(Quantum)
TransparentAlpha,*option == '-' ? MagickFalse : MagickTrue,
&(*image)->exception);
{
if (LocaleCompare("undercolor",option+1) == 0)
{
- (void) QueryColorDatabase(argv[i+1],&draw_info->undercolor,
- exception);
+ (void) QueryColorCompliance(argv[i+1],AllCompliance,
+ &draw_info->undercolor,exception);
break;
}
if (LocaleCompare("unique",option+1) == 0)
if (*option == '+')
{
(void) DeleteImageOption(image_info,option+1);
- (void) QueryColorDatabase(MogrifyBackgroundColor,
- &image_info->background_color,exception);
+ (void) QueryColorCompliance(MogrifyBackgroundColor,
+ AllCompliance,&image_info->background_color,exception);
break;
}
(void) SetImageOption(image_info,option+1,argv[i+1]);
- (void) QueryColorDatabase(argv[i+1],&image_info->background_color,
- exception);
+ (void) QueryColorCompliance(argv[i+1],AllCompliance,
+ &image_info->background_color,exception);
break;
}
if (LocaleCompare("bias",option+1) == 0)
if (*option == '+')
{
(void) DeleteImageOption(image_info,option+1);
- (void) QueryColorDatabase(MogrifyBorderColor,
+ (void) QueryColorCompliance(MogrifyBorderColor,AllCompliance,
&image_info->border_color,exception);
break;
}
- (void) QueryColorDatabase(argv[i+1],&image_info->border_color,
- exception);
+ (void) QueryColorCompliance(argv[i+1],AllCompliance,
+ &image_info->border_color,exception);
(void) SetImageOption(image_info,option+1,argv[i+1]);
break;
}
if (*option == '+')
{
(void) SetImageOption(image_info,option+1,argv[i+1]);
- (void) QueryColorDatabase(MogrifyMatteColor,
+ (void) QueryColorCompliance(MogrifyMatteColor,AllCompliance,
&image_info->matte_color,exception);
break;
}
(void) SetImageOption(image_info,option+1,argv[i+1]);
- (void) QueryColorDatabase(argv[i+1],&image_info->matte_color,
- exception);
+ (void) QueryColorCompliance(argv[i+1],AllCompliance,
+ &image_info->matte_color,exception);
break;
}
if (LocaleCompare("monitor",option+1) == 0)
{
if (*option == '+')
{
- (void) QueryColorDatabase("none",&image_info->transparent_color, exception);
+ (void) QueryColorCompliance("none",AllCompliance,
+ &image_info->transparent_color,exception);
(void) SetImageOption(image_info,option+1,"none");
break;
}
- (void) QueryColorDatabase(argv[i+1],&image_info->transparent_color,
- exception);
+ (void) QueryColorCompliance(argv[i+1],AllCompliance,
+ &image_info->transparent_color,exception);
(void) SetImageOption(image_info,option+1,argv[i+1]);
break;
}
i++;
if (i == (ssize_t) argc)
ThrowMontageException(OptionError,"MissingArgument",option);
- (void) QueryColorDatabase(argv[i],
+ (void) QueryColorCompliance(argv[i],AllCompliance,
&montage_info->background_color,exception);
break;
}
i++;
if (i == (ssize_t) argc)
ThrowMontageException(OptionError,"MissingArgument",option);
- (void) QueryColorDatabase(argv[i],&montage_info->border_color,
- exception);
+ (void) QueryColorCompliance(argv[i],AllCompliance,
+ &montage_info->border_color,exception);
break;
}
if (LocaleCompare("borderwidth",option+1) == 0)
{
if (LocaleCompare("fill",option+1) == 0)
{
- (void) QueryColorDatabase("none",&montage_info->fill,exception);
+ (void) QueryColorCompliance("none",AllCompliance,
+ &montage_info->fill,exception);
if (*option == '+')
break;
i++;
if (i == (ssize_t) argc)
ThrowMontageException(OptionError,"MissingArgument",option);
- (void) QueryColorDatabase(argv[i],&montage_info->fill,
- exception);
+ (void) QueryColorCompliance(argv[i],AllCompliance,
+ &montage_info->fill,exception);
break;
}
if (LocaleCompare("filter",option+1) == 0)
i++;
if (i == (ssize_t) argc)
ThrowMontageException(OptionError,"MissingArgument",option);
- (void) QueryColorDatabase(argv[i],&montage_info->matte_color,
- exception);
+ (void) QueryColorCompliance(argv[i],AllCompliance,
+ &montage_info->matte_color,exception);
break;
}
if (LocaleCompare("mode",option+1) == 0)
}
if (LocaleCompare("stroke",option+1) == 0)
{
- (void) QueryColorDatabase("none",&montage_info->stroke,exception);
+ (void) QueryColorCompliance("none",AllCompliance,
+ &montage_info->stroke,exception);
if (*option == '+')
break;
i++;
if (i == (ssize_t) argc)
ThrowMontageException(OptionError,"MissingArgument",option);
- (void) QueryColorDatabase(argv[i],&montage_info->stroke,
- exception);
+ (void) QueryColorCompliance(argv[i],AllCompliance,
+ &montage_info->stroke,exception);
break;
}
if (LocaleCompare("strip",option+1) == 0)
if ( token[0] == '\0' ) break;
if ( isalpha((int) token[0]) || token[0] == '#' ) {
/* Color string given */
- (void) QueryMagickColor(token,&color,exception);
+ (void) QueryMagickColorCompliance(token,&color,exception);
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
sparse_arguments[x++] = QuantumScale*color.red;
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
if (*argv[0] == '+')
{
(void) DeleteImageOption(image_info,argv[0]+1);
- (void) QueryColorDatabase(BackgroundColor,
+ (void) QueryColorCompliance(BackgroundColor,
&image_info->background_color,exception);
break;
}
(void) SetImageOption(image_info,argv[0]+1,argv[1]);
- (void) QueryColorDatabase(argv[1],&image_info->background_color,
+ (void) QueryColorCompliance(argv[1],&image_info->background_color,
exception);
break;
}
if (*argv[0] == '+')
{
(void) DeleteImageOption(image_info,argv[0]+1);
- (void) QueryColorDatabase(BorderColor,&image_info->border_color,
+ (void) QueryColorCompliance(BorderColor,&image_info->border_color,
exception);
break;
}
- (void) QueryColorDatabase(argv[1],&image_info->border_color,
+ (void) QueryColorCompliance(argv[1],&image_info->border_color,
exception);
(void) SetImageOption(image_info,argv[0]+1,argv[1]);
break;
if (*argv[0] == '+')
{
(void) SetImageOption(image_info,argv[0]+1,argv[1]);
- (void) QueryColorDatabase(MatteColor,&image_info->matte_color,
+ (void) QueryColorCompliance(MatteColor,&image_info->matte_color,
exception);
break;
}
(void) SetImageOption(image_info,argv[0]+1,argv[1]);
- (void) QueryColorDatabase(argv[1],&image_info->matte_color,
+ (void) QueryColorCompliance(argv[1],&image_info->matte_color,
exception);
break;
}
{
if (*argv[0] == '+')
{
- (void) QueryColorDatabase("none",&image_info->transparent_color, exception);
+ (void) QueryColorCompliance("none",&image_info->transparent_color, exception);
(void) SetImageOption(image_info,argv[0]+1,"none");
break;
}
- (void) QueryColorDatabase(argv[1],&image_info->transparent_color,
+ (void) QueryColorCompliance(argv[1],&image_info->transparent_color,
exception);
(void) SetImageOption(image_info,argv[0]+1,argv[1]);
break;
{
if (*argv[0] == '+')
{
- (void) QueryColorDatabase(BorderColor,&draw_info->border_color,
+ (void) QueryColorCompliance(BorderColor,&draw_info->border_color,
exception);
break;
}
- (void) QueryColorDatabase(argv[1],&draw_info->border_color,
+ (void) QueryColorCompliance(argv[1],&draw_info->border_color,
exception);
break;
}
if (LocaleCompare("box",argv[0]+1) == 0)
{
- (void) QueryColorDatabase(argv[1],&draw_info->undercolor,
+ (void) QueryColorCompliance(argv[1],&draw_info->undercolor,
exception);
break;
}
GetPixelInfo(*image,&fill);
if (*argv[0] == '+')
{
- (void) QueryMagickColor("none",&fill,exception);
- (void) QueryColorDatabase("none",&draw_info->fill,exception);
+ (void) QueryMagickColorCompliance("none",&fill,exception);
+ (void) QueryColorCompliance("none",&draw_info->fill,exception);
if (draw_info->fill_pattern != (Image *) NULL)
draw_info->fill_pattern=DestroyImage(draw_info->fill_pattern);
break;
}
sans=AcquireExceptionInfo();
- (void) QueryMagickColor(argv[1],&fill,sans);
- status=QueryColorDatabase(argv[1],&draw_info->fill,sans);
+ (void) QueryMagickColorCompliance(argv[1],&fill,sans);
+ status=QueryColorCompliance(argv[1],&draw_info->fill,sans);
sans=DestroyExceptionInfo(sans);
if (status == MagickFalse)
draw_info->fill_pattern=GetImageCache(image_info,argv[1],
*/
(void) SyncImageSettings(image_info,*image);
(void) ParsePageGeometry(*image,argv[1],&geometry,exception);
- (void) QueryMagickColor(argv[2],&target,exception);
+ (void) QueryMagickColorCompliance(argv[2],&target,exception);
(void) FloodfillPaintImage(*image,draw_info,&target,geometry.x,
geometry.y,*argv[0] == '-' ? MagickFalse : MagickTrue,exception);
break;
p=(const char *) argv[1];
GetMagickToken(p,&p,token); /* get black point color */
if ((isalpha((int) *token) != 0) || ((*token == '#') != 0))
- (void) QueryMagickColor(token,&black_point,exception);
+ (void) QueryMagickColorCompliance(token,&black_point,exception);
else
- (void) QueryMagickColor("#000000",&black_point,exception);
+ (void) QueryMagickColorCompliance("#000000",&black_point,exception);
if (isalpha((int) token[0]) || (token[0] == '#'))
GetMagickToken(p,&p,token);
if (*token == '\0')
if ((isalpha((int) *token) == 0) && ((*token == '#') == 0))
GetMagickToken(p,&p,token); /* Get white point color. */
if ((isalpha((int) *token) != 0) || ((*token == '#') != 0))
- (void) QueryMagickColor(token,&white_point,exception);
+ (void) QueryMagickColorCompliance(token,&white_point,exception);
else
- (void) QueryMagickColor("#ffffff",&white_point,exception);
+ (void) QueryMagickColorCompliance("#ffffff",&white_point,exception);
}
(void) LevelImageColors(*image,&black_point,&white_point,
*argv[0] == '+' ? MagickTrue : MagickFalse,exception);
target;
(void) SyncImageSettings(image_info,*image);
- (void) QueryMagickColor(argv[1],&target,exception);
+ (void) QueryMagickColorCompliance(argv[1],&target,exception);
(void) OpaquePaintImage(*image,&target,&fill,*argv[0] == '-' ?
MagickFalse : MagickTrue,exception);
break;
{
if (*argv[0] == '+')
{
- (void) QueryColorDatabase("none",&draw_info->fill,exception);
+ (void) QueryColorCompliance("none",&draw_info->fill,exception);
break;
}
- (void) QueryColorDatabase(argv[1],&draw_info->fill,exception);
+ (void) QueryColorCompliance(argv[1],&draw_info->fill,exception);
break;
}
if (LocaleCompare("pointsize",argv[0]+1) == 0)
if (*argv[0] == '+')
{
- (void) QueryColorDatabase("none",&draw_info->stroke,exception);
+ (void) QueryColorCompliance("none",&draw_info->stroke,exception);
if (draw_info->stroke_pattern != (Image *) NULL)
draw_info->stroke_pattern=DestroyImage(
draw_info->stroke_pattern);
break;
}
sans=AcquireExceptionInfo();
- status=QueryColorDatabase(argv[1],&draw_info->stroke,sans);
+ status=QueryColorCompliance(argv[1],&draw_info->stroke,sans);
sans=DestroyExceptionInfo(sans);
if (status == MagickFalse)
draw_info->stroke_pattern=GetImageCache(image_info,argv[1],
target;
(void) SyncImageSettings(image_info,*image);
- (void) QueryMagickColor(argv[1],&target,exception);
+ (void) QueryMagickColorCompliance(argv[1],&target,exception);
(void) TransparentPaintImage(*image,&target,(Quantum)
TransparentAlpha,*argv[0] == '-' ? MagickFalse : MagickTrue,
&(*image)->exception);
{
if (LocaleCompare("undercolor",argv[0]+1) == 0)
{
- (void) QueryColorDatabase(argv[1],&draw_info->undercolor,
+ (void) QueryColorCompliance(argv[1],&draw_info->undercolor,
exception);
break;
}
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- status=QueryMagickColor(color,&pixel,wand->exception);
+ status=QueryMagickColorCompliance(color,AllCompliance,&pixel,wand->exception);
if (status != MagickFalse)
wand->pixel=pixel;
return(status);
option=(char *) NULL;
pend=MagickFalse;
respect_parenthesis=MagickFalse;
- stream_info=AcquireStreamInfo(image_info);
+ stream_info=AcquireStreamInfo(image_info,exception);
status=MagickTrue;
/*
Stream an image.
{
if (LocaleCompare(attribute,"background") == 0)
{
- (void) QueryColorDatabase(SvPV(sval,na),&target_color,exception);
+ (void) QueryColorCompliance(SvPV(sval,na),AllCompliance,&target_color,
+ exception);
if (info)
info->image_info->background_color=target_color;
for ( ; image; image=image->next)
}
if (LocaleCompare(attribute,"bordercolor") == 0)
{
- (void) QueryColorDatabase(SvPV(sval,na),&target_color,exception);
+ (void) QueryColorCompliance(SvPV(sval,na),AllCompliance,&target_color,
+ exception);
if (info)
info->image_info->border_color=target_color;
for ( ; image; image=image->next)
i%=image->colors;
if ((strchr(SvPV(sval,na),',') == 0) ||
(strchr(SvPV(sval,na),')') != 0))
- QueryColorDatabase(SvPV(sval,na),image->colormap+i,exception);
+ QueryColorCompliance(SvPV(sval,na),AllCompliance,
+ image->colormap+i,exception);
else
{
color=image->colormap+i;
}
if (LocaleCompare(attribute,"mattecolor") == 0)
{
- (void) QueryColorDatabase(SvPV(sval,na),&target_color,exception);
+ (void) QueryColorCompliance(SvPV(sval,na),AllCompliance,&target_color,
+ exception);
if (info)
info->image_info->matte_color=target_color;
for ( ; image; image=image->next)
{
if ((strchr(SvPV(sval,na),',') == 0) ||
(strchr(SvPV(sval,na),')') != 0))
- QueryMagickColor(SvPV(sval,na),&pixel,exception);
+ QueryMagickColorCompliance(SvPV(sval,na),AllCompliance,
+ &pixel,exception);
else
{
GetPixelInfo(image,&pixel);
}
if (LocaleCompare(attribute,"transparent-color") == 0)
{
- (void) QueryColorDatabase(SvPV(sval,na),&target_color,exception);
+ (void) QueryColorCompliance(SvPV(sval,na),AllCompliance,&target_color,
+ exception);
if (info)
info->image_info->transparent_color=target_color;
for ( ; image; image=image->next)
}
background_color=image->background_color;
if (items == 2)
- (void) QueryColorDatabase((char *) SvPV(ST(1),na),&background_color,
- exception);
+ (void) QueryColorCompliance((char *) SvPV(ST(1),na),AllCompliance,
+ &background_color,exception);
else
for (i=2; i < items; i+=2)
{
{
if (LocaleCompare(attribute,"background") == 0)
{
- (void) QueryColorDatabase((char *) SvPV(ST(1),na),
- &background_color,exception);
+ (void) QueryColorCompliance((char *) SvPV(ST(1),na),
+ AllCompliance,&background_color,exception);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
(void) GetOneVirtualPixel(image,0,0,&target,exception);
if (attribute_flag[0] != 0)
- (void) QueryColorDatabase(argument_list[0].string_reference,&target,
- exception);
+ (void) QueryColorCompliance(argument_list[0].string_reference,
+ AllCompliance,&target,exception);
if (attribute_flag[1] == 0)
argument_list[1].string_reference="100%";
image=ColorizeImage(image,argument_list[1].string_reference,target,
if (attribute_flag[2] != 0)
geometry.height=argument_list[2].integer_reference;
if (attribute_flag[3] != 0)
- QueryColorDatabase(argument_list[3].string_reference,
- &image->border_color,exception);
+ QueryColorCompliance(argument_list[3].string_reference,
+ AllCompliance,&image->border_color,exception);
if (attribute_flag[4] != 0)
- QueryColorDatabase(argument_list[4].string_reference,
- &image->border_color,exception);
+ QueryColorCompliance(argument_list[4].string_reference,
+ AllCompliance,&image->border_color,exception);
if (attribute_flag[5] != 0)
- QueryColorDatabase(argument_list[5].string_reference,
- &image->border_color,exception);
+ QueryColorCompliance(argument_list[5].string_reference,
+ AllCompliance,&image->border_color,exception);
compose=image->compose;
if (attribute_flag[6] != 0)
compose=(CompositeOperator) argument_list[6].integer_reference;
if (attribute_flag[4] != 0)
frame_info.outer_bevel=argument_list[4].integer_reference;
if (attribute_flag[5] != 0)
- QueryColorDatabase(argument_list[5].string_reference,&fill_color,
- exception);
+ QueryColorCompliance(argument_list[5].string_reference,
+ AllCompliance,&fill_color,exception);
if (attribute_flag[6] != 0)
- QueryColorDatabase(argument_list[6].string_reference,&fill_color,
- exception);
+ QueryColorCompliance(argument_list[6].string_reference,
+ AllCompliance,&fill_color,exception);
frame_info.x=(ssize_t) frame_info.width;
frame_info.y=(ssize_t) frame_info.height;
frame_info.width=image->columns+2*frame_info.x;
if (attribute_flag[0] == 0)
argument_list[0].real_reference=90.0;
if (attribute_flag[1] != 0)
- QueryColorDatabase(argument_list[1].string_reference,
- &image->background_color,exception);
+ QueryColorCompliance(argument_list[1].string_reference,
+ AllCompliance,&image->background_color,exception);
if (attribute_flag[2] != 0)
- QueryColorDatabase(argument_list[2].string_reference,
- &image->background_color,exception);
+ QueryColorCompliance(argument_list[2].string_reference,
+ AllCompliance,&image->background_color,exception);
if (attribute_flag[3] != 0)
- QueryColorDatabase(argument_list[3].string_reference,
- &image->background_color,exception);
+ QueryColorCompliance(argument_list[3].string_reference,
+ AllCompliance,&image->background_color,exception);
image=RotateImage(image,argument_list[0].real_reference,exception);
break;
}
if (attribute_flag[2] != 0)
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
- QueryColorDatabase(argument_list[3].string_reference,
- &image->background_color,exception);
+ QueryColorCompliance(argument_list[3].string_reference,
+ AllCompliance,&image->background_color,exception);
if (attribute_flag[4] != 0)
- QueryColorDatabase(argument_list[4].string_reference,
- &image->background_color,exception);
+ QueryColorCompliance(argument_list[4].string_reference,
+ AllCompliance,&image->background_color,exception);
image=ShearImage(image,geometry_info.rho,geometry_info.sigma,
exception);
break;
(void) CloneString(&draw_info->density,
argument_list[3].string_reference);
if (attribute_flag[4] != 0)
- (void) QueryColorDatabase(argument_list[4].string_reference,
- &draw_info->undercolor,exception);
+ (void) QueryColorCompliance(argument_list[4].string_reference,
+ AllCompliance,&draw_info->undercolor,exception);
if (attribute_flag[5] != 0)
{
- (void) QueryColorDatabase(argument_list[5].string_reference,
- &draw_info->stroke,exception);
+ (void) QueryColorCompliance(argument_list[5].string_reference,
+ AllCompliance,&draw_info->stroke,exception);
if (argument_list[5].image_reference != (Image *) NULL)
draw_info->stroke_pattern=CloneImage(
argument_list[5].image_reference,0,0,MagickTrue,exception);
}
if (attribute_flag[6] != 0)
{
- (void) QueryColorDatabase(argument_list[6].string_reference,
- &draw_info->fill,exception);
+ (void) QueryColorCompliance(argument_list[6].string_reference,
+ AllCompliance,&draw_info->fill,exception);
if (argument_list[6].image_reference != (Image *) NULL)
draw_info->fill_pattern=CloneImage(
argument_list[6].image_reference,0,0,MagickTrue,exception);
geometry_info.sigma=geometry_info.xi;
}
if (attribute_flag[8] != 0)
- (void) QueryColorDatabase(argument_list[8].string_reference,
- &draw_info->fill,exception);
+ (void) QueryColorCompliance(argument_list[8].string_reference,
+ AllCompliance,&draw_info->fill,exception);
if (attribute_flag[11] != 0)
- draw_info->gravity=(GravityType) argument_list[11].integer_reference;
+ draw_info->gravity=(GravityType)
+ argument_list[11].integer_reference;
if (attribute_flag[25] != 0)
{
AV
if (attribute_flag[2] != 0)
geometry.y=argument_list[2].integer_reference;
if (attribute_flag[3] != 0)
- (void) QueryColorDatabase(argument_list[3].string_reference,
- &draw_info->fill,exception);
+ (void) QueryColorCompliance(argument_list[3].string_reference,
+ AllCompliance,&draw_info->fill,exception);
(void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y,&target,
exception);
invert=MagickFalse;
if (attribute_flag[4] != 0)
{
- QueryMagickColor(argument_list[4].string_reference,&target,
- exception);
+ QueryMagickColorCompliance(argument_list[4].string_reference,
+ AllCompliance,&target,exception);
invert=MagickTrue;
}
if (attribute_flag[5] != 0)
for (x=0; x < (ssize_t) composite_image->columns; x++)
{
if (GetPixelAlpha(image,q) == OpaqueAlpha)
- SetPixelAlpha(composite_image,ClampToQuantum(opacity),q);
+ SetPixelAlpha(composite_image,ClampToQuantum(opacity),
+ q);
q+=GetPixelChannels(composite_image);
}
sync=SyncCacheViewAuthenticPixels(composite_view,exception);
}
}
if (attribute_flag[9] != 0) /* "color=>" */
- QueryColorDatabase(argument_list[9].string_reference,
- &composite_image->background_color,exception);
+ QueryColorCompliance(argument_list[9].string_reference,
+ AllCompliance,&composite_image->background_color,exception);
if (attribute_flag[12] != 0) /* "interpolate=>" */
image->interpolate=(PixelInterpolateMethod)
argument_list[12].integer_reference;
}
if (attribute_flag[3] != 0)
{
- (void) QueryColorDatabase(argument_list[3].string_reference,
- &draw_info->stroke,exception);
+ (void) QueryColorCompliance(argument_list[3].string_reference,
+ AllCompliance,&draw_info->stroke,exception);
if (argument_list[3].image_reference != (Image *) NULL)
draw_info->stroke_pattern=CloneImage(
argument_list[3].image_reference,0,0,MagickTrue,exception);
}
if (attribute_flag[4] != 0)
{
- (void) QueryColorDatabase(argument_list[4].string_reference,
- &draw_info->fill,exception);
+ (void) QueryColorCompliance(argument_list[4].string_reference,
+ AllCompliance,&draw_info->fill,exception);
if (argument_list[4].image_reference != (Image *) NULL)
draw_info->fill_pattern=CloneImage(
argument_list[4].image_reference,0,0,MagickTrue,exception);
(void) CloneString(&draw_info->font,
argument_list[6].string_reference);
if (attribute_flag[7] != 0)
- (void) QueryColorDatabase(argument_list[7].string_reference,
- &draw_info->border_color,exception);
+ (void) QueryColorCompliance(argument_list[7].string_reference,
+ AllCompliance,&draw_info->border_color,exception);
if (attribute_flag[8] != 0)
draw_info->affine.tx=argument_list[8].real_reference;
if (attribute_flag[9] != 0)
(void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y,&target,
exception);
if (attribute_flag[4] != 0)
- QueryMagickColor(argument_list[4].string_reference,&target,
- exception);
+ QueryMagickColorCompliance(argument_list[4].string_reference,
+ AllCompliance,&target,exception);
if (attribute_flag[3] != 0)
target.alpha=SiPrefixToDouble(argument_list[3].string_reference,
QuantumRange);
fill_color,
target;
- (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 (attribute_flag[0] != 0)
- (void) QueryMagickColor(argument_list[0].string_reference,
- &target,exception);
+ (void) QueryMagickColorCompliance(argument_list[0].string_reference,
+ AllCompliance,&target,exception);
if (attribute_flag[1] != 0)
- (void) QueryMagickColor(argument_list[1].string_reference,
- &fill_color,exception);
+ (void) QueryMagickColorCompliance(argument_list[1].string_reference,
+ AllCompliance,&fill_color,exception);
if (attribute_flag[2] != 0)
image->fuzz=SiPrefixToDouble(argument_list[2].string_reference,
QuantumRange);
MagickTrue : MagickFalse;
if (attribute_flag[4] != 0)
quantize_info->measure_error=
- argument_list[4].integer_reference != 0 ? MagickTrue : MagickFalse;
+ argument_list[4].integer_reference != 0 ? MagickTrue :
+ MagickFalse;
if (attribute_flag[5] != 0)
- (void) QueryColorDatabase(argument_list[5].string_reference,
- &image->transparent_color,exception);
+ (void) QueryColorCompliance(argument_list[5].string_reference,
+ AllCompliance,&image->transparent_color,exception);
if (attribute_flag[5] && argument_list[5].integer_reference)
{
(void) QuantizeImages(quantize_info,image,exception);
PixelInfo
target;
- (void) QueryMagickColor("none",&target,exception);
+ (void) QueryMagickColorCompliance("none",AllCompliance,&target,
+ exception);
if (attribute_flag[0] != 0)
- (void) QueryMagickColor(argument_list[0].string_reference,&target,
- exception);
+ (void) QueryMagickColorCompliance(argument_list[0].string_reference,
+ AllCompliance,&target,exception);
opacity=TransparentAlpha;
if (attribute_flag[1] != 0)
opacity=SiPrefixToDouble(argument_list[1].string_reference,
image->interpolate=(PixelInterpolateMethod)
argument_list[6].integer_reference;
if (attribute_flag[7] != 0)
- QueryColorDatabase(argument_list[7].string_reference,
- &image->background_color,exception);
+ QueryColorCompliance(argument_list[7].string_reference,
+ AllCompliance,&image->background_color,exception);
image=AffineTransformImage(image,&draw_info->affine,exception);
draw_info=DestroyDrawInfo(draw_info);
break;
GetPixelInfo(image,&tint);
if (attribute_flag[0] != 0)
- (void) QueryMagickColor(argument_list[0].string_reference,&tint,
- exception);
+ (void) QueryMagickColorCompliance(argument_list[0].string_reference,
+ AllCompliance,&tint,exception);
if (attribute_flag[1] == 0)
argument_list[1].string_reference="100";
image=TintImage(image,argument_list[1].string_reference,&tint,
image->fuzz=SiPrefixToDouble(argument_list[5].string_reference,
QuantumRange);
if (attribute_flag[6] != 0)
- (void) QueryColorDatabase(argument_list[6].string_reference,
- &image->background_color,exception);
+ (void) QueryColorCompliance(argument_list[6].string_reference,
+ AllCompliance,&image->background_color,exception);
if (attribute_flag[7] != 0)
image->gravity=(GravityType) argument_list[7].integer_reference;
image=SpliceImage(image,&geometry,exception);
image->fuzz=SiPrefixToDouble(argument_list[5].string_reference,
QuantumRange);
if (attribute_flag[6] != 0)
- (void) QueryColorDatabase(argument_list[6].string_reference,
- &image->background_color,exception);
+ (void) QueryColorCompliance(argument_list[6].string_reference,
+ AllCompliance,&image->background_color,exception);
image=ExtentImage(image,&geometry,exception);
break;
}
if (attribute_flag[4] != 0)
geometry_info.psi=argument_list[4].integer_reference;
if (attribute_flag[5] != 0)
- (void) QueryColorDatabase(argument_list[5].string_reference,
- &image->background_color,exception);
+ (void) QueryColorCompliance(argument_list[5].string_reference,
+ AllCompliance,&image->background_color,exception);
image=VignetteImage(image,geometry_info.rho,geometry_info.sigma,
(ssize_t) ceil(geometry_info.xi-0.5),(ssize_t) ceil(geometry_info.psi-
0.5),exception);
(void) CloneString(&draw_info->font,
argument_list[2].string_reference);
if (attribute_flag[3] != 0)
- (void) QueryColorDatabase(argument_list[3].string_reference,
- &draw_info->stroke,exception);
+ (void) QueryColorCompliance(argument_list[3].string_reference,
+ AllCompliance,&draw_info->stroke,exception);
if (attribute_flag[4] != 0)
- (void) QueryColorDatabase(argument_list[4].string_reference,
- &draw_info->fill,exception);
+ (void) QueryColorCompliance(argument_list[4].string_reference,
+ AllCompliance,&draw_info->fill,exception);
if (attribute_flag[5] != 0)
draw_info->stroke_width=argument_list[5].real_reference;
if (attribute_flag[6] != 0)
if (attribute_flag[7] != 0)
draw_info->gravity=(GravityType) argument_list[7].integer_reference;
if (attribute_flag[8] != 0)
- (void) QueryColorDatabase(argument_list[8].string_reference,
- &image->background_color,exception);
+ (void) QueryColorCompliance(argument_list[8].string_reference,
+ AllCompliance,&image->background_color,exception);
method=UndefinedInterpolatePixel;
if (attribute_flag[9] != 0)
method=(PixelInterpolateMethod) argument_list[9].integer_reference;
if (attribute_flag[2] != 0)
geometry.y=argument_list[2].integer_reference;
if (attribute_flag[3] != 0)
- (void) QueryColorDatabase(argument_list[3].string_reference,
- &draw_info->fill,exception);
+ (void) QueryColorCompliance(argument_list[3].string_reference,
+ AllCompliance,&draw_info->fill,exception);
(void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y,&target,
exception);
if (attribute_flag[4] != 0)
- QueryMagickColor(argument_list[4].string_reference,&target,
- exception);
+ QueryMagickColorCompliance(argument_list[4].string_reference,
+ AllCompliance,&target,exception);
if (attribute_flag[5] != 0)
image->fuzz=SiPrefixToDouble(argument_list[5].string_reference,
QuantumRange);
black_point,
white_point;
- (void) QueryMagickColor("#000000",&black_point,exception);
- (void) QueryMagickColor("#ffffff",&white_point,exception);
+ (void) QueryMagickColorCompliance("#000000",AllCompliance,
+ &black_point,exception);
+ (void) QueryMagickColorCompliance("#ffffff",AllCompliance,
+ &white_point,exception);
if (attribute_flag[1] != 0)
- (void) QueryMagickColor(argument_list[1].string_reference,
- &black_point,exception);
+ (void) QueryMagickColorCompliance(
+ argument_list[1].string_reference,AllCompliance,&black_point,
+ exception);
if (attribute_flag[2] != 0)
- (void) QueryMagickColor(argument_list[2].string_reference,
- &white_point,exception);
+ (void) QueryMagickColorCompliance(
+ argument_list[2].string_reference,AllCompliance,&white_point,
+ exception);
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
channel_mask=SetPixelChannelMask(image,channel);
PixelInfo
color;
- (void) QueryMagickColor("none",&color,exception);
+ (void) QueryMagickColorCompliance("none",AllCompliance,&color,
+ exception);
if (attribute_flag[0] != 0)
- (void) QueryMagickColor(argument_list[0].string_reference,
- &color,exception);
+ (void) QueryMagickColorCompliance(argument_list[0].string_reference,
+ AllCompliance,&color,exception);
(void) SetImageColor(image,&color);
break;
}
*/
info=GetPackageInfo(aTHX_ (void *) av,info,exception);
montage_info=CloneMontageInfo(info->image_info,(MontageInfo *) NULL);
- (void) QueryMagickColor("none",&transparent_color,exception);
+ (void) QueryMagickColorCompliance("none",AllCompliance,&transparent_color,
+ exception);
for (i=2; i < items; i+=2)
{
attribute=(char *) SvPV(ST(i-1),na);
{
if (LocaleCompare(attribute,"background") == 0)
{
- (void) QueryColorDatabase(SvPV(ST(i),na),
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
&montage_info->background_color,exception);
for (next=image; next; next=next->next)
next->background_color=montage_info->background_color;
}
if (LocaleCompare(attribute,"bordercolor") == 0)
{
- (void) QueryColorDatabase(SvPV(ST(i),na),
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
&montage_info->border_color,exception);
for (next=image; next; next=next->next)
next->border_color=montage_info->border_color;
{
if (LocaleCompare(attribute,"fill") == 0)
{
- (void) QueryColorDatabase(SvPV(ST(i),na),&montage_info->fill,
- exception);
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
+ &montage_info->fill,exception);
break;
}
if (LocaleCompare(attribute,"font") == 0)
{
if (LocaleCompare(attribute,"mattecolor") == 0)
{
- (void) QueryColorDatabase(SvPV(ST(i),na),
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
&montage_info->matte_color,exception);
for (next=image; next; next=next->next)
next->matte_color=montage_info->matte_color;
ssize_t
in;
- in=!SvPOK(ST(i)) ? SvIV(ST(i)) :
- ParseCommandOption(MagickModeOptions,MagickFalse,SvPV(ST(i),na));
+ in=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption(
+ MagickModeOptions,MagickFalse,SvPV(ST(i),na));
switch (in)
{
default:
}
if (LocaleCompare(attribute,"stroke") == 0)
{
- (void) QueryColorDatabase(SvPV(ST(i),na),&montage_info->stroke,
- exception);
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
+ &montage_info->stroke,exception);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
PixelInfo
transparent_color;
- QueryMagickColor(SvPV(ST(i),na),&transparent_color,exception);
+ QueryMagickColorCompliance(SvPV(ST(i),na),AllCompliance,
+ &transparent_color,exception);
for (next=image; next; next=next->next)
(void) TransparentPaintImage(next,&transparent_color,
TransparentAlpha,MagickFalse,exception);
for (i=1; i < items; i++)
{
name=(char *) SvPV(ST(i),na);
- if (QueryMagickColor(name,&color,exception) == MagickFalse)
+ if (QueryMagickColorCompliance(name,AllCompliance,&color,exception) == MagickFalse)
{
PUSHs(&sv_undef);
continue;
EXTEND(sp,items);
for (i=1; i < items; i++)
{
- (void) QueryColorDatabase(SvPV(ST(i),na),&target_color,exception);
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,&target_color,
+ exception);
(void) QueryColorname(image,&target_color,SVGCompliance,message,
exception);
PUSHs(sv_2mortal(newSVpv(message,0)));
if (LocaleCompare(attribute,"fill") == 0)
{
if (info)
- (void) QueryColorDatabase(SvPV(ST(i),na),&draw_info->fill,
- &image->exception);
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
+ &draw_info->fill,&image->exception);
break;
}
if (LocaleCompare(attribute,"font") == 0)
if (LocaleCompare(attribute,"stroke") == 0)
{
if (info)
- (void) QueryColorDatabase(SvPV(ST(i),na),&draw_info->stroke,
- &image->exception);
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
+ &draw_info->stroke,&image->exception);
break;
}
if (LocaleCompare(attribute,"style") == 0)
if (LocaleCompare(attribute,"fill") == 0)
{
if (info)
- (void) QueryColorDatabase(SvPV(ST(i),na),&draw_info->fill,
- &image->exception);
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
+ &draw_info->fill,&image->exception);
break;
}
if (LocaleCompare(attribute,"font") == 0)
if (LocaleCompare(attribute,"stroke") == 0)
{
if (info)
- (void) QueryColorDatabase(SvPV(ST(i),na),&draw_info->stroke,
- &image->exception);
+ (void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
+ &draw_info->stroke,&image->exception);
break;
}
if (LocaleCompare(attribute,"style") == 0)
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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;
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
/*
Acquire next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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");
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)
{
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
{
HBITMAP
bitmapH;
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;
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
}
}
- 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)
{
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
if (n != 0)
{
/* Start a new image */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image = DestroyImageList(image);
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)
{
logging = LogMagickEvent(CoderEvent,GetMagickModule(),"enter ReadDJVUImage()");
(void) logging;
- image = AcquireImage(image_info); /* mmc: ?? */
+ image = AcquireImage(image_info,exception); /* mmc: ?? */
lc = (LoadContext *) NULL;
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)
{
/*
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);
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);
/*
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);
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)
{
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");
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)
{
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)
{
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)
{
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
char
colorname[MaxTextExtent];
+ Image
+ *image;
+
+ MagickBooleanType
+ status;
+
PixelPacket
start_color,
stop_color;
- Image
- *image;
-
/*
Initialize Image structure.
*/
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);
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);
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);
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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);
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)
{
/*
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++)
{
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)
{
(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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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)
{
/*
Proceed to next image.
*/
- AcquireNextImage(image_info, image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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)
{
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)
{
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);
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)
{
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);
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)
{
/*
Open image file.
*/
- image = AcquireImage(image_info);
+ image = AcquireImage(image_info,exception);
status = OpenBlob(image_info, image, ReadBinaryBlobMode, exception);
if (status == MagickFalse)
}
/* 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;
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)
{
/*
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));
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));
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);
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));
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));
}
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));
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),
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);
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)
{
{
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)
}
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);
}
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)
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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);
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)
{
{
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)
}
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);
}
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)
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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",
#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"
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;
{
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)
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseCommandOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
}
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)
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->border_color,&exception);
break;
}
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryColorDatabase(value,&target,
+ (void) QueryColorCompliance(value,AllCompliance,&target,
&msl_info->image[n]->exception);
break;
}
{
if (LocaleCompare(keyword,"bordercolor") == 0)
{
- (void) QueryMagickColor(value,&target,&exception);
+ (void) QueryMagickColorCompliance(value,AllCompliance,
+ &target,&exception);
paint_method=FillToBorderMethod;
break;
}
{
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)
}
if (LocaleCompare(keyword, "color") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&composite_image->background_color,&exception);
break;
}
{
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)
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseCommandOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
}
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)
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->matte_color,&exception);
break;
}
{
if (LocaleCompare(keyword,"bordercolor") == 0)
{
- (void) QueryMagickColor(value,&target,&exception);
+ (void) QueryMagickColorCompliance(value,AllCompliance,
+ &target,&exception);
paint_method=FillToBorderMethod;
break;
}
(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++)
{
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryMagickColor(value,&fill_color,&exception);
+ (void) QueryMagickColorCompliance(value,AllCompliance,
+ &fill_color,&exception);
break;
}
if (LocaleCompare(keyword,"fuzz") == 0)
{
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)
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseCommandOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
}
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)
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->background_color,&exception);
break;
}
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;
(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)
{
"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;
{
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)
}
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);
{
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;
}
}
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);
}
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;
}
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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_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)
{
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)
{
/*
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);
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);
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
/*
Open image file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
/*
Open image file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
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)
{
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)
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" AcquireNextImage()");
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
return((Image *) NULL);
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");
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)
{
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);
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);
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);
/* Allocate next image structure. */
if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Allocate magnified image");
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
" It is not sRGB (%c%c%c%c)",data[52],
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)
{
}
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
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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)
{
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)
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);
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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;
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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)
{
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)
{
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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);
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
(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)
{
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)
{
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)
{
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)
{
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);
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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')
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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);
*/
*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);
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
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)
{
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");
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)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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)
{
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)
{
/*
Read WMF image.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
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)
}
/* Allocate next image structure. */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
image->depth=8;
if (image->next == (Image *) NULL)
goto Finish;
/* Allocate next image structure. */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
image->depth=8;
if (image->next == (Image *) NULL)
goto Finish;
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)
{
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);
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)
{
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)
{
/*
Open image file.
*/
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
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)
{
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;
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
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;
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
/*
Read reconstruct image.
*/
- reconstruct_image=AcquireImage(image_info);
+ reconstruct_image=AcquireImage(image_info,exception);
(void) SetImageExtent(reconstruct_image,reference_image->columns,
reference_image->rows,exception);
(void) SetImageColorspace(reconstruct_image,reference_image->colorspace,
projects / imagemagick / commitdiff