% 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/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.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/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.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/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Image
*image;
- IndexPacket
- index,
- *indexes;
-
MagickBooleanType
status;
- MagickPixelPacket
- color;
-
- long
- y;
-
- PixelPacket
+ PixelInfo
pixel;
- register long
+ register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
+ ssize_t
+ y;
+
/*
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->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);
- if (status == MagickFalse)
+ if (*image_info->filename == '\0')
+ pixel=image->background_color;
+ else
{
- image=DestroyImage(image);
- return((Image *) NULL);
+ status=QueryColorCompliance((char *) image_info->filename,AllCompliance,
+ &pixel,exception);
+ if (status == MagickFalse)
+ {
+ image=DestroyImage(image);
+ return((Image *) NULL);
+ }
}
- image->colorspace=color.colorspace;
- image->matte=color.matte;
- index=0;
- SetPixelPacket(image,&color,&pixel,&index);
- for (y=0; y < (long) image->rows; y++)
+ SetImageColorspace(image,pixel.colorspace,exception);
+ image->alpha_trait=pixel.alpha_trait;
+ for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- for (x=0; x < (long) image->columns; x++)
- *q++=pixel;
- if (image->colorspace == CMYKColorspace)
- {
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (long) image->columns; x++)
- indexes[x]=index;
- }
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ SetPixelInfoPixel(image,&pixel,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
}
%
% The format of the RegisterXCImage method is:
%
-% unsigned long RegisterXCImage(void)
+% size_t RegisterXCImage(void)
%
*/
-ModuleExport unsigned long RegisterXCImage(void)
+ModuleExport size_t RegisterXCImage(void)
{
MagickInfo
*entry;
entry=SetMagickInfo("XC");
entry->decoder=(DecodeImageHandler *) ReadXCImage;
entry->adjoin=MagickFalse;
- entry->format_type=ExplicitFormatType;
+ entry->format_type=ImplicitFormatType;
+ entry->raw=MagickTrue;
+ entry->endian_support=MagickTrue;
+ entry->description=ConstantString("Constant image uniform color");
+ entry->module=ConstantString("XC");
+ (void) RegisterMagickInfo(entry);
+ entry=SetMagickInfo("CANVAS");
+ entry->decoder=(DecodeImageHandler *) ReadXCImage;
+ entry->adjoin=MagickFalse;
+ entry->format_type=ImplicitFormatType;
entry->raw=MagickTrue;
entry->endian_support=MagickTrue;
entry->description=ConstantString("Constant image uniform color");
*/
ModuleExport void UnregisterXCImage(void)
{
+ (void) UnregisterMagickInfo("CANVAS");
(void) UnregisterMagickInfo("XC");
}