diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 7cae11e..f3d909d 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -766,14 +766,14 @@ QPDFObjectHandle::isScalar() const bool QPDFObjectHandle::isNameAndEquals(std::string const& name) const { - return isName() && (getName() == name); + return Name(*this) == name; } bool QPDFObjectHandle::isDictionaryOfType(std::string const& type, std::string const& subtype) const { - return isDictionary() && (type.empty() || getKey("/Type").isNameAndEquals(type)) && - (subtype.empty() || getKey("/Subtype").isNameAndEquals(subtype)); + return isDictionary() && (type.empty() || Name((*this)["/Type"]) == type) && + (subtype.empty() || Name((*this)["/Subtype"]) == subtype); } bool @@ -987,7 +987,6 @@ QPDFObjectHandle::getName() const return obj->getStringValue(); } else { typeWarning("name", "returning dummy name"); - QTC::TC("qpdf", "QPDFObjectHandle name returning dummy name"); return "/QPDFFakeName"; } } diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov index 930cfec..5a51e84 100644 --- a/qpdf/qpdf.testcov +++ b/qpdf/qpdf.testcov @@ -275,7 +275,6 @@ QPDFParser eof in parse 0 QPDFParser eof in parseRemainder 0 QPDFObjectHandle boolean returning false 0 QPDFObjectHandle real returning 0.0 0 -QPDFObjectHandle name returning dummy name 0 QPDFObjectHandle string returning empty string 0 QPDFObjectHandle string returning empty utf8 0 QPDFObjectHandle operator returning fake value 0