From: cristy Date: Thu, 9 Feb 2012 13:51:53 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6213 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4debe6bf0038c66812657aba3594602ef7a4d8a;p=imagemagick --- diff --git a/coders/tiff.c b/coders/tiff.c index d3d56d412..f7de127a1 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -40,6 +40,7 @@ Include declarations. */ #include "MagickCore/studio.h" +#include "MagickCore/artifact.h" #include "MagickCore/attribute.h" #include "MagickCore/blob.h" #include "MagickCore/blob-private.h" @@ -2600,7 +2601,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, error_handler=TIFFSetErrorHandler((TIFFErrorHandler) TIFFErrors); warning_handler=TIFFSetWarningHandler((TIFFErrorHandler) TIFFWarnings); endian_type=UndefinedEndian; - option=GetImageOption(image_info,"tiff:endian"); + option=GetImageArtifact(image,"tiff:endian"); if (option != (const char *) NULL) { if (LocaleNCompare(option,"msb",3) == 0) @@ -2882,7 +2883,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, compress_tag=COMPRESSION_NONE; endian=FILLORDER_MSB2LSB; } - option=GetImageProperty(image,"tiff:fill-order",exception); + option=GetImageArtifact(image,"tiff:fill-order"); if (option != (const char *) NULL) { if (LocaleNCompare(option,"msb",3) == 0) @@ -2905,7 +2906,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, */ extra_samples=1; sample_info[0]=EXTRASAMPLE_UNASSALPHA; - option=GetImageProperty(image,"tiff:alpha",exception); + option=GetImageArtifact(image,"tiff:alpha"); if ((option != (const char *) NULL) && (LocaleCompare(option,"associated") == 0)) sample_info[0]=EXTRASAMPLE_ASSOCALPHA; @@ -2950,7 +2951,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, if (TIFFScanlineSize(tiff) != 0) rows_per_strip=(uint32) MagickMax((size_t) TIFFDefaultStripSize(tiff,0), 1); - option=GetImageOption(image_info,"tiff:rows-per-strip"); + option=GetImageArtifact(image,"tiff:rows-per-strip"); if (option != (const char *) NULL) rows_per_strip=(size_t) strtol(option,(char **) NULL,10); switch (compress_tag)