[cpp] introduce a boolean font_info_cache_initialized, to distinguish an initialized-but-empty cache from the uninitialized cache

Co-authored-by: Adam Reichold <adam.reichold@t-online.de>

2 files changed, 4 insertions, 1 deletions

diff --git a/cpp/poppler-page-private.h b/cpp/poppler-page-private.h
index 3e2ee914..d4954e9d 100644
--- a/cpp/poppler-page-private.h
+++ b/cpp/poppler-page-private.h
@@ -49,6 +49,7 @@ public:
     { return const_cast<poppler::page *>(p)->d; }
 
     std::vector<font_info> font_info_cache;
+    bool font_info_cache_initialized;
     size_t init_font_info_cache();
 };
 
diff --git a/cpp/poppler-page.cpp b/cpp/poppler-page.cpp
index b0bf847e..e44ef26e 100644
--- a/cpp/poppler-page.cpp
+++ b/cpp/poppler-page.cpp
@@ -48,6 +48,7 @@ page_private::page_private(document_private *_doc, int _index)
     , page(doc->doc->getCatalog()->getPage(_index + 1))
     , index(_index)
     , transition(nullptr)
+    , font_info_cache_initialized(false)
 {
 }
 
@@ -58,7 +59,7 @@ page_private::~page_private()
 
 size_t page_private::init_font_info_cache()
 {
-    if (font_info_cache.size() > 0)
+    if (font_info_cache_initialized)
 	return font_info_cache.size();
 
     poppler::font_iterator it(index, doc);
@@ -67,6 +68,7 @@ size_t page_private::init_font_info_cache()
 	font_info_cache = it.next();
     }
 
+    font_info_cache_initialized = true;
     return font_info_cache.size();
 }