rpms/poppler/F-12 poppler-0.12.4-parse-cmap1.patch, NONE, 1.1 poppler.spec, 1.115, 1.116

[mkasik]

Author: mkasik

Update of /cvs/pkgs/rpms/poppler/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20222

Modified Files:
	poppler.spec 
Added Files:
	poppler-0.12.4-parse-cmap1.patch 
Log Message:
* Mon Jul 19 2010 Marek Kasik <mkasik at redhat.com> - 0.12.4-4
- Accept 4-digit values in ToUnicode CMaps
- (#574964)


poppler-0.12.4-parse-cmap1.patch:
 CharCodeToUnicode.cc |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE poppler-0.12.4-parse-cmap1.patch ---
--- poppler-0.12.4/poppler/CharCodeToUnicode.cc	2010-01-17 01:06:57.000000000 +0100
+++ poppler-0.12.4/poppler/CharCodeToUnicode.cc	2010-07-16 13:47:13.000000000 +0200
@@ -18,6 +18,7 @@
 // Copyright (C) 2007 Koji Otani <sho at bbr.jp>
 // Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
 // Copyright (C) 2008 Vasile Gaburici <gaburici at cs.umd.edu>
+// Copyright (C) 2010 William Bader <williambader at hotmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -307,8 +308,10 @@ void CharCodeToUnicode::parseCMap1(int (
 	  error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
 	  break;
 	}
-	if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
-	      n2 == 2 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>')) {
+	if (!(((n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>') ||
+	       (n1 == 4 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' && tok1[1] == '0' && tok1[2] == '0')) &&
+	      ((n2 == 2 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>') ||
+	       (n2 == 4 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>' && tok1[1] == '0' && tok1[2] == '0')))) {
 	  error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
 	  continue;
 	}


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/poppler.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- poppler.spec	29 Jun 2010 14:35:59 -0000	1.115
+++ poppler.spec	19 Jul 2010 11:43:58 -0000	1.116
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.12.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -25,6 +25,8 @@ Patch103: poppler-0.12.3-rotated-downsca
 Patch104: poppler-0.12.4-annot-appearance.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=606870
 Patch105: poppler-0.12.4-TextOutputDev.patch
+# http://bugzilla.redhat.com/show_bug.cgi?id=574964
+Patch106: poppler-0.12.4-parse-cmap1.patch
 
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
@@ -135,6 +137,7 @@ converting PDF files to a number of othe
 %patch103 -p1 -b .rotated-downscale
 %patch104 -p1 -b .annot
 %patch105 -p1 -b .text-output-dev
+%patch106 -p1 -b .parse-cmap1
 
 chmod -x goo/GooTimer.h
 
@@ -238,6 +241,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 19 2010 Marek Kasik <mkasik at redhat.com> - 0.12.4-4
+- Accept 4-digit values in ToUnicode CMaps
+- (#574964)
+
 * Tue Jun 29 2010 Marek Kasik <mkasik at redhat.com> - 0.12.4-3
 - Fix initialization of members of TextOutputDev in its constructor
 - (#606870)