[poppler] poppler/FontInfo.cc poppler/FontInfo.h

[Albert Astals Cid]

 poppler/FontInfo.cc |    6 +++---
 poppler/FontInfo.h  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7abd371364e6e4aaef932f26b0664f7f9d760c42
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Nov 28 13:57:50 2010 +0000

    this var is not about xobjects only anymroe

diff --git a/poppler/FontInfo.cc b/poppler/FontInfo.cc
index 908a40b..e7805ec 100644
--- a/poppler/FontInfo.cc
+++ b/poppler/FontInfo.cc
@@ -137,14 +137,14 @@ void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
       for (i = 0; i < objDict.dictGetLength(); ++i) {
         objDict.dictGetValNF(i, &obj1);
         if (obj1.isRef()) {
-          // check for an already-seen XObject
+          // check for an already-seen object
           const Ref r = obj1.getRef();
-          if (visitedXObjects.find(r.num) != visitedXObjects.end()) {
+          if (visitedObjects.find(r.num) != visitedObjects.end()) {
             obj1.free();
             continue;
           }
 
-          visitedXObjects.insert(r.num);
+          visitedObjects.insert(r.num);
         }
 
         obj1.fetch(doc->getXRef(), &obj2);
diff --git a/poppler/FontInfo.h b/poppler/FontInfo.h
index 7ecfad2..43ab019 100644
--- a/poppler/FontInfo.h
+++ b/poppler/FontInfo.h
@@ -85,7 +85,7 @@ private:
   PDFDoc *doc;
   int currentPage;
   std::set<int> fonts;
-  std::set<int> visitedXObjects;
+  std::set<int> visitedObjects;
 
   void scanFonts(Dict *resDict, GooList *fontsList);
 };