% 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/property.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/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.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/pixel.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/property.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/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.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.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_FPX_DELEGATE)
-#if !defined(vms) && !defined(macintosh) && !defined(__WINDOWS__)
+#if !defined(vms) && !defined(macintosh) && !defined(MAGICKCORE_WINDOWS_SUPPORT)
#include <fpxlib.h>
#else
#include "Fpxlib.h"
Forward declarations.
*/
static MagickBooleanType
- WriteFPXImage(const ImageInfo *,Image *);
+ WriteFPXImage(const ImageInfo *,Image *,ExceptionInfo *);
#endif
\f
/*
Image
*image;
- IndexPacket
- index;
-
- long
- y;
-
MagickBooleanType
status;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
- register long
+ register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
size_t
memory_limit;
+ ssize_t
+ y;
+
unsigned char
*pixels;
tile_height,
width;
- unsigned long
+ size_t
scene;
/*
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)
{
fpx_status=FPX_GetImageResultAspectRatio(flashpix,&aspect_ratio);
if (fpx_status != FPX_OK)
ThrowReaderException(DelegateError,"UnableToReadAspectRatio");
- if (width != (unsigned long) ((aspect_ratio*height)+0.5))
+ if (width != (size_t) floor((aspect_ratio*height)+0.5))
Swap(width,height);
}
fpx_status=FPX_GetSummaryInformation(flashpix,&summary_info);
Note image label.
*/
label=(char *) NULL;
- if (~summary_info.title.length >= MaxTextExtent)
+ if (~summary_info.title.length >= (MaxTextExtent-1))
label=(char *) AcquireQuantumMemory(summary_info.title.length+
MaxTextExtent,sizeof(*label));
if (label == (char *) NULL)
}
(void) CopyMagickString(label,(char *) summary_info.title.ptr,
summary_info.title.length+1);
- (void) SetImageProperty(image,"label",label);
+ (void) SetImageProperty(image,"label",label,exception);
label=DestroyString(label);
}
if (summary_info.comments_valid)
Note image comment.
*/
comments=(char *) NULL;
- if (~summary_info.comments.length >= MaxTextExtent)
+ if (~summary_info.comments.length >= (MaxTextExtent-1))
comments=(char *) AcquireQuantumMemory(summary_info.comments.length+
MaxTextExtent,sizeof(*comments));
if (comments == (char *) NULL)
}
(void) CopyMagickString(comments,(char *) summary_info.comments.ptr,
summary_info.comments.length+1);
- (void) SetImageProperty(image,"comment",comments);
+ (void) SetImageProperty(image,"comment",comments,exception);
comments=DestroyString(comments);
}
/*
image->columns=width;
image->rows=height;
if ((colorspace.numberOfComponents % 2) == 0)
- image->matte=MagickTrue;
+ image->alpha_trait=BlendPixelTrait;
if (colorspace.numberOfComponents == 1)
{
/*
Create linear colormap.
*/
- if (AcquireImageColormap(image,MaxColormapSize) == MagickFalse)
+ if (AcquireImageColormap(image,MaxColormapSize,exception) == MagickFalse)
{
FPX_ClearSystem();
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
/*
Initialize image pixels.
*/
- for (y=0; y < (long) image->rows; y++)
+ 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;
- indexes=GetAuthenticIndexQueue(image);
if ((y % tile_height) == 0)
{
/*
else
fpx_status=FPX_ReadImageTransformRectangle(flashpix,0.0F,
(float) y/image->rows,(float) image->columns/image->rows,
- (float) (y+tile_height-1)/image->rows,(long) image->columns,
- (long) tile_height,&fpx_info);
+ (float) (y+tile_height-1)/image->rows,(ssize_t) image->columns,
+ (ssize_t) tile_height,&fpx_info);
if (fpx_status == FPX_LOW_MEMORY_ERROR)
{
pixels=(unsigned char *) RelinquishMagickMemory(pixels);
g=green_component->theData+(y % tile_height)*green_component->lineStride;
b=blue_component->theData+(y % tile_height)*blue_component->lineStride;
a=alpha_component->theData+(y % tile_height)*alpha_component->lineStride;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
if (fpx_info.numberOfComponents > 2)
{
- q->red=ScaleCharToQuantum(*r);
- q->green=ScaleCharToQuantum(*g);
- q->blue=ScaleCharToQuantum(*b);
+ SetPixelRed(image,ScaleCharToQuantum(*r),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*g),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*b),q);
}
else
{
index=ScaleCharToQuantum(*r);
- indexes[x]=index;
- q->red=index;
- q->green=index;
- q->blue=index;
+ SetPixelBlack(image,index,q);
+ SetPixelRed(image,index,q);
+ SetPixelGreen(image,index,q);
+ SetPixelBlue(image,index,q);
}
- SetOpacityPixelComponent(q,OpaqueOpacity);
- if (image->matte != MagickFalse)
- q->opacity=ScaleCharToQuantum(255-*a);
- q++;
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ if (image->alpha_trait == BlendPixelTrait)
+ SetPixelAlpha(image,ScaleCharToQuantum(*a),q);
+ q+=GetPixelChannels(image);
r+=red_component->columnStride;
g+=green_component->columnStride;
b+=blue_component->columnStride;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
%
% The format of the RegisterFPXImage method is:
%
-% unsigned long RegisterFPXImage(void)
+% size_t RegisterFPXImage(void)
%
*/
-ModuleExport unsigned long RegisterFPXImage(void)
+ModuleExport size_t RegisterFPXImage(void)
{
MagickInfo
*entry;
%
% The format of the WriteFPXImage method is:
%
-% MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteFPXImage(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.
+%
*/
static void ColorTwistMultiply(FPXColorTwistMatrix first,
*color_twist=result;
}
-static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
FPXBackground
background_color;
FPXSummaryInformation
summary_info;
- long
- y;
-
MagickBooleanType
status;
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
- register long
+ register ssize_t
i;
size_t
length,
memory_limit;
+ ssize_t
+ y;
+
unsigned char
*pixels;
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
+ assert(exception != (ExceptionInfo *) NULL);
+ assert(exception->signature == MagickSignature);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
(void) CloseBlob(image);
/*
Initialize FPX toolkit.
*/
image->depth=8;
- if (image->colorspace != RGBColorspace)
- (void) TransformImageColorspace(image,RGBColorspace);
memory_limit=20000000;
fpx_status=FPX_SetToolkitMemoryLimit(&memory_limit);
if (fpx_status != FPX_OK)
tile_width=64;
tile_height=64;
colorspace.numberOfComponents=3;
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
colorspace.numberOfComponents=4;
if ((image_info->type != TrueColorType) &&
- IsGrayImage(image,&image->exception))
+ (IsImageGray(image,exception) != MagickFalse))
{
colorspace.numberOfComponents=1;
colorspace.theComponents[0].myColor=MONOCHROME;
summary_info.thumbnail_valid=MagickFalse;
summary_info.appname_valid=MagickFalse;
summary_info.security_valid=MagickFalse;
- label=GetImageProperty(image,"label");
+ label=GetImageProperty(image,"label",exception);
if (label != (const char *) NULL)
{
- size_t
- length;
-
/*
Note image label.
*/
summary_info.title_valid=MagickTrue;
length=strlen(label);
summary_info.title.length=length;
- if (~length >= MaxTextExtent)
+ if (~length >= (MaxTextExtent-1))
summary_info.title.ptr=(unsigned char *) AcquireQuantumMemory(
length+MaxTextExtent,sizeof(*summary_info.title.ptr));
if (summary_info.title.ptr == (unsigned char *) NULL)
(void) CopyMagickString((char *) summary_info.title.ptr,label,
MaxTextExtent);
}
- comment=GetImageProperty(image,"comment");
+ comment=GetImageProperty(image,"comment",exception);
if (comment != (const char *) NULL)
{
/*
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
pixels=GetQuantumPixels(quantum_info);
fpx_info.numberOfComponents=colorspace.numberOfComponents;
- for (i=0; i < (long) fpx_info.numberOfComponents; i++)
+ for (i=0; i < (ssize_t) fpx_info.numberOfComponents; i++)
{
fpx_info.components[i].myColorType.myDataType=DATA_TYPE_UNSIGNED_BYTE;
fpx_info.components[i].horzSubSampFactor=1;
Write image pixelss.
*/
quantum_type=RGBQuantum;
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
quantum_type=RGBAQuantum;
if (fpx_info.numberOfComponents == 1)
quantum_type=GrayQuantum;
- 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,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
- quantum_type,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,exception);
fpx_status=FPX_WriteImageLine(flashpix,&fpx_info);
if (fpx_status != FPX_OK)
break;
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}