rpms/GraphicsMagick/F-10 GraphicsMagick-1.1.14-png-alpha-463258.patch, NONE, 1.1 GraphicsMagick.spec, 1.22, 1.23

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13669

Modified Files:
	GraphicsMagick.spec 
Added Files:
	GraphicsMagick-1.1.14-png-alpha-463258.patch 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.14-4
- Spumux fails to handle png-type subtitles (#463258)


GraphicsMagick-1.1.14-png-alpha-463258.patch:
 png.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE GraphicsMagick-1.1.14-png-alpha-463258.patch ---
diff -up GraphicsMagick-1.1.14/coders/png.c~ GraphicsMagick-1.1.14/coders/png.c
--- GraphicsMagick-1.1.14/coders/png.c~	2008-01-17 18:09:45.000000000 +0200
+++ GraphicsMagick-1.1.14/coders/png.c	2009-08-03 23:24:53.000000000 +0300
@@ -2535,7 +2535,6 @@ static Image *ReadOnePNGImage(MngInfo *m
           break;
         indexes=GetIndexes(image);
 
-        q->opacity=OpaqueOpacity;
         if (storage_class == PseudoClass)
           {
             IndexPacket
@@ -2548,6 +2547,8 @@ static Image *ReadOnePNGImage(MngInfo *m
                 if (index < ping_info->num_trans)
                   q->opacity=
                     ScaleCharToQuantum(255-ping_info->trans[index]);
+                else
+                  q->opacity=OpaqueOpacity;
                 q++;
               }
             else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY)
@@ -2559,6 +2560,8 @@ static Image *ReadOnePNGImage(MngInfo *m
                 q->blue=image->colormap[index].blue;
                 if (q->red == transparent_color.opacity)
                   q->opacity=TransparentOpacity;
+                else
+                  q->opacity=OpaqueOpacity;
                 q++;
               }
           }
@@ -2569,6 +2572,8 @@ static Image *ReadOnePNGImage(MngInfo *m
                 q->green == transparent_color.green &&
                 q->blue == transparent_color.blue)
                q->opacity=TransparentOpacity;
+            else
+               q->opacity=OpaqueOpacity;
             q++;
           }
         if (!SyncImagePixels(image))


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-10/GraphicsMagick.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- GraphicsMagick.spec	11 Sep 2008 16:30:32 -0000	1.22
+++ GraphicsMagick.spec	21 Sep 2009 20:27:24 -0000	1.23
@@ -1,13 +1,14 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.14
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Patch0: GraphicsMagick-gslib.patch
 Patch1: GraphicsMagick-perl.patch
 Patch2: GraphicsMagick-1.1.10-gcc43.patch
+Patch3: http://scop.fedorapeople.org/patches/GraphicsMagick/GraphicsMagick-1.1.14-png-alpha-463258.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -88,8 +89,9 @@ however.
 %setup -q
 # Disabled, causing segfaults in the gslib code path
 #%patch0 -p 1 -b .gslib 
-%patch1 -p 1 -b .perl
+%patch1 -p1 -b .perl
 %patch2 -p1 -b .gcc43
+%patch3 -p1 -b .rhbug#463258
 # Regenerating configure script
 #autoconf
 
@@ -235,6 +237,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.14-4
+- Spumux fails to handle png-type subtitles (#463258)
+
 * Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-3
 - own all files properly