Refactor `String::utf8_value`: inline `QPDF_String::getUTF8Val`, remove redundant implementation.

m-holger
1 parent 8dc8e8c3
Showing 3 changed files with 9 additions and 16 deletions
libqpdf/QPDFObjectHandle.cc
libqpdf/QPDF_String.cc
libqpdf/qpdf/QPDFObject_private.hh
@@ -1040,7 +1040,15 @@ String::utf8_value() const
     if (!s) {
         throw invalid_error("String");
     }
-    return s->getUTF8Val();
+    if (util::is_utf16(s->val)) {
+        return QUtil::utf16_to_utf8(s->val);
+    }
+    if (util::is_explicit_utf8(s->val)) {
+        // PDF 2.0 allows UTF-8 strings when explicitly prefixed with the three-byte representation
+        // of U+FEFF.
+        return s->val.substr(3);
+    }
+    return QUtil::pdf_doc_to_utf8(s->val);
 }
  
 std::string
@@ -150,17 +150,3 @@ QPDF_String::unparse(bool force_binary)
  
     return result;
 }
-
-std::string
-QPDF_String::getUTF8Val() const
-{
-    if (util::is_utf16(val)) {
-        return QUtil::utf16_to_utf8(val);
-    }
-    if (util::is_explicit_utf8(val)) {
-        // PDF 2.0 allows UTF-8 strings when explicitly prefixed with the three-byte representation
-        // of U+FEFF.
-        return val.substr(3);
-    }
-    return QUtil::pdf_doc_to_utf8(val);
-}
@@ -269,7 +269,6 @@ class QPDF_String final
     static std::shared_ptr<QPDFObject> create_utf16(std::string const& utf8_val);
     std::string unparse(bool force_binary = false);
     void writeJSON(int json_version, JSON::Writer& p);
-    std::string getUTF8Val() const;
  
   private:
     QPDF_String(std::string const& val) :