From 2f3f88011604538240df5dddfa2fc335023c6af6146798fb1400cfe7fc186846 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 22 Jun 2010 16:39:48 +0000 Subject: [PATCH 1/3] - fixed jpeg compression of grayscale tif format [bnc#615223] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=32 --- ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch | 39 +++++++++++++++++++ ImageMagick.changes | 5 +++ ImageMagick.spec | 2 + 3 files changed, 46 insertions(+) create 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 new file mode 100644 index 0000000..081136a --- /dev/null +++ b/ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch @@ -0,0 +1,39 @@ +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 af7ab7f..085391f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 eee3426..f3cc254 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -43,6 +43,7 @@ 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 @@ -121,6 +122,7 @@ rm -rf xtp-%{xtp_version} %patch1 %patch2 %patch3 -p1 +%patch4 -p1 %build %define system_ltdl 0 From f1076accdac4a36b437de22e37c118fc2974963fd2d865a72b1dd429d4a6283d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Jul 2010 18:44:25 +0000 Subject: [PATCH 2/3] 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 From 763a9f7e638e4970802d80e71fd587d23dba260a19f9be859d3b8f01d7884cee Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 20 Jul 2010 18:44:26 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/ImageMagick revision 38.0 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=185465e19280670117f4d2d3a926e9a5 --- ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch | 39 +++++++++++++++++++ ImageMagick.changes | 5 +++ ImageMagick.spec | 4 +- 3 files changed, 47 insertions(+), 1 deletion(-) create 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 new file mode 100644 index 0000000..081136a --- /dev/null +++ b/ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch @@ -0,0 +1,39 @@ +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 af7ab7f..085391f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 eee3426..d919f41 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -30,7 +30,7 @@ License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on Version: 6.6.1.0 -Release: 3 +Release: 4 %define source_version 6.6.1-0 %define libver 3 Summary: Viewer and Converter for Images @@ -43,6 +43,7 @@ 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 @@ -121,6 +122,7 @@ rm -rf xtp-%{xtp_version} %patch1 %patch2 %patch3 -p1 +%patch4 -p1 %build %define system_ltdl 0