From: cristy Date: Mon, 23 Jan 2012 19:49:26 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6313 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9945c6e9eb6b01309c3b67b987fc91c864a7e9d0;p=imagemagick --- diff --git a/coders/tiff.c b/coders/tiff.c index ca423d71e..aafae4d38 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -825,7 +825,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, size_t length, - lsb_first, pad; ssize_t @@ -1004,9 +1003,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Image depth: %.20g", (double) image->depth); - lsb_first=1; - image->endian=MSBEndian; - if ((int) (*(char *) &lsb_first) != 0) if ((photometric == PHOTOMETRIC_MINISBLACK) || (photometric == PHOTOMETRIC_MINISWHITE)) image->colorspace=GRAYColorspace; @@ -2558,8 +2554,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, i; size_t - length, - lsb_first; + length; ssize_t y; @@ -2875,10 +2870,6 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, break; } } - lsb_first=1; - image->endian=MSBEndian; - if ((int) (*(char *) &lsb_first) != 0) - image->endian=LSBEndian; if ((compress_tag == COMPRESSION_CCITTFAX3) && (photometric != PHOTOMETRIC_MINISWHITE)) { @@ -3152,6 +3143,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, quantum_info->endian=LSBEndian; if (endian == FILLORDER_LSB2MSB) quantum_info->endian=MSBEndian; + image->endian=quantum_info->endian; pixels=GetQuantumPixels(quantum_info); tiff_info.scanline=GetQuantumPixels(quantum_info); switch (photometric) @@ -3391,9 +3383,6 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, if (0 && (image_info->verbose == MagickTrue)) TIFFPrintDirectory(tiff,stdout,MagickFalse); (void) TIFFWriteDirectory(tiff); - image->endian=MSBEndian; - if (endian == FILLORDER_LSB2MSB) - image->endian=LSBEndian; image=SyncNextImageInList(image); if (image == (Image *) NULL) break;