rpms/poppler/F-11 poppler-0.10.7-annot-appearance.patch, NONE, 1.1 poppler.spec, 1.87, 1.88

[Marek Kašík]

Author: mkasik

Update of /cvs/pkgs/rpms/poppler/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7688

Modified Files:
	poppler.spec 
Added Files:
	poppler-0.10.7-annot-appearance.patch 
Log Message:
* Thu Mar  4 2010 Marek Kasik <mkasik at redhat.com> - 0.10.7-4
- Fix showing of radio buttons (#480868)


poppler-0.10.7-annot-appearance.patch:
 Annot.cc |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE poppler-0.10.7-annot-appearance.patch ---
--- poppler-0.10.7/poppler/Annot.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/poppler/Annot.cc	2010-03-04 13:59:13.000000000 +0100
@@ -2882,7 +2882,10 @@ void AnnotWidget::generateFieldAppearanc
   obj1.free();
 
   // get the default appearance string
-  if (Form::fieldLookup(field, "DA", &obj1)->isNull()) {
+  if (Form::fieldLookup(annot, "DA", &obj1)->isNull()) {
+    obj1.free();
+  }
+  if (!obj1.isString() && Form::fieldLookup(field, "DA", &obj1)->isNull()) {
     obj1.free();
     acroForm->lookup("DA", &obj1);
   }


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-11/poppler.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- poppler.spec	25 Oct 2009 22:37:39 -0000	1.87
+++ poppler.spec	4 Mar 2010 13:58:50 -0000	1.88
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.10.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -24,6 +24,8 @@ Patch60: poppler-0.10.7-gmallocn.patch
 Patch61: poppler-0.10.7-CVE-2009-360x.patch
 # CVE-2009-3607 / c839b70609
 Patch62: poppler-0.10.7-CVE-2009-3607.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=480868
+Patch63: poppler-0.10.7-annot-appearance.patch
 
 BuildRequires: automake libtool
 BuildRequires: gtk2-devel
@@ -122,6 +124,7 @@ pushd %{name}-%{version}
 %patch60 -p1 -b .gmallocn
 %patch61 -p1 -b .CVE-2009-360x
 %patch62 -p1 -b .CVE-2009-3607
+%patch63 -p1 -b .annot
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 popd
@@ -233,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar  4 2010 Marek Kasik <mkasik at redhat.com> - 0.10.7-4
+- Fix showing of radio buttons (#480868)
+
 * Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.7-3
 - CVE-2009-3603 xpdf/popppler: SplashBitmap::SplashBitmap
   integer overflow (#526915)