From: cristy Date: Fri, 5 Apr 2013 11:22:49 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3943 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46ad627e77911bbc8aa27ea65d4a81041808e289;p=imagemagick --- diff --git a/coders/tiff.c b/coders/tiff.c index d179fabea..43c9a1408 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -2342,7 +2342,7 @@ static MagickBooleanType EncodeLabImage(Image *image,ExceptionInfo *exception) return(status); } -static MagickBooleanType GetTIFFInfo(const ImageInfo *image_info,TIFF *tiff, +static MagickBooleanType GetTIFFInfo(const IMage *image,TIFF *tiff, TIFFInfo *tiff_info) { const char @@ -3250,7 +3250,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, /* Write image scanlines. */ - if (GetTIFFInfo(image_info,tiff,&tiff_info) == MagickFalse) + if (GetTIFFInfo(image,tiff,&tiff_info) == MagickFalse) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); quantum_info->endian=LSBEndian; pixels=GetQuantumPixels(quantum_info); diff --git a/coders/x.c b/coders/x.c index fc6121c32..f57c7e57f 100644 --- a/coders/x.c +++ b/coders/x.c @@ -101,8 +101,8 @@ static Image *ReadXImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) exception; XGetImportInfo(&ximage_info); - ximage_info.screen=IsStringTrue(GetImageArtifact(image,"x:screen")); - ximage_info.silent=IsStringTrue(GetImageArtifact(image,"x:silent")); + ximage_info.screen=IsStringTrue(GetImageOption(image_info,"x:screen")); + ximage_info.silent=IsStringTrue(GetImageOption(image_info,"x:silent")); return(XImportImage(image_info,&ximage_info,exception)); } #endif