% MagickCore Color Methods %
% %
% Software Design %
-% John Cristy %
+% Cristy %
% July 1992 %
% %
% %
-% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
#include "MagickCore/utility.h"
#include "MagickCore/utility-private.h"
#include "MagickCore/xml-tree.h"
+#include "MagickCore/xml-tree-private.h"
\f
/*
Define declarations.
{ "cyan", 0, 255, 255, 1, SVGCompliance | X11Compliance | XPMCompliance },
{ "blue", 0, 0, 255, 1, SVGCompliance | X11Compliance | XPMCompliance },
{ "yellow", 255, 255, 0, 1, SVGCompliance | X11Compliance | XPMCompliance },
- { "white", 255, 255, 255, 1, SVGCompliance | X11Compliance },
+ { "white", 255, 255, 255, 1, SVGCompliance | X11Compliance | XPMCompliance },
{ "AliceBlue", 240, 248, 255, 1, SVGCompliance | X11Compliance | XPMCompliance },
{ "AntiqueWhite", 250, 235, 215, 1, SVGCompliance | X11Compliance | XPMCompliance },
{ "AntiqueWhite1", 255, 239, 219, 1, X11Compliance },
Static declarations.
*/
static LinkedListInfo
- *color_list = (LinkedListInfo *) NULL;
+ *color_cache = (LinkedListInfo *) NULL;
static SemaphoreInfo
*color_semaphore = (SemaphoreInfo *) NULL;
-
-static volatile MagickBooleanType
- instantiate_color = MagickFalse;
\f
/*
Forward declarations.
*/
static MagickBooleanType
- InitializeColorList(ExceptionInfo *),
- LoadColorLists(const char *,ExceptionInfo *);
+ IsColorCacheInstantiated(ExceptionInfo *),
+ LoadColorCache(LinkedListInfo *,const char *,const char *,const size_t,
+ ExceptionInfo *);
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% A c q u i r e C o l o r C a c h e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% AcquireColorCache() caches one or more color configurations which provides a
+% mapping between color attributes and a color name.
+%
+% The format of the AcquireColorCache method is:
+%
+% LinkedListInfo *AcquireColorCache(const char *filename,
+% ExceptionInfo *exception)
+%
+% A description of each parameter follows:
+%
+% o filename: the font file name.
+%
+% o exception: return any errors or warnings in this structure.
+%
+*/
+static LinkedListInfo *AcquireColorCache(const char *filename,
+ ExceptionInfo *exception)
+{
+ const StringInfo
+ *option;
+
+ LinkedListInfo
+ *color_cache,
+ *options;
+
+ MagickStatusType
+ status;
+
+ register ssize_t
+ i;
+
+ /*
+ Load external color map.
+ */
+ color_cache=NewLinkedList(0);
+ if (color_cache == (LinkedListInfo *) NULL)
+ ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+ status=MagickTrue;
+ options=GetConfigureOptions(filename,exception);
+ option=(const StringInfo *) GetNextValueInLinkedList(options);
+ while (option != (const StringInfo *) NULL)
+ {
+ status&=LoadColorCache(color_cache,(const char *)
+ GetStringInfoDatum(option),GetStringInfoPath(option),0,exception);
+ option=(const StringInfo *) GetNextValueInLinkedList(options);
+ }
+ options=DestroyConfigureOptions(options);
+ /*
+ Load built-in color map.
+ */
+ for (i=0; i < (ssize_t) (sizeof(ColorMap)/sizeof(*ColorMap)); i++)
+ {
+ ColorInfo
+ *color_info;
+
+ register const ColorMapInfo
+ *p;
+
+ p=ColorMap+i;
+ color_info=(ColorInfo *) AcquireMagickMemory(sizeof(*color_info));
+ if (color_info == (ColorInfo *) NULL)
+ {
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",p->name);
+ continue;
+ }
+ (void) ResetMagickMemory(color_info,0,sizeof(*color_info));
+ color_info->path=(char *) "[built-in]";
+ color_info->name=(char *) p->name;
+ GetPixelInfo((Image *) NULL,&color_info->color);
+ color_info->color.red=(double) ScaleCharToQuantum(p->red);
+ color_info->color.green=(double) ScaleCharToQuantum(p->green);
+ color_info->color.blue=(double) ScaleCharToQuantum(p->blue);
+ color_info->color.alpha=(double) (QuantumRange*p->alpha);
+ color_info->compliance=(ComplianceType) p->compliance;
+ color_info->exempt=MagickTrue;
+ color_info->signature=MagickSignature;
+ status&=AppendValueToLinkedList(color_cache,color_info);
+ if (IfMagickFalse(status))
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",color_info->name);
+ }
+ return(color_cache);
+}
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
MagickPrivate MagickBooleanType ColorComponentGenesis(void)
{
- AcquireSemaphoreInfo(&color_semaphore);
+ if (color_semaphore == (SemaphoreInfo *) NULL)
+ color_semaphore=AcquireSemaphoreInfo();
return(MagickTrue);
}
\f
*p;
p=(ColorInfo *) color_info;
- if (p->exempt == MagickFalse)
+ if (IfMagickFalse(p->exempt))
{
if (p->path != (char *) NULL)
p->path=DestroyString(p->path);
MagickPrivate void ColorComponentTerminus(void)
{
if (color_semaphore == (SemaphoreInfo *) NULL)
- AcquireSemaphoreInfo(&color_semaphore);
+ ActivateSemaphoreInfo(&color_semaphore);
LockSemaphoreInfo(color_semaphore);
- if (color_list != (LinkedListInfo *) NULL)
- color_list=DestroyLinkedList(color_list,DestroyColorElement);
- instantiate_color=MagickFalse;
+ if (color_cache != (LinkedListInfo *) NULL)
+ color_cache=DestroyLinkedList(color_cache,DestroyColorElement);
UnlockSemaphoreInfo(color_semaphore);
- DestroySemaphoreInfo(&color_semaphore);
+ RelinquishSemaphoreInfo(&color_semaphore);
}
\f
/*
*q;
assert(exception != (ExceptionInfo *) NULL);
- if ((color_list == (LinkedListInfo *) NULL) ||
- (instantiate_color == MagickFalse))
- if (InitializeColorList(exception) == MagickFalse)
- return((const ColorInfo *) NULL);
- if ((color_list == (LinkedListInfo *) NULL) ||
- (IsLinkedListEmpty(color_list) != MagickFalse))
+ if (IfMagickFalse(IsColorCacheInstantiated(exception)))
return((const ColorInfo *) NULL);
- if ((name == (const char *) NULL) || (LocaleCompare(name,"*") == 0))
- return((const ColorInfo *) GetValueFromLinkedList(color_list,0));
/*
Strip names of whitespace.
*/
- (void) CopyMagickString(colorname,name,MaxTextExtent);
+ *colorname='\0';
+ if (name != (const char *) NULL)
+ (void) CopyMagickString(colorname,name,MaxTextExtent);
for (q=colorname; *q != '\0'; q++)
{
if (isspace((int) ((unsigned char) *q)) == 0)
Search for color tag.
*/
LockSemaphoreInfo(color_semaphore);
- ResetLinkedListIterator(color_list);
- p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
+ ResetLinkedListIterator(color_cache);
+ p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
+ if ((name == (const char *) NULL) || (LocaleCompare(name,"*") == 0))
+ {
+ UnlockSemaphoreInfo(color_semaphore);
+ return(p);
+ }
while (p != (const ColorInfo *) NULL)
{
if (((p->compliance & compliance) != 0) &&
(LocaleCompare(colorname,p->name) == 0))
break;
- p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
+ p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
}
if (p == (ColorInfo *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
- "UnrecognizedColor","'%s'",name);
+ "UnrecognizedColor","`%s'",name);
else
- (void) InsertValueInLinkedList(color_list,0,
- RemoveElementByValueFromLinkedList(color_list,p));
+ (void) InsertValueInLinkedList(color_cache,0,
+ RemoveElementByValueFromLinkedList(color_cache,p));
UnlockSemaphoreInfo(color_semaphore);
return(p);
}
default:
break;
}
+ if (compliance == NoCompliance)
+ {
+ (void) FormatLocaleString(text,MaxTextExtent,"%.*g",GetMagickPrecision(),color);
+ (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ return;
+ }
if (compliance != SVGCompliance)
{
if (pixel->depth > 16)
}
if (component == AlphaPixelChannel)
{
- (void) FormatLocaleString(text,MaxTextExtent,"%g",(double)
+ (void) FormatLocaleString(text,MaxTextExtent,"%.*g",GetMagickPrecision(),
(QuantumScale*color));
(void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
if ((pixel->colorspace == HCLColorspace) ||
+ (pixel->colorspace == HCLpColorspace) ||
(pixel->colorspace == HSBColorspace) ||
+ (pixel->colorspace == HSIColorspace) ||
(pixel->colorspace == HSLColorspace) ||
+ (pixel->colorspace == HSVColorspace) ||
(pixel->colorspace == HWBColorspace))
{
- (void) FormatLocaleString(text,MaxTextExtent,"%g%%",(double)
+ (void) FormatLocaleString(text,MaxTextExtent,"%.*g%%",GetMagickPrecision(),
(100.0*QuantumScale*color));
(void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
if (pixel->depth > 8)
{
- (void) FormatLocaleString(text,MaxTextExtent,"%g%%",(double)
+ (void) FormatLocaleString(text,MaxTextExtent,"%.*g%%",GetMagickPrecision(),
(100.0*QuantumScale*color));
(void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
if (p == (const ColorInfo *) NULL)
return((const ColorInfo **) NULL);
colors=(const ColorInfo **) AcquireQuantumMemory((size_t)
- GetNumberOfElementsInLinkedList(color_list)+1UL,sizeof(*colors));
+ GetNumberOfElementsInLinkedList(color_cache)+1UL,sizeof(*colors));
if (colors == (const ColorInfo **) NULL)
return((const ColorInfo **) NULL);
/*
Generate color list.
*/
LockSemaphoreInfo(color_semaphore);
- ResetLinkedListIterator(color_list);
- p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
+ ResetLinkedListIterator(color_cache);
+ p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
for (i=0; p != (const ColorInfo *) NULL; )
{
- if ((p->stealth == MagickFalse) &&
- (GlobExpression(p->name,pattern,MagickFalse) != MagickFalse))
+ if (IsMagickFalse(p->stealth) &&
+ IsMagickTrue(GlobExpression(p->name,pattern,MagickFalse)))
colors[i++]=p;
- p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
+ p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
}
UnlockSemaphoreInfo(color_semaphore);
qsort((void *) colors,(size_t) i,sizeof(*colors),ColorInfoCompare);
if (p == (const ColorInfo *) NULL)
return((char **) NULL);
colors=(char **) AcquireQuantumMemory((size_t)
- GetNumberOfElementsInLinkedList(color_list)+1UL,sizeof(*colors));
+ GetNumberOfElementsInLinkedList(color_cache)+1UL,sizeof(*colors));
if (colors == (char **) NULL)
return((char **) NULL);
/*
Generate color list.
*/
LockSemaphoreInfo(color_semaphore);
- ResetLinkedListIterator(color_list);
- p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
+ ResetLinkedListIterator(color_cache);
+ p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
for (i=0; p != (const ColorInfo *) NULL; )
{
- if ((p->stealth == MagickFalse) &&
- (GlobExpression(p->name,pattern,MagickFalse) != MagickFalse))
+ if (IsMagickFalse(p->stealth) &&
+ IsMagickTrue(GlobExpression(p->name,pattern,MagickFalse)))
colors[i++]=ConstantString(p->name);
- p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
+ p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
}
UnlockSemaphoreInfo(color_semaphore);
qsort((void *) colors,(size_t) i,sizeof(*colors),ColorCompare);
assert(tuple != (char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tuple);
*tuple='\0';
- if (hex != MagickFalse)
+ if (IfMagickTrue(hex))
{
/*
Convert pixel to hex color.
/*
SVG requires color depths > 8 expressed as percentages.
*/
- status=fabs(color.red-SVGCompliant(color.red)) < MagickEpsilon ?
- MagickTrue : MagickFalse;
- status&=fabs(color.green-SVGCompliant(color.green)) < MagickEpsilon ?
- MagickTrue : MagickFalse;
- status&=fabs(color.blue-SVGCompliant(color.blue)) < MagickEpsilon ?
- MagickTrue : MagickFalse;
+ status=IsMagickTrue(fabs(color.red-SVGCompliant(color.red))
+ < MagickEpsilon);
+ status&=IsMagickTrue(fabs(color.green-SVGCompliant(color.green))
+ < MagickEpsilon);
+ status&=IsMagickTrue(fabs(color.blue-SVGCompliant(color.blue))
+ < MagickEpsilon);
if (color.colorspace-CMYKColorspace)
- status&=fabs(color.black-SVGCompliant(color.black)) < MagickEpsilon ?
- MagickTrue : MagickFalse;
+ status&=IsMagickTrue(fabs(color.black-SVGCompliant(color.black))
+ < MagickEpsilon);
if (color.alpha_trait == BlendPixelTrait)
- status&=fabs(color.alpha-SVGCompliant(color.alpha)) < MagickEpsilon ?
- MagickTrue : MagickFalse;
- if (status != MagickFalse)
+ status&=IsMagickTrue(fabs(color.alpha-SVGCompliant(color.alpha))
+ < MagickEpsilon);
+ if (IfMagickTrue(status))
color.depth=8;
}
(void) ConcatenateMagickString(tuple,CommandOptionToMnemonic(
% %
% %
% %
-+ I n i t i a l i z e C o l o r L i s t %
++ I s C o l o r C a c h e I n s t a n t i a t e d %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% InitializeColorList() initializes the color list.
+% IsColorCacheInstantiated() determines if the color list is instantiated. If
+% not, it instantiates the list and returns it.
%
-% The format of the InitializeColorList method is:
+% The format of the IsColorInstantiated method is:
%
-% MagickBooleanType InitializeColorList(ExceptionInfo *exception)
+% MagickBooleanType IsColorCacheInstantiated(ExceptionInfo *exception)
%
% A description of each parameter follows.
%
% o exception: return any errors or warnings in this structure.
%
*/
-static MagickBooleanType InitializeColorList(ExceptionInfo *exception)
+static MagickBooleanType IsColorCacheInstantiated(ExceptionInfo *exception)
{
- if ((color_list == (LinkedListInfo *) NULL) &&
- (instantiate_color == MagickFalse))
+ if (color_cache == (LinkedListInfo *) NULL)
{
if (color_semaphore == (SemaphoreInfo *) NULL)
- AcquireSemaphoreInfo(&color_semaphore);
+ ActivateSemaphoreInfo(&color_semaphore);
LockSemaphoreInfo(color_semaphore);
- if ((color_list == (LinkedListInfo *) NULL) &&
- (instantiate_color == MagickFalse))
- {
- (void) LoadColorLists(ColorFilename,exception);
- instantiate_color=MagickTrue;
- }
+ if (color_cache == (LinkedListInfo *) NULL)
+ color_cache=AcquireColorCache(ColorFilename,exception);
UnlockSemaphoreInfo(color_semaphore);
}
- return(color_list != (LinkedListInfo *) NULL ? MagickTrue : MagickFalse);
+ return(color_cache != (LinkedListInfo *) NULL ? MagickTrue : MagickFalse);
}
\f
/*
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
+ if (IfMagickTrue(image->debug))
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(target_image != (Image *) NULL);
assert(target_image->signature == MagickSignature);
for (i=0; i < (ssize_t) target_image->columns; i++)
{
p=GetCacheViewVirtualPixels(image_view,x+i,y+j,1,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
GetPixelInfoPixel(image,p,&pixel);
q=GetCacheViewVirtualPixels(target_view,i,j,1,1,exception);
+ if (q == (const Quantum *) NULL)
+ break;
GetPixelInfoPixel(image,q,&target);
- if (IsFuzzyEquivalencePixelInfo(&pixel,&target) == MagickFalse)
+ if (IfMagickFalse(IsFuzzyEquivalencePixelInfo(&pixel,&target)))
break;
}
if (i < (ssize_t) target_image->columns)
proceed=SetImageProgress(image,SearchImageText,(MagickOffsetType) y,
image->rows);
- if (proceed == MagickFalse)
+ if( IfMagickFalse(proceed) )
status=MagickFalse;
}
}
image_view=DestroyCacheView(image_view);
*x_offset=x;
*y_offset=y;
- if (status == MagickFalse)
+ if (IfMagickFalse(status))
return(status);
- return(y < (ssize_t) image->rows ? MagickTrue : MagickFalse);
+ return(IsMagickTrue(y < (ssize_t) image->rows));
}
\f
/*
path=(const char *) NULL;
for (i=0; i < (ssize_t) number_colors; i++)
{
- if (color_info[i]->stealth != MagickFalse)
+ if (IfMagickTrue(color_info[i]->stealth))
continue;
if ((path == (const char *) NULL) ||
(LocaleCompare(path,color_info[i]->path) != 0))
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% LoadColorList() loads the color configuration file which provides a mapping
+% LoadColorCache() loads the color configurations which provides a mapping
% between color attributes and a color name.
%
-% The format of the LoadColorList method is:
+% The format of the LoadColorCache method is:
%
-% MagickBooleanType LoadColorList(const char *xml,const char *filename,
-% const size_t depth,ExceptionInfo *exception)
+% MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
+% const char *xml,const char *filename,const size_t depth,
+% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o exception: return any errors or warnings in this structure.
%
*/
-static MagickBooleanType LoadColorList(const char *xml,const char *filename,
- const size_t depth,ExceptionInfo *exception)
+static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
+ const char *xml,const char *filename,const size_t depth,
+ ExceptionInfo *exception)
{
char
keyword[MaxTextExtent],
"Loading color file \"%s\" ...",filename);
if (xml == (char *) NULL)
return(MagickFalse);
- if (color_list == (LinkedListInfo *) NULL)
- {
- color_list=NewLinkedList(0);
- if (color_list == (LinkedListInfo *) NULL)
- {
- ThrowFileException(exception,ResourceLimitError,
- "MemoryAllocationFailed",filename);
- return(MagickFalse);
- }
- }
status=MagickTrue;
color_info=(ColorInfo *) NULL;
token=AcquireString(xml);
{
if (depth > 200)
(void) ThrowMagickException(exception,GetMagickModule(),
- ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token);
+ ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token);
else
{
char
(void) CopyMagickString(path,token,MaxTextExtent);
else
(void) ConcatenateMagickString(path,token,MaxTextExtent);
- xml=FileToString(path,~0,exception);
+ xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
- status=LoadColorList(xml,path,depth+1,exception);
+ status&=LoadColorCache(color_cache,xml,path,depth+1,
+ exception);
xml=(char *) RelinquishMagickMemory(xml);
}
}
continue;
if (LocaleCompare(keyword,"/>") == 0)
{
- status=AppendValueToLinkedList(color_list,color_info);
- if (status == MagickFalse)
+ status=AppendValueToLinkedList(color_cache,color_info);
+ if (IfMagickFalse(status))
(void) ThrowMagickException(exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","'%s'",
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",
color_info->name);
color_info=(ColorInfo *) NULL;
+ continue;
}
GetMagickToken(q,(const char **) NULL,token);
if (*token != '=')
compliance;
compliance=color_info->compliance;
- if (GlobExpression(token,"*SVG*",MagickTrue) != MagickFalse)
+ if (IfMagickTrue(GlobExpression(token,"*SVG*",MagickTrue)))
compliance|=SVGCompliance;
- if (GlobExpression(token,"*X11*",MagickTrue) != MagickFalse)
+ if (IfMagickTrue(GlobExpression(token,"*X11*",MagickTrue)))
compliance|=X11Compliance;
- if (GlobExpression(token,"*XPM*",MagickTrue) != MagickFalse)
+ if (IfMagickTrue(GlobExpression(token,"*XPM*",MagickTrue)))
compliance|=XPMCompliance;
color_info->compliance=(ComplianceType) compliance;
break;
% %
% %
% %
-% L o a d C o l o r L i s t s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% LoadColorList() loads one or more color configuration file which provides a
-% mapping between color attributes and a color name.
-%
-% The format of the LoadColorLists method is:
-%
-% MagickBooleanType LoadColorLists(const char *filename,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o filename: the font file name.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-static MagickBooleanType LoadColorLists(const char *filename,
- ExceptionInfo *exception)
-{
- const StringInfo
- *option;
-
- LinkedListInfo
- *options;
-
- MagickStatusType
- status;
-
- register ssize_t
- i;
-
- /*
- Load built-in color map.
- */
- status=MagickFalse;
- if (color_list == (LinkedListInfo *) NULL)
- {
- color_list=NewLinkedList(0);
- if (color_list == (LinkedListInfo *) NULL)
- {
- ThrowFileException(exception,ResourceLimitError,
- "MemoryAllocationFailed",filename);
- return(MagickFalse);
- }
- }
- for (i=0; i < (ssize_t) (sizeof(ColorMap)/sizeof(*ColorMap)); i++)
- {
- ColorInfo
- *color_info;
-
- register const ColorMapInfo
- *p;
-
- p=ColorMap+i;
- color_info=(ColorInfo *) AcquireMagickMemory(sizeof(*color_info));
- if (color_info == (ColorInfo *) NULL)
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","'%s'",color_info->name);
- continue;
- }
- (void) ResetMagickMemory(color_info,0,sizeof(*color_info));
- color_info->path=(char *) "[built-in]";
- color_info->name=(char *) p->name;
- GetPixelInfo((Image *) NULL,&color_info->color);
- color_info->color.red=(double) ScaleCharToQuantum(p->red);
- color_info->color.green=(double) ScaleCharToQuantum(p->green);
- color_info->color.blue=(double) ScaleCharToQuantum(p->blue);
- color_info->color.alpha=(double) (QuantumRange*p->alpha);
- color_info->compliance=(ComplianceType) p->compliance;
- color_info->exempt=MagickTrue;
- color_info->signature=MagickSignature;
- status=AppendValueToLinkedList(color_list,color_info);
- if (status == MagickFalse)
- (void) ThrowMagickException(exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","'%s'",color_info->name);
- }
- /*
- Load external color map.
- */
- options=GetConfigureOptions(filename,exception);
- option=(const StringInfo *) GetNextValueInLinkedList(options);
- while (option != (const StringInfo *) NULL)
- {
- status|=LoadColorList((const char *) GetStringInfoDatum(option),
- GetStringInfoPath(option),0,exception);
- option=(const StringInfo *) GetNextValueInLinkedList(options);
- }
- options=DestroyConfigureOptions(options);
- return(status != 0 ? MagickTrue : MagickFalse);
-}
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
+ Q u e r y C o l o r C o m p l i a n c e %
% %
% %
*/
(void) ResetMagickMemory(&pixel,0,sizeof(pixel));
name++;
- for (n=0; isxdigit((int) ((unsigned char) name[n])) != MagickFalse; n++) ;
+ for (n=0; isxdigit((int) ((unsigned char) name[n])) != 0; n++) ;
if ((n % 3) == 0)
{
do
else
return(MagickFalse);
}
- } while (isxdigit((int) ((unsigned char) *name)) != MagickFalse);
+ } while (isxdigit((int) ((unsigned char) *name)) != 0);
depth=4*(n/3);
}
else
if ((n % 4) != 0)
{
(void) ThrowMagickException(exception,GetMagickModule(),
- OptionWarning,"UnrecognizedColor","'%s'",name);
+ OptionWarning,"UnrecognizedColor","`%s'",name);
return(MagickFalse);
}
do
else
return(MagickFalse);
}
- } while (isxdigit((int) ((unsigned char) *name)) != MagickFalse);
+ } while (isxdigit((int) ((unsigned char) *name)) != 0);
depth=4*(n/4);
}
color->colorspace=sRGBColorspace;
+ color->depth=depth;
color->alpha_trait=UndefinedPixelTrait;
range=GetQuantumRange(depth);
color->red=(double) ScaleAnyToQuantum(pixel.red,range);
if (type < 0)
{
(void) ThrowMagickException(exception,GetMagickModule(),
- OptionWarning,"UnrecognizedColor","'%s'",name);
+ OptionWarning,"UnrecognizedColor","`%s'",name);
return(MagickFalse);
}
color->colorspace=(ColorspaceType) type;
- if ((icc_color == MagickFalse) && (color->colorspace == RGBColorspace))
- color->colorspace=sRGBColorspace; /* as required by SVG standard */
+ if (IfMagickFalse(icc_color) && (color->colorspace == RGBColorspace))
+ {
+ color->colorspace=sRGBColorspace; /* as required by SVG standard */
+ color->depth=8;
+ }
SetGeometryInfo(&geometry_info);
flags=ParseGeometry(name+i+1,&geometry_info);
if (flags == 0)
if (p == (const ColorInfo *) NULL)
return(MagickFalse);
color->colorspace=sRGBColorspace;
+ color->depth=8;
color->alpha_trait=p->color.alpha != OpaqueAlpha ? BlendPixelTrait :
UndefinedPixelTrait;
color->red=(double) p->color.red;
% example an intensity of rgb:(0,0,0) returns black whereas rgb:(223,223,223)
% returns #dfdfdf.
%
+% UPDATE: the 'image' argument is no longer needed as all information should
+% have been preset using GetPixelInfo().
+%
% The format of the QueryColorname method is:
%
% MagickBooleanType QueryColorname(const Image *image,
%
% A description of each parameter follows.
%
-% o image: the image.
+% o image: the image. (not used! - color gets settings from GetPixelInfo()
%
% o color: the color intensities.
%
%
*/
-static inline double MagickMin(const double x,const double y)
-{
- if (x < y)
- return(x);
- return(y);
-}
-
-MagickExport MagickBooleanType QueryColorname(const Image *image,
- const PixelInfo *color,const ComplianceType compliance,char *name,
- ExceptionInfo *exception)
+MagickExport MagickBooleanType QueryColorname(
+ const Image *magick_unused(image),const PixelInfo *color,
+ const ComplianceType compliance,char *name,ExceptionInfo *exception)
{
PixelInfo
pixel;
double
- opacity;
+ alpha;
register const ColorInfo
*p;
if (compliance == XPMCompliance)
{
pixel.alpha_trait=UndefinedPixelTrait;
- pixel.depth=(size_t) MagickMin(1.0*image->depth,16.0);
+ if ( pixel.depth > 16 )
+ pixel.depth=16;
}
- GetColorTuple(&pixel,compliance != SVGCompliance ? MagickTrue : MagickFalse,
- name);
- if (IssRGBColorspace(pixel.colorspace) == MagickFalse)
+ GetColorTuple(&pixel,IsMagickTrue(compliance != SVGCompliance),name);
+ if (IfMagickFalse(IssRGBColorspace(pixel.colorspace)))
return(MagickFalse);
+ alpha=color->alpha_trait == BlendPixelTrait ? color->alpha : OpaqueAlpha;
(void) GetColorInfo("*",exception);
- ResetLinkedListIterator(color_list);
- opacity=image->alpha_trait == BlendPixelTrait ? color->alpha : OpaqueAlpha;
- p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
+ ResetLinkedListIterator(color_cache);
+ p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
while (p != (const ColorInfo *) NULL)
{
if (((p->compliance & compliance) != 0) &&
((fabs(p->color.red-color->red) < MagickEpsilon)) &&
(fabs(p->color.green-color->green) < MagickEpsilon) &&
(fabs(p->color.blue-color->blue) < MagickEpsilon) &&
- (fabs(p->color.alpha-opacity) < MagickEpsilon))
+ (fabs(p->color.alpha-alpha) < MagickEpsilon))
{
(void) CopyMagickString(name,p->name,MaxTextExtent);
break;
}
- p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
+ p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
}
return(MagickTrue);
}
projects / imagemagick / blobdiff