From e7a85545639d6d09923abb8fb300dda5889b110b Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 31 Dec 2020 11:38:27 -0500
Subject: QPDFPageObjectHelper::getPageImages: support form XObjects

---
 libqpdf/QPDFObjectHandle.cc | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

(limited to 'libqpdf/QPDFObjectHandle.cc')

diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 181793f4..d5d199d9 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -1320,35 +1320,7 @@ QPDFObjectHandle::getGeneration() const
 std::map<std::string, QPDFObjectHandle>
 QPDFObjectHandle::getPageImages()
 {
-    std::map<std::string, QPDFObjectHandle> result;
-    QPDFObjectHandle resources =
-        QPDFPageObjectHelper(*this).getAttribute("/Resources", false);
-    if (resources.isDictionary())
-    {
-	if (resources.hasKey("/XObject"))
-	{
-	    QPDFObjectHandle xobject = resources.getKey("/XObject");
-	    std::set<std::string> keys = xobject.getKeys();
-	    for (std::set<std::string>::iterator iter = keys.begin();
-		 iter != keys.end(); ++iter)
-	    {
-		std::string key = (*iter);
-		QPDFObjectHandle value = xobject.getKey(key);
-		if (value.isStream())
-		{
-		    QPDFObjectHandle dict = value.getDict();
-		    if (dict.hasKey("/Subtype") &&
-			(dict.getKey("/Subtype").getName() == "/Image") &&
-			(! dict.hasKey("/ImageMask")))
-		    {
-			result[key] = value;
-		    }
-		}
-	    }
-	}
-    }
-
-    return result;
+    return QPDFPageObjectHelper(*this).getPageImages();
 }
 
 std::vector<QPDFObjectHandle>
-- 
cgit v1.2.3-54-g00ecf