[poppler/f14] Access correct variable Backport of fix of upstream bug #33063 Resolves: #702126

[mkasik]

commit 49b16180dfca134a97f1fd4dad6497a42bcb2c0c
Author: Marek Kasik <mkasik at redhat.com>
Date:   Tue Jun 21 17:11:34 2011 +0200

    Access correct variable
    Backport of fix of upstream bug #33063
    Resolves: #702126

 poppler-0.14.5-access-correct-variable.patch |   20 ++++++++++++++++++++
 poppler.spec                                 |   10 +++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/poppler-0.14.5-access-correct-variable.patch b/poppler-0.14.5-access-correct-variable.patch
new file mode 100644
index 0000000..2ed3b44
--- /dev/null
+++ b/poppler-0.14.5-access-correct-variable.patch
@@ -0,0 +1,20 @@
+--- poppler-0.14.5/poppler/Annot.cc	2011-06-21 16:54:11.000000000 +0200
++++ poppler-0.14.5/poppler/Annot.cc	2011-06-21 16:55:19.000000000 +0200
+@@ -15,7 +15,7 @@
+ //
+ // Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
+ // Copyright (C) 2007, 2008 Julien Rebetez <julienr at svn.gnome.org>
+-// Copyright (C) 2007-2010 Albert Astals Cid <aacid at kde.org>
++// Copyright (C) 2007-2011 Albert Astals Cid <aacid at kde.org>
+ // Copyright (C) 2007-2010 Carlos Garcia Campos <carlosgc at gnome.org>
+ // Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez at gmail.com>
+ // Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
+@@ -3780,7 +3780,7 @@ void AnnotWidget::generateFieldAppearanc
+                   obj3.arrayGetLength() > 0) {
+                 dx = rect->x2 - rect->x1;
+                 dy = rect->y2 - rect->y1;
+-		aColor = AnnotColor (obj1.getArray());
++		aColor = AnnotColor (obj3.getArray());
+                 setColor(&aColor, gTrue);
+                 drawCircle(0.5 * dx, 0.5 * dy, 0.2 * (dx < dy ? dx : dy),
+                     gTrue);
diff --git a/poppler.spec b/poppler.spec
index e99cd64..3a31c2f 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.14.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -15,6 +15,8 @@ Patch104: poppler-0.12.4-annot-appearance.patch
 Patch105: poppler-0.14.5-check-numbers.patch
 
 ## upstream patches
+# http://bugzilla.redhat.com/show_bug.cgi?id=702126
+Patch110: poppler-0.14.5-access-correct-variable.patch
 
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
@@ -138,6 +140,7 @@ converting PDF files to a number of other formats.
 
 %patch104 -p1 -b .annot
 %patch105 -p1 -b .check-numbers
+%patch110 -p1 -b .access-correct-variable
 
 chmod -x goo/GooTimer.h
 
@@ -248,6 +251,11 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %changelog
+* Tue Jun 21 2011 Marek Kasik <mkasik at redhat.com> - 0.14.5-3
+- Access correct variable
+- Backport of fix of upstream bug #33063
+- Resolves: #702126
+
 * Thu Nov 25 2010 Marek Kasik <mkasik at redhat.com> - 0.14.5-2
 - Check the objects are numbers before using them
 - Resolves: #625744