]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 5 Apr 2013 11:22:49 +0000 (11:22 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 5 Apr 2013 11:22:49 +0000 (11:22 +0000)
coders/tiff.c
coders/x.c

index d179fabeaecfc0afdf8ca42b5595e65b2780fa47..43c9a1408311d36c1affcd1bab3ca1a913e54a4b 100644 (file)
@@ -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);
index fc6121c3223daa4e2f948def63b708f3d49b7683..f57c7e57fe325beaaaeea184b0d81aefe66ca6c2 100644 (file)
@@ -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