% 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/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-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/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
\f
/*
Forward declarations.
*/
static MagickBooleanType
- WriteMATTEImage(const ImageInfo *,Image *);
+ WriteMATTEImage(const ImageInfo *,Image *,ExceptionInfo *);
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% The format of the RegisterMATTEImage method is:
%
-% unsigned long RegisterMATTEImage(void)
+% size_t RegisterMATTEImage(void)
%
*/
-ModuleExport unsigned long RegisterMATTEImage(void)
+ModuleExport size_t RegisterMATTEImage(void)
{
MagickInfo
*entry;
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Function WriteMATTEImage() writes an image of matte bytes to a file. It
-% consists of data from the matte component of the image [0..255].
+% WriteMATTEImage() writes an image of matte bytes to a file. It consists of
+% data from the matte component of the image [0..255].
%
% The format of the WriteMATTEImage method is:
%
% MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
-% Image *image)
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows.
%
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
- Image *image)
+ Image *image,ExceptionInfo *exception)
{
- ExceptionInfo
- *exception;
-
Image
*matte_image;
- long
- y;
-
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
- register long
+ register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
- if (image->matte == MagickFalse)
+ ssize_t
+ y;
+
+ if (image->alpha_trait != BlendPixelTrait)
ThrowWriterException(CoderError,"ImageDoesNotHaveAAlphaChannel");
- matte_image=CloneImage(image,image->columns,image->rows,MagickTrue,
- &image->exception);
+ matte_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (matte_image == (Image *) NULL)
return(MagickFalse);
- (void) SetImageType(matte_image,TrueColorMatteType);
- matte_image->matte=MagickFalse;
+ (void) SetImageType(matte_image,TrueColorMatteType,exception);
+ matte_image->alpha_trait=UndefinedPixelTrait;
/*
Convert image to matte pixels.
*/
- exception=(&image->exception);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
q=QueueAuthenticPixels(matte_image,0,y,matte_image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- q->red=GetOpacityPixelComponent(p);
- q->green=GetOpacityPixelComponent(p);
- q->blue=GetOpacityPixelComponent(p);
- SetOpacityPixelComponent(q,OpaqueOpacity);
- p++;
- q++;
+ SetPixelRed(matte_image,GetPixelAlpha(image,p),q);
+ SetPixelGreen(matte_image,GetPixelAlpha(image,p),q);
+ SetPixelBlue(matte_image,GetPixelAlpha(image,p),q);
+ SetPixelAlpha(matte_image,OpaqueAlpha,q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(matte_image);
}
if (SyncAuthenticPixels(matte_image,exception) == MagickFalse)
break;
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
- (void) FormatMagickString(matte_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(matte_image->filename,MaxTextExtent,
"MIFF:%s",image->filename);
- status=WriteImage(image_info,matte_image);
+ status=WriteImage(image_info,matte_image,exception);
matte_image=DestroyImage(matte_image);
return(status);
}