From f1076accdac4a36b437de22e37c118fc2974963fd2d865a72b1dd429d4a6283d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Jul 2010 18:44:25 +0000 Subject: [PATCH] Accepting request 43436 from graphics checked in (request 43436) OBS-URL: https://build.opensuse.org/request/show/43436 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=33 --- ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch | 39 ------------------- ImageMagick.changes | 5 --- ImageMagick.spec | 2 - 3 files changed, 46 deletions(-) delete mode 100644 ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch diff --git a/ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch b/ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch deleted file mode 100644 index 081136a..0000000 --- a/ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: ImageMagick-6.6.1-0/coders/tiff.c -=================================================================== ---- ImageMagick-6.6.1-0.orig/coders/tiff.c -+++ ImageMagick-6.6.1-0/coders/tiff.c -@@ -2668,22 +2668,19 @@ static MagickBooleanType WriteTIFFImage( - image->endian=MSBEndian; - if ((int) (*(char *) &lsb_first) != 0) - image->endian=LSBEndian; -- if ((compress_tag == COMPRESSION_JPEG) && (photometric != PHOTOMETRIC_RGB)) -- compress_tag=COMPRESSION_NONE; -+ if ((compress_tag == COMPRESSION_CCITTFAX3) && -+ (photometric != PHOTOMETRIC_MINISWHITE)) -+ { -+ compress_tag=COMPRESSION_NONE; -+ endian=FILLORDER_MSB2LSB; -+ } - else -- if ((compress_tag == COMPRESSION_CCITTFAX3) && -- (photometric != PHOTOMETRIC_MINISWHITE)) -- { -- compress_tag=COMPRESSION_NONE; -- endian=FILLORDER_MSB2LSB; -- } -- else -- if ((compress_tag == COMPRESSION_CCITTFAX4) && -- (photometric != PHOTOMETRIC_MINISWHITE)) -- { -- compress_tag=COMPRESSION_NONE; -- endian=FILLORDER_MSB2LSB; -- } -+ if ((compress_tag == COMPRESSION_CCITTFAX4) && -+ (photometric != PHOTOMETRIC_MINISWHITE)) -+ { -+ compress_tag=COMPRESSION_NONE; -+ endian=FILLORDER_MSB2LSB; -+ } - (void) TIFFSetField(tiff,TIFFTAG_COMPRESSION,compress_tag); - (void) TIFFSetField(tiff,TIFFTAG_FILLORDER,endian); - (void) TIFFSetField(tiff,TIFFTAG_BITSPERSAMPLE,quantum_info->depth); diff --git a/ImageMagick.changes b/ImageMagick.changes index 085391f..af7ab7f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 22 17:37:54 CEST 2010 - pgajdos@suse.cz - -- fixed jpeg compression of grayscale tif format [bnc#615223] - ------------------------------------------------------------------- Mon May 10 15:19:58 UTC 2010 - aj@suse.de diff --git a/ImageMagick.spec b/ImageMagick.spec index f3cc254..eee3426 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -43,7 +43,6 @@ Source3: baselibs.conf Patch1: ImageMagick-%{version}-examples.patch Patch2: ImageMagick-%{version}-doc.patch Patch3: ImageMagick-%{version}-units.patch -Patch4: ImageMagick-%{version}-grayscale-tiff-jpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -122,7 +121,6 @@ rm -rf xtp-%{xtp_version} %patch1 %patch2 %patch3 -p1 -%patch4 -p1 %build %define system_ltdl 0