diff options
| author | cristy <urban-warrior@git.imagemagick.org> | 2011-08-28 19:44:34 +0000 |
|---|---|---|
| committer | cristy <urban-warrior@git.imagemagick.org> | 2011-08-28 19:44:34 +0000 |
| commit | 1e178e70fb3c956f9fc1e30c3ba863e882666465 (patch) | |
| tree | e3bd97ff2dc117cc8d2ddc3895d5f86adcc93a0d /coders/cip.c | |
| parent | 6f9e0d38526c24e02e6207b1d494fa8fad072b9c (diff) | |
| download | ImageMagick-1e178e70fb3c956f9fc1e30c3ba863e882666465.tar.gz | |
Diffstat (limited to 'coders/cip.c')
| -rw-r--r-- | coders/cip.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/coders/cip.c b/coders/cip.c index 5dcf3a30c..be916cb87 100644 --- a/coders/cip.c +++ b/coders/cip.c @@ -68,7 +68,7 @@ Forward declarations. */ static MagickBooleanType - WriteCIPImage(const ImageInfo *,Image *); + WriteCIPImage(const ImageInfo *,Image *,ExceptionInfo *); /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -147,7 +147,8 @@ ModuleExport void UnregisterCIPImage(void) % % The format of the WriteCIPImage method is: % -% MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image) +% MagickBooleanType WriteCIPImage(const ImageInfo *image_info, +% Image *image,ExceptionInfo *exception) % % A description of each parameter follows. % @@ -155,6 +156,8 @@ ModuleExport void UnregisterCIPImage(void) % % o image: The image. % +% o exception: return any errors or warnings in this structure. +% */ static inline ssize_t MagickMin(const ssize_t x,const ssize_t y) @@ -164,7 +167,8 @@ static inline ssize_t MagickMin(const ssize_t x,const ssize_t y) return(y); } -static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image) +static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image, + ExceptionInfo *exception) { char buffer[MaxTextExtent]; @@ -197,7 +201,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image) assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception); + status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); (void) WriteBlobString(image,"<CiscoIPPhoneImage>\n"); @@ -233,7 +237,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image) (void) TransformImageColorspace(image,RGBColorspace); 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; for (x=0; x < ((ssize_t) image->columns-3); x+=4) |