xpdf303: Use the correct sizeof() for the greallocn

Plus things we do not need to merge

1 files changed, 0 insertions, 42 deletions

diff --git a/ALL_DIFF b/ALL_DIFF
index fa11db1..05161a0 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -20196,48 +20196,6 @@ diff -ru xpdf-3.02/xpdf/XRef.cc xpdf-3.03/xpdf/XRef.cc
  		}

  	      }

  	    }

-@@ -737,7 +772,7 @@

-       if (streamEndsLen == streamEndsSize) {

- 	streamEndsSize += 64;

- 	streamEnds = (Guint *)greallocn(streamEnds,

--					streamEndsSize, sizeof(int));

-+					streamEndsSize, sizeof(Guint));

-       }

-       streamEnds[streamEndsLen++] = pos;

-     }

-@@ -786,7 +821,7 @@

-   return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);

- }

- 

--Object *XRef::fetch(int num, int gen, Object *obj) {

-+Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {

-   XRefEntry *e;

-   Parser *parser;

-   Object obj1, obj2, obj3;

-@@ -808,9 +843,9 @@

- 	       new Lexer(this,

- 		 str->makeSubStream(start + e->offset, gFalse, 0, &obj1)),

- 	       gTrue);

--    parser->getObj(&obj1);

--    parser->getObj(&obj2);

--    parser->getObj(&obj3);

-+    parser->getObj(&obj1, gTrue);

-+    parser->getObj(&obj2, gTrue);

-+    parser->getObj(&obj3, gTrue);

-     if (!obj1.isInt() || obj1.getInt() != num ||

- 	!obj2.isInt() || obj2.getInt() != gen ||

- 	!obj3.isCmd("obj")) {

-@@ -820,8 +855,8 @@

-       delete parser;

-       goto err;

-     }

--    parser->getObj(obj, encrypted ? fileKey : (Guchar *)NULL,

--		   encAlgorithm, keyLength, num, gen);

-+    parser->getObj(obj, gFalse, encrypted ? fileKey : (Guchar *)NULL,

-+		   encAlgorithm, keyLength, num, gen, recursion);

-     obj1.free();

-     obj2.free();

-     obj3.free();

 diff -ru xpdf-3.02/xpdf/XRef.h xpdf-3.03/xpdf/XRef.h

 --- xpdf-3.02/xpdf/XRef.h	2007-02-27 23:05:52.000000000 +0100

 +++ xpdf-3.03/xpdf/XRef.h	2011-08-15 23:08:53.000000000 +0200