pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 43436 from graphics

Browse Source 
Copy from graphics/ImageMagick based on submit request 43436 from user coolo

OBS-URL: https://build.opensuse.org/request/show/43436
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=38
This commit is contained in:
OBS User autobuild 2010-07-20 18:44:26 +00:00 committed by Git OBS Bridge
commit 3de1f8aaa5
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch Normal file
View File

@ -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);

5
ImageMagick.changes
View File

@ -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

4
ImageMagick.spec
View File

@ -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