diff --git a/coders/dpx.c b/coders/dpx.c
index a4155c0..e2c0237 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -306,7 +306,7 @@
Forward declaractions.
*/
static MagickBooleanType
- WriteDPXImage(const ImageInfo *,Image *);
+ WriteDPXImage(const ImageInfo *,Image *,ExceptionInfo *);
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1221,7 +1221,8 @@
%
% The format of the WriteDPXImage method is:
%
-% MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteDPXImage(const ImageInfo *image_info,
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows.
%
@@ -1229,6 +1230,8 @@
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
static inline const char *GetDPXProperty(const ImageInfo *image_info,
@@ -1272,7 +1275,8 @@
return(value);
}
-static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
const char
*value;
@@ -1307,15 +1311,15 @@
register ssize_t
i;
+ size_t
+ extent;
+
ssize_t
count,
horizontal_factor,
vertical_factor,
y;
- size_t
- extent;
-
time_t
seconds;
@@ -1355,7 +1359,7 @@
((horizontal_factor == 2) || (vertical_factor == 2)))
if ((image->columns % 2) != 0)
image->columns++;
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
/*
@@ -1469,7 +1473,7 @@
dpx.image.image_element[i].descriptor=RGBAComponentType;
if ((image_info->type != TrueColorType) &&
(image->matte == MagickFalse) &&
- (IsImageGray(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,exception) != MagickFalse))
dpx.image.image_element[i].descriptor=LumaComponentType;
break;
}
@@ -1773,7 +1777,7 @@
count=WriteBlobByte(image,0x00);
if (count != 1)
{
- ThrowFileException(&image->exception,FileOpenError,"UnableToWriteFile",
+ ThrowFileException(exception,FileOpenError,"UnableToWriteFile",
image->filename);
break;
}
@@ -1801,7 +1805,7 @@
image->depth,MagickTrue);
if ((image_info->type != UndefinedType) &&
(image_info->type != TrueColorType) && (image->matte == MagickFalse) &&
- (IsImageGray(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,exception) != MagickFalse))
{
quantum_type=GrayQuantum;
extent=GetBytesPerRow(image->columns,1UL,image->depth,MagickTrue);
@@ -1809,11 +1813,11 @@
pixels=GetQuantumPixels(quantum_info);
for (y=0; y < (ssize_t) image->rows; y++)
{
- p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1,exception);
if (p == (const Quantum *) NULL)
break;
(void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- quantum_type,pixels,&image->exception);
+ quantum_type,pixels,exception);
count=WriteBlob(image,extent,pixels);
if (count != (ssize_t) extent)
break;