[poppler] poppler/Gfx.cc poppler/Gfx.h

[Albert Astals Cid]

 poppler/Gfx.cc |   14 ++------------
 poppler/Gfx.h  |    3 ---
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 303249e5548bfbf6823e97850e498970d802b4a0
Author: Albert Astals Cid <tsdgeos at samsung.localdomain>
Date:   Fri Aug 15 01:52:52 2008 +0200

    Revert 123a87aff2e35b10efe6a1d715585b427e4a9afa it creates problems with some pdf files

diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index e1cd847..41ccdb7 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -465,7 +465,6 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, int pageNum, Dict *resDict, Catalog *cata
 	 void *abortCheckCbkDataA) {
   int i;
 
-  lastResource = NULL;
   xref = xrefA;
   catalog = catalogA;
   subPage = gFalse;
@@ -510,7 +509,6 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict, Catalog *catalogA,
 	 void *abortCheckCbkDataA) {
   int i;
 
-  lastResource = NULL;
   xref = xrefA;
   catalog = catalogA;
   subPage = gTrue;
@@ -558,7 +556,6 @@ Gfx::~Gfx() {
   if (state) {
     delete state;
   }
-  delete lastResource;
 }
 
 void Gfx::display(Object *obj, GBool topLevel) {
@@ -4382,20 +4379,13 @@ void Gfx::restoreState() {
 }
 
 void Gfx::pushResources(Dict *resDict) {
-  if (lastResource && resDict == lastResourceDict) res = lastResource;
-  else
-  {
-    delete lastResource;
-    res = new GfxResources(xref, resDict, res);
-    lastResource = res;
-    lastResourceDict = resDict;
-  }
+  res = new GfxResources(xref, resDict, res);
 }
 
 void Gfx::popResources() {
   GfxResources *resPtr;
 
   resPtr = res->getNext();
-  if (resPtr == NULL) delete res;
+  delete res;
   res = resPtr;
 }
diff --git a/poppler/Gfx.h b/poppler/Gfx.h
index c56558f..10be638 100644
--- a/poppler/Gfx.h
+++ b/poppler/Gfx.h
@@ -173,9 +173,6 @@ private:
     (*abortCheckCbk)(void *data);
   void *abortCheckCbkData;
 
-  GfxResources *lastResource;	// last used GfxResource
-  Dict *lastResourceDict;	// last used GfxResource Dict
-
   static Operator opTab[];	// table of operators
 
   void go(GBool topLevel);