OpenSystemsDevelopment / qpdf

Commit 4ff837f099c4594fbb95463ebfd6199051d0fa30

Authored by m-holger
Committed by Jay Berkenbilt
1 parent 235c89e0

Fix tests for Form XObjects 

Remove test for type == /XObject in QPDFObjectHandle::isFormXObject
as type value is optional (as per spec 8.10.2).

Replace code to test for /Form in QPDFJob::shouldRemoveUnreferencedResources
with a call to isFormXObject.
Inline Side-by-side
Showing 2 changed files with 2 additions and 8 deletions
libqpdf/QPDFJob.cc
  View file @4ff837f
@@ -2743,13 +2743,7 @@ QPDFJob::shouldRemoveUnreferencedResources(QPDF& pdf) @@ -2743,13 +2743,7 @@ QPDFJob::shouldRemoveUnreferencedResources(QPDF& pdf)
2743 for (auto const& k: xobject.getKeys()) 2743 for (auto const& k: xobject.getKeys())
2744 { 2744 {
2745 QPDFObjectHandle xobj = xobject.getKey(k); 2745 QPDFObjectHandle xobj = xobject.getKey(k);
2746 - if (xobj.isStream() &&  
2747 - xobj.getDict().getKey("/Type").isName() &&  
2748 - ("/XObject" ==  
2749 - xobj.getDict().getKey("/Type").getName()) &&  
2750 - xobj.getDict().getKey("/Subtype").isName() &&  
2751 - ("/Form" ==  
2752 - xobj.getDict().getKey("/Subtype").getName())) 2746 + if (xobj.isFormXObject())
2753 { 2747 {
2754 queue.push_back(xobj); 2748 queue.push_back(xobj);
2755 } 2749 }
libqpdf/QPDFObjectHandle.cc
  View file @4ff837f
@@ -3406,7 +3406,7 @@ QPDFObjectHandle::isPagesObject() @@ -3406,7 +3406,7 @@ QPDFObjectHandle::isPagesObject()
3406 bool 3406 bool
3407 QPDFObjectHandle::isFormXObject() 3407 QPDFObjectHandle::isFormXObject()
3408 { 3408 {
3409 - return isStreamOfType("/XObject", "/Form"); 3409 + return isStreamOfType("", "/Form");
3410 } 3410 }
3411 3411
3412 bool 3412 bool