Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at Tue Jul 20 20:44:24 CEST 2010. -------- --- ImageMagick/ImageMagick.changes 2010-05-10 17:20:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/ImageMagick/ImageMagick.changes 2010-06-22 18:39:46.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 22 17:37:54 CEST 2010 - pgajdos@suse.cz + +- fixed jpeg compression of grayscale tif format [bnc#615223] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.IPdqiU/_old 2010-07-20 20:43:02.000000000 +0200 +++ /var/tmp/diff_new_pack.IPdqiU/_new 2010-07-20 20:43:02.000000000 +0200 @@ -30,7 +30,7 @@ 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 @@ 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 @@ %patch1 %patch2 %patch3 -p1 +%patch4 -p1 %build %define system_ltdl 0 ++++++ ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch ++++++ 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); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org