Attachment 94392 Details for Bug 75232 – Patch for the issue

Patch for the issue

PATCH (text/plain), 2.97 KB, created by Albert Astals Cid on 2014-02-20 00:04:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Albert Astals Cid

Created: 2014-02-20 00:04:09 UTC

Size: 2.97 KB

patch

obsolete

>diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
>index d7aae9f..aad90dd 100644
>--- a/poppler/PDFDoc.cc
>+++ b/poppler/PDFDoc.cc
>@@ -259,9 +259,16 @@ GBool PDFDoc::setup(GooString *ownerPassword, GooString *userPassword) {
>   // read xref table
>   xref = new XRef(str, getStartXRef(), getMainXRefEntriesOffset(), &wasReconstructed);
>   if (!xref->isOk()) {
>-    error(errSyntaxError, -1, "Couldn't read xref table");
>-    errCode = xref->getErrorCode();
>-    return gFalse;
>+    if (wasReconstructed) {
>+      delete xref;
>+      startXRefPos = -1;
>+      xref = new XRef(str, getStartXRef(gTrue), getMainXRefEntriesOffset(gTrue), &wasReconstructed);
>+    }
>+    if (!xref->isOk()) {
>+      error(errSyntaxError, -1, "Couldn't read xref table");
>+      errCode = xref->getErrorCode();
>+      return gFalse;
>+    }
>   }
> 
>   // check for encryption
>@@ -517,12 +524,16 @@ Linearization *PDFDoc::getLinearization()
>   return linearization;
> }
> 
>-GBool PDFDoc::isLinearized() {
>+GBool PDFDoc::isLinearized(GBool tryingToReconstruct) {
>   if ((str->getLength()) &&
>       (getLinearization()->getLength() == str->getLength()))
>     return gTrue;
>-  else
>-    return gFalse;
>+  else {
>+    if (tryingToReconstruct)
>+      return getLinearization()->getLength() > 0;
>+    else
>+      return gFalse;
>+  }
> }
> 
> static GBool
>@@ -1635,11 +1646,11 @@ long long PDFDoc::strToLongLong(char *s) {
> }
> 
> // Read the 'startxref' position.
>-Goffset PDFDoc::getStartXRef()
>+Goffset PDFDoc::getStartXRef(GBool tryingToReconstruct)
> {
>   if (startXRefPos == -1) {
> 
>-    if (isLinearized()) {
>+    if (isLinearized(tryingToReconstruct)) {
>       char buf[linearizationSearchSize+1];
>       int c, n, i;
> 
>@@ -1697,11 +1708,11 @@ Goffset PDFDoc::getStartXRef()
>   return startXRefPos;
> }
> 
>-Goffset PDFDoc::getMainXRefEntriesOffset()
>+Goffset PDFDoc::getMainXRefEntriesOffset(GBool tryingToReconstruct)
> {
>   Guint mainXRefEntriesOffset = 0;
> 
>-  if (isLinearized()) {
>+  if (isLinearized(tryingToReconstruct)) {
>     mainXRefEntriesOffset = getLinearization()->getMainXRefEntriesOffset();
>   }
> 
>diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
>index 42c7cba..58dd965 100644
>--- a/poppler/PDFDoc.h
>+++ b/poppler/PDFDoc.h
>@@ -219,7 +219,7 @@ public:
> 
> 
>   // Is this document linearized?
>-  GBool isLinearized();
>+  GBool isLinearized(GBool tryingToReconstruct = gFalse);
> 
>   // Return the document's Info dictionary (if any).
>   Object *getDocInfo(Object *obj) { return xref->getDocInfo(obj); }
>@@ -301,10 +301,10 @@ private:
>   void checkHeader();
>   GBool checkEncryption(GooString *ownerPassword, GooString *userPassword);
>   // Get the offset of the start xref table.
>-  Goffset getStartXRef();
>+  Goffset getStartXRef(GBool tryingToReconstruct = gFalse);
>   // Get the offset of the entries in the main XRef table of a
>   // linearized document (0 for non linearized documents).
>-  Goffset getMainXRefEntriesOffset();
>+  Goffset getMainXRefEntriesOffset(GBool tryingToReconstruct = gFalse);
>   long long strToLongLong(char *s);
> 
>   GooString *fileName;

Actions: View

Attachments on bug 75232: 94392

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.