% July 1992 %
% %
% %
-% Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2013 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 declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/studio.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/studio.h"
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
char
colorname[MaxTextExtent];
- PixelPacket
- start_color,
- stop_color;
-
Image
*image;
+ MagickBooleanType
+ icc_color,
+ status;
+
+ PixelInfo
+ start_color,
+ stop_color;
+
/*
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) TransparentOpacity);
+ (void) SetImageAlpha(image,(Quantum) TransparentAlpha,exception);
(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)
+ icc_color=MagickFalse;
+ if (LocaleCompare(colorname,"icc") == 0)
+ {
+ (void) ConcatenateMagickString(colorname,"-",MaxTextExtent);
+ (void) sscanf(image_info->filename,"%*[^-]-%[^-]",colorname+4);
+ icc_color=MagickTrue;
+ }
+ status=QueryColorCompliance(colorname,AllCompliance,&start_color,exception);
+ if (status == MagickFalse)
{
image=DestroyImage(image);
return((Image *) NULL);
}
(void) CopyMagickString(colorname,"white",MaxTextExtent);
- if (PixelIntensityToQuantum(&start_color) > (Quantum) (QuantumRange/2))
+ if (GetPixelInfoIntensity(&start_color) > (Quantum) (QuantumRange/2))
(void) CopyMagickString(colorname,"black",MaxTextExtent);
- (void) sscanf(image_info->filename,"%*[^-]-%s",colorname);
- if (QueryColorDatabase(colorname,&stop_color,exception) == MagickFalse)
+ if (icc_color == MagickFalse)
+ (void) sscanf(image_info->filename,"%*[^-]-%s",colorname);
+ else
+ (void) sscanf(image_info->filename,"%*[^-]-%*[^-]-%s",colorname);
+ status=QueryColorCompliance(colorname,AllCompliance,&stop_color,exception);
+ if (status == MagickFalse)
{
image=DestroyImage(image);
return((Image *) NULL);
}
- (void) GradientImage(image,LocaleCompare(image_info->magick,"GRADIENT") == 0 ?
- LinearGradient : RadialGradient,PadSpread,&start_color,&stop_color);
+ status=GradientImage(image,LocaleCompare(image_info->magick,"GRADIENT") == 0 ?
+ LinearGradient : RadialGradient,PadSpread,&start_color,&stop_color,
+ exception);
+ if (status == MagickFalse)
+ {
+ image=DestroyImageList(image);
+ return((Image *) NULL);
+ }
+ if ((start_color.alpha_trait != BlendPixelTrait) && (stop_color.alpha_trait != BlendPixelTrait))
+ (void) SetImageAlphaChannel(image,DeactivateAlphaChannel,exception);
return(GetFirstImageInList(image));
}
\f
entry->decoder=(DecodeImageHandler *) ReadGRADIENTImage;
entry->adjoin=MagickFalse;
entry->raw=MagickTrue;
- entry->format_type=ExplicitFormatType;
+ entry->format_type=ImplicitFormatType;
entry->description=ConstantString("Gradual linear passing from one shade to "
"another");
entry->module=ConstantString("GRADIENT");
entry->decoder=(DecodeImageHandler *) ReadGRADIENTImage;
entry->adjoin=MagickFalse;
entry->raw=MagickTrue;
- entry->format_type=ExplicitFormatType;
+ entry->format_type=ImplicitFormatType;
entry->description=ConstantString("Gradual radial passing from one shade to "
"another");
entry->module=ConstantString("GRADIENT");