OpenSystemsDevelopment / qpdf

Commit 91ce55a4e3c1f29f4710499464b61dc014bb7588

Authored by Jay Berkenbilt
1 parent fc5ca3b1

2.1 

git-svn-id: svn+q:///qpdf/trunk@913 71b93d88-0707-0410-a8cf-f5a4172ac649
Inline Side-by-side
Showing 4 changed files with 11 additions and 11 deletions
configure.ac
  View file @91ce55a
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
2 dnl This config.in requires autoconf 2.5 or greater. 2 dnl This config.in requires autoconf 2.5 or greater.
3 3
4 AC_PREREQ(2.60) 4 AC_PREREQ(2.60)
5 -AC_INIT(qpdf,2.1.rc1) 5 +AC_INIT(qpdf,2.1)
6 6
7 AC_CONFIG_MACRO_DIR([m4]) 7 AC_CONFIG_MACRO_DIR([m4])
8 AC_CONFIG_FILES([autoconf.mk]) 8 AC_CONFIG_FILES([autoconf.mk])
libqpdf/QPDF.cc
  View file @91ce55a
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 #include <qpdf/QPDF_Null.hh> 15 #include <qpdf/QPDF_Null.hh>
16 #include <qpdf/QPDF_Dictionary.hh> 16 #include <qpdf/QPDF_Dictionary.hh>
17 17
18 -std::string QPDF::qpdf_version = "2.1.rc1"; 18 +std::string QPDF::qpdf_version = "2.1";
19 19
20 void 20 void
21 QPDF::InputSource::setLastOffset(off_t offset) 21 QPDF::InputSource::setLastOffset(off_t offset)
@@ -425,9 +425,9 @@ QPDF::setTrailer(QPDFObjectHandle obj) @@ -425,9 +425,9 @@ QPDF::setTrailer(QPDFObjectHandle obj)
425 void 425 void
426 QPDF::reconstruct_xref(QPDFExc& e) 426 QPDF::reconstruct_xref(QPDFExc& e)
427 { 427 {
428 - static PCRE obj_re("^(\\d+) (\\d+) obj\\b");  
429 - static PCRE endobj_re("^endobj\\b");  
430 - static PCRE trailer_re("^trailer\\b"); 428 + static PCRE obj_re("^\\s*(\\d+)\\s+(\\d+)\\s+obj\\b");
  429 + static PCRE endobj_re("^\\s*endobj\\b");
  430 + static PCRE trailer_re("^\\s*trailer\\b");
431 431
432 warn(QPDFExc(qpdf_e_damaged_pdf, this->file.getName(), "", 0, 432 warn(QPDFExc(qpdf_e_damaged_pdf, this->file.getName(), "", 0,
433 "file is damaged")); 433 "file is damaged"));
@@ -561,7 +561,7 @@ QPDF::read_xref(off_t xref_offset) @@ -561,7 +561,7 @@ QPDF::read_xref(off_t xref_offset)
561 int 561 int
562 QPDF::read_xrefTable(off_t xref_offset) 562 QPDF::read_xrefTable(off_t xref_offset)
563 { 563 {
564 - static PCRE xref_first_re("^(\d+)\s+(\d+)"); 564 + static PCRE xref_first_re("^\\s*(\d+)\s+(\d+)");
565 static PCRE xref_entry_re("(?s:(^\\d{10}) (\\d{5}) ([fn])[ \r\n]{2}$)"); 565 static PCRE xref_entry_re("(?s:(^\\d{10}) (\\d{5}) ([fn])[ \r\n]{2}$)");
566 566
567 std::vector<ObjGen> deleted_items; 567 std::vector<ObjGen> deleted_items;
@@ -1350,7 +1350,7 @@ int @@ -1350,7 +1350,7 @@ int
1350 QPDF::recoverStreamLength(InputSource* input, 1350 QPDF::recoverStreamLength(InputSource* input,
1351 int objid, int generation, off_t stream_offset) 1351 int objid, int generation, off_t stream_offset)
1352 { 1352 {
1353 - static PCRE endobj_re("^endobj\b"); 1353 + static PCRE endobj_re("^\\s*endobj\b");
1354 1354
1355 // Try to reconstruct stream length by looking for 1355 // Try to reconstruct stream length by looking for
1356 // endstream(\r\n?|\n)endobj 1356 // endstream(\r\n?|\n)endobj
manual/qpdf-manual.xml
  View file @91ce55a
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 <!ENTITY mdash "&#x2014;"> 5 <!ENTITY mdash "&#x2014;">
6 <!ENTITY ndash "&#x2013;"> 6 <!ENTITY ndash "&#x2013;">
7 <!ENTITY nbsp "&#xA0;"> 7 <!ENTITY nbsp "&#xA0;">
8 -<!ENTITY swversion "2.1.rc1">  
9 -<!ENTITY lastreleased "October 24, 2009"> 8 +<!ENTITY swversion "2.1">
  9 +<!ENTITY lastreleased "October 30, 2009">
10 ]> 10 ]>
11 <book> 11 <book>
12 <bookinfo> 12 <bookinfo>
@@ -2072,7 +2072,7 @@ print &quot;\n&quot;; @@ -2072,7 +2072,7 @@ print &quot;\n&quot;;
2072 </para> 2072 </para>
2073 <variablelist> 2073 <variablelist>
2074 <varlistentry> 2074 <varlistentry>
2075 - <term>2.1.rc1: October 24, 2009</term> 2075 + <term>2.1: October 30, 2009</term>
2076 <listitem> 2076 <listitem>
2077 <itemizedlist> 2077 <itemizedlist>
2078 <listitem> 2078 <listitem>
qpdf.spec
  View file @91ce55a
1 Summary: Command-line tools and library for transforming PDF files 1 Summary: Command-line tools and library for transforming PDF files
2 Name: qpdf 2 Name: qpdf
3 -Version: 2.1.rc1 3 +Version: 2.1
4 Release: 1%{?dist} 4 Release: 1%{?dist}
5 License: Artistic 5 License: Artistic
6 Group: System Environment/Libraries 6 Group: System Environment/Libraries