Commit 91ce55a4e3c1f29f4710499464b61dc014bb7588
1 parent
fc5ca3b1
2.1
git-svn-id: svn+q:///qpdf/trunk@913 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
4 changed files
with
11 additions
and
11 deletions
configure.ac
libqpdf/QPDF.cc
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | #include <qpdf/QPDF_Null.hh> |
| 16 | 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 | 20 | void |
| 21 | 21 | QPDF::InputSource::setLastOffset(off_t offset) |
| ... | ... | @@ -425,9 +425,9 @@ QPDF::setTrailer(QPDFObjectHandle obj) |
| 425 | 425 | void |
| 426 | 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 | 432 | warn(QPDFExc(qpdf_e_damaged_pdf, this->file.getName(), "", 0, |
| 433 | 433 | "file is damaged")); |
| ... | ... | @@ -561,7 +561,7 @@ QPDF::read_xref(off_t xref_offset) |
| 561 | 561 | int |
| 562 | 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 | 565 | static PCRE xref_entry_re("(?s:(^\\d{10}) (\\d{5}) ([fn])[ \r\n]{2}$)"); |
| 566 | 566 | |
| 567 | 567 | std::vector<ObjGen> deleted_items; |
| ... | ... | @@ -1350,7 +1350,7 @@ int |
| 1350 | 1350 | QPDF::recoverStreamLength(InputSource* input, |
| 1351 | 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 | 1355 | // Try to reconstruct stream length by looking for |
| 1356 | 1356 | // endstream(\r\n?|\n)endobj | ... | ... |
manual/qpdf-manual.xml
| ... | ... | @@ -5,8 +5,8 @@ |
| 5 | 5 | <!ENTITY mdash "—"> |
| 6 | 6 | <!ENTITY ndash "–"> |
| 7 | 7 | <!ENTITY nbsp " "> |
| 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 | 11 | <book> |
| 12 | 12 | <bookinfo> |
| ... | ... | @@ -2072,7 +2072,7 @@ print "\n"; |
| 2072 | 2072 | </para> |
| 2073 | 2073 | <variablelist> |
| 2074 | 2074 | <varlistentry> |
| 2075 | - <term>2.1.rc1: October 24, 2009</term> | |
| 2075 | + <term>2.1: October 30, 2009</term> | |
| 2076 | 2076 | <listitem> |
| 2077 | 2077 | <itemizedlist> |
| 2078 | 2078 | <listitem> | ... | ... |