From e938a629b5793e8357785ac6d3d5798ba7429eb4 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sun, 5 Feb 2012 23:03:18 +0100
Subject: Can't see any improvement in xpdf OptionalContent over ours, so just
 kill it

---
 ALL_DIFF | 44 --------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/ALL_DIFF b/ALL_DIFF
index aa07517..2ce031a 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -12,27 +12,9 @@ diff -ru xpdf-3.02/doc/pdftotext.1 xpdf-3.03/doc/pdftotext.1
  .B \-raw
  Keep the text in content stream order.  This is a hack which often
  "undoes" column formatting, etc.  Use of raw mode is no longer
-Només a xpdf-3.03/xpdf: OptionalContent.cc
-Només a xpdf-3.03/xpdf: OptionalContent.h
 diff -ru xpdf-3.02/xpdf/PDFDoc.cc xpdf-3.03/xpdf/PDFDoc.cc
 --- xpdf-3.02/xpdf/PDFDoc.cc	2007-02-27 23:05:52.000000000 +0100
 +++ xpdf-3.03/xpdf/PDFDoc.cc	2011-08-15 23:08:53.000000000 +0200
-@@ -36,6 +36,7 @@
- #ifndef DISABLE_OUTLINE
- #include "Outline.h"
- #endif
-+#include "OptionalContent.h"
- #include "PDFDoc.h"
- 
- //------------------------------------------------------------------------
-@@ -174,6 +199,7 @@
- #ifndef DISABLE_OUTLINE
-   outline = NULL;
- #endif
-+  optContent = NULL;
-   ok = setup(ownerPassword, userPassword);
- }
- 
 @@ -183,38 +209,71 @@
    // check header
    checkHeader();
@@ -56,9 +38,6 @@ diff -ru xpdf-3.02/xpdf/PDFDoc.cc xpdf-3.03/xpdf/PDFDoc.cc
 +  outline = new Outline(catalog->getOutline(), xref);
 +#endif
 +
-+  // read the optional content info
-+  optContent = new OptionalContent(this);
-+
 +  // done
 +  return gTrue;
 +}
@@ -146,24 +125,6 @@ diff -ru xpdf-3.02/xpdf/PDFDoc.cc xpdf-3.03/xpdf/PDFDoc.cc
 diff -ru xpdf-3.02/xpdf/PDFDoc.h xpdf-3.03/xpdf/PDFDoc.h
 --- xpdf-3.02/xpdf/PDFDoc.h	2007-02-27 23:05:52.000000000 +0100
 +++ xpdf-3.03/xpdf/PDFDoc.h	2011-08-15 23:08:53.000000000 +0200
-@@ -27,6 +27,8 @@
- class LinkAction;
- class LinkDest;
- class Outline;
-+class OptionalContent;
- 
- //------------------------------------------------------------------------
- // PDFDoc
-@@ -128,6 +133,9 @@
-   Outline *getOutline() { return outline; }
- #endif
- 
-+  // Return the OptionalContent object.
-+  OptionalContent *getOptionalContent() { return optContent; }
-+
-   // Is the file encrypted?
-   GBool isEncrypted() { return xref->isEncrypted(); }
- 
 @@ -154,27 +162,44 @@
  private:
  
@@ -186,11 +147,6 @@ diff -ru xpdf-3.02/xpdf/PDFDoc.h xpdf-3.03/xpdf/PDFDoc.h
  #ifndef DISABLE_OUTLINE
    Outline *outline;
  #endif
--
-+  OptionalContent *optContent;
- 
-   GBool ok;
-   int errCode;
 diff -ru xpdf-3.02/xpdf/pdftotext.cc xpdf-3.03/xpdf/pdftotext.cc
 --- xpdf-3.02/xpdf/pdftotext.cc	2007-02-27 23:05:52.000000000 +0100
 +++ xpdf-3.03/xpdf/pdftotext.cc	2011-08-15 23:08:53.000000000 +0200
-- 
cgit v1.2.3