rpms/ImageMagick/F-9 ImageMagick-6.3.8-icon.patch, NONE, 1.1 ImageMagick.spec, 1.75, 1.76

[Norman Murray (nmurray)]

Author: nmurray

Update of /cvs/pkgs/rpms/ImageMagick/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4053

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.3.8-icon.patch 
Log Message:
More conservative fix for BZ440136


ImageMagick-6.3.8-icon.patch:

--- NEW FILE ImageMagick-6.3.8-icon.patch ---
diff -up ImageMagick-6.3.8/coders/icon.c~ ImageMagick-6.3.8/coders/icon.c
--- ImageMagick-6.3.8/coders/icon.c~	2008-04-01 17:30:58.000000000 +0200
+++ ImageMagick-6.3.8/coders/icon.c	2008-04-01 17:30:58.000000000 +0200
@@ -501,7 +501,7 @@ static Image *ReadICONImage(const ImageI
             q->blue=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
             q->green=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
             q->red=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
-            if (image->matte != MagickFalse)
+            if (icon_info.bits_per_pixel == 32)
               q->opacity=(Quantum) QuantumRange-ScaleCharToQuantum(
                 (unsigned char) ReadBlobByte(image));
             q++;
@@ -527,7 +527,7 @@ static Image *ReadICONImage(const ImageI
         ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     }
     (void) SyncImage(image);
-    if (icon_info.bits_per_pixel <= 16)
+    if (icon_info.bits_per_pixel != 32)
       {
         /*
           Read the ICON alpha mask.


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/F-9/ImageMagick.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ImageMagick.spec	22 Apr 2008 23:57:17 -0000	1.75
+++ ImageMagick.spec	24 Apr 2008 00:56:27 -0000	1.76
@@ -1,7 +1,7 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
-%define VER 6.4.0
-%define Patchlevel 7
+%define VER 6.3.8
+%define Patchlevel 1
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
 %if "%{Patchlevel}" != ""
@@ -18,8 +18,8 @@
 Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
 %endif
 Source1: magick_small.png
-Patch1: ImageMagick-6.4.0-multilib.patch
-
+Patch1: ImageMagick-6.3.8-multilib.patch
+Patch2: ImageMagick-6.3.8-icon.patch
 
 
 
@@ -120,6 +120,7 @@
 %prep
 %setup -q -n %{name}-%{VER}
 %patch1 -p1 -b .multilib
+%patch2 -p1 -b .icon
 
 
 %build
@@ -182,10 +183,10 @@
 %define wordsize 32
 %endif
 
-mv $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h \
-   $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config-%{wordsize}.h
+mv $RPM_BUILD_ROOT%{_includedir}/magick/magick-config.h \
+   $RPM_BUILD_ROOT%{_includedir}/magick/magick-config-%{wordsize}.h
 
-cat >$RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h <<EOF
+cat >$RPM_BUILD_ROOT%{_includedir}/magick/magick-config.h <<EOF
 #ifndef ORBIT_MULTILIB
 #define ORBIT_MULTILIB
 
@@ -217,9 +218,9 @@
 %files
 %defattr(-,root,root)
 %doc QuickStart.txt ChangeLog Platforms.txt
-%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt
-%attr(755,root,root) %{_libdir}/libMagickCore.so.*
-%attr(755,root,root) %{_libdir}/libMagickWand.so.*
+%doc README.txt LICENSE NOTICE AUTHORS NEWS
+%attr(755,root,root) %{_libdir}/libMagick.so.*
+%attr(755,root,root) %{_libdir}/libWand.so.*
 %{_bindir}/[a-z]*
 %{_libdir}/ImageMagick*
 %{_datadir}/ImageMagick*
@@ -229,21 +230,16 @@
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/MagickCore-config
-%{_bindir}/MagickWand-config
 %{_bindir}/Magick-config
 %{_bindir}/Wand-config
-%{_libdir}/libMagickCore.so
-%{_libdir}/libMagickWand.so
+%{_libdir}/libMagick.so
+%{_libdir}/libWand.so
 %{_libdir}/pkgconfig/ImageMagick.pc
-%{_libdir}/pkgconfig/MagickCore.pc
-%{_libdir}/pkgconfig/MagickWand.pc
 %{_libdir}/pkgconfig/Wand.pc
-%{_includedir}/ImageMagick
+%{_includedir}/magick
+%{_includedir}/wand
 %{_mandir}/man1/Magick-config.*
 %{_mandir}/man1/Wand-config.*
-%{_mandir}/man1/MagickCore-config.*
-%{_mandir}/man1/MagickWand-config.*
 
 %files c++
 %defattr(-,root,root)
@@ -252,11 +248,10 @@
 %files c++-devel
 %defattr(-,root,root)
 %{_bindir}/Magick++-config
-%{_includedir}/ImageMagick/Magick++
-%{_includedir}/ImageMagick/Magick++.h
+%{_includedir}/Magick++
+%{_includedir}/Magick++.h
 %{_libdir}/libMagick++.so
 %{_libdir}/pkgconfig/ImageMagick++.pc
-%{_libdir}/pkgconfig/Magick++.pc
 %{_mandir}/man1/Magick++-config.*
 
 %files perl -f perl-pkg-files
@@ -265,8 +260,8 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
-* Tue Apr 22 2008 Norm Murray <nmurray at redhat.com> 6.4.0.7-1
-- update to 6.4.0.7
+* Tue Apr 22 2008 Norm Murray <nmurray at redhat.com> 6.3.8.1-4
+- 24 bpp ico handling fix from Hans de Goede <j.w.r.degoede at hhs.nl>
 
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 6.3.8.1-3
 - Rebuild for perl 5.10 (again)