Refactor `QPDF::validatePDFVersion`: relocate from `QPDF` to `Objects`, update u…

…sages, and clean up `QPDF.hh`.

Refactor `QPDF::validatePDFVersion`: relocate from `QPDF` to `Objects`, update u…
…sages, and clean up `QPDF.hh`.
m-holger
1 parent 85b96841
Showing 5 changed files with 22 additions and 22 deletions
include/qpdf/QPDF.hh
libqpdf/QPDF.cc
libqpdf/QPDF_json.cc
libqpdf/QPDF_objects.cc
libqpdf/qpdf/QPDF_private.hh
@@ -791,8 +791,6 @@ class QPDF
         bool is_root_metadata,
         std::unique_ptr<Pipeline>& heap);
-    static bool validatePDFVersion(char const*&, std::string& version);
-
     // JSON import
     void importJSON(std::shared_ptr<InputSource>, bool must_be_complete);
@@ -315,25 +315,6 @@ QPDF::numWarnings() const
     return m->warnings.size();
 }
-bool
-QPDF::validatePDFVersion(char const*& p, std::string& version)
-{
-    if (!util::is_digit(*p)) {
-        return false;
-    }
-    while (util::is_digit(*p)) {
-        version.append(1, *p++);
-    }
-    if (!(*p == '.' && util::is_digit(*(p + 1)))) {
-        return false;
-    }
-    version.append(1, *p++);
-    while (util::is_digit(*p)) {
-        version.append(1, *p++);
-    }
-    return true;
-}
-
 void
 QPDF::warn(QPDFExc const& e)
 {
@@ -482,7 +482,7 @@ QPDF::JSONReactor::dictionaryItem(std::string const&amp; key, JSON const&amp; value)
             if (value.getString(v)) {
                 std::string version;
                 char const* p = v.c_str();
-                if (QPDF::validatePDFVersion(p, version) && (*p == '\0')) {
+                if (objects.validatePDFVersion(p, version) && *p == '\0') {
                     pdf.m->pdf_version = version;
                     return true;
                 }
@@ -123,6 +123,25 @@ class Objects::PatternFinder final: public InputSource::Finder
 };
 bool
+Objects::validatePDFVersion(char const*& p, std::string& version)
+{
+    if (!util::is_digit(*p)) {
+        return false;
+    }
+    while (util::is_digit(*p)) {
+        version.append(1, *p++);
+    }
+    if (!(*p == '.' && util::is_digit(*(p + 1)))) {
+        return false;
+    }
+    version.append(1, *p++);
+    while (util::is_digit(*p)) {
+        version.append(1, *p++);
+    }
+    return true;
+}
+
+bool
 Objects::findHeader()
 {
     qpdf_offset_t global_offset = m->file->tell();
@@ -1000,6 +1000,8 @@ class QPDF::Doc::Objects: Common
     std::shared_ptr<QPDFObject> getObjectForJSON(int id, int gen);
     size_t table_size();
+    static bool validatePDFVersion(char const*&, std::string& version);
+
     // For QPDFWriter:
     std::map<QPDFObjGen, QPDFXRefEntry> const& xref_table();