Refactor `QPDF` type conversion helpers: relocate methods to `qpdf::Doc::Common`…

…, replace direct calls with `QIntC` equivalents, and clean up `QPDF.hh`.

Refactor `QPDF` type conversion helpers: relocate methods to `qpdf::Doc::Common`…
…, replace direct calls with `QIntC` equivalents, and clean up `QPDF.hh`.
m-holger
1 parent 32d14f31
Showing 6 changed files with 36 additions and 31 deletions
examples/pdf-custom-filter.cc
include/qpdf/QPDF.hh
libqpdf/QPDF.cc
libqpdf/QPDF_encryption.cc
libqpdf/QPDF_objects.cc
libqpdf/qpdf/QPDF_private.hh
+
+#include <qpdf/QIntC.hh>
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFStreamFilter.hh>
 #include <qpdf/QPDFWriter.hh>
@@ -37,7 +37,6 @@
 #include <qpdf/Buffer.hh>
 #include <qpdf/InputSource.hh>
 #include <qpdf/PDFVersion.hh>
-#include <qpdf/QIntC.hh>
 #include <qpdf/QPDFExc.hh>
 #include <qpdf/QPDFObjGen.hh>
 #include <qpdf/QPDFObjectHandle.hh>
@@ -803,32 +802,6 @@ class QPDF
     // JSON import
     void importJSON(std::shared_ptr<InputSource>, bool must_be_complete);
-    // Type conversion helper methods
-    template <typename T>
-    static qpdf_offset_t
-    toO(T const& i)
-    {
-        return QIntC::to_offset(i);
-    }
-    template <typename T>
-    static size_t
-    toS(T const& i)
-    {
-        return QIntC::to_size(i);
-    }
-    template <typename T>
-    static int
-    toI(T const& i)
-    {
-        return QIntC::to_int(i);
-    }
-    template <typename T>
-    static unsigned long long
-    toULL(T const& i)
-    {
-        return QIntC::to_ulonglong(i);
-    }
-
     class Members;
     // Keep all member variables inside the Members object, which we dynamically allocate. This
@@ -761,7 +761,10 @@ QPDF::pipeStreamData(
         auto buf = file->read(length, offset);
         if (buf.size() != length) {
             throw qpdf_for_warning.m->c.damagedPDF(
-                *file, "", offset + toO(buf.size()), "unexpected EOF reading stream data");
+                *file,
+                "",
+                offset + QIntC::to_offset(buf.size()),
+                "unexpected EOF reading stream data");
         }
         pipeline->write(buf.data(), length);
         attempted_finish = true;
@@ -1010,7 +1010,7 @@ QPDF::decryptString(std::string&amp; str, QPDFObjGen og)
             // Using std::shared_ptr guarantees that tmp will be freed even if rc4.process throws an
             // exception.
             auto tmp = QUtil::make_unique_cstr(str);
-            RC4 rc4(QUtil::unsigned_char_pointer(key), toI(key.length()));
+            RC4 rc4(QUtil::unsigned_char_pointer(key), QIntC::to_int(key.length()));
             auto data = QUtil::unsigned_char_pointer(tmp.get());
             rc4.process(data, vlen, data);
             str = std::string(tmp.get(), vlen);
@@ -1138,7 +1138,7 @@ QPDF::getObjectCount()
     if (!m->obj_cache.empty()) {
         og = (*(m->obj_cache.rbegin())).first;
     }
-    return toS(og.getObj());
+    return QIntC::to_size(og.getObj());
 }
 std::vector<QPDFObjectHandle>
@@ -3,6 +3,7 @@
 #include <qpdf/QPDF.hh>
+#include <qpdf/QIntC.hh>
 #include <qpdf/QPDFAcroFormDocumentHelper.hh>
 #include <qpdf/QPDFEmbeddedFileDocumentHelper.hh>
 #include <qpdf/QPDFLogger.hh>
@@ -323,13 +324,39 @@ class QPDF::Doc
         }
       protected:
+        // Type conversion helper methods
+        template <typename T>
+        static qpdf_offset_t
+        toO(T const& i)
+        {
+            return QIntC::to_offset(i);
+        }
+        template <typename T>
+        static size_t
+        toS(T const& i)
+        {
+            return QIntC::to_size(i);
+        }
+        template <typename T>
+        static int
+        toI(T const& i)
+        {
+            return QIntC::to_int(i);
+        }
+        template <typename T>
+        static unsigned long long
+        toULL(T const& i)
+        {
+            return QIntC::to_ulonglong(i);
+        }
+
         QPDF& qpdf;
         QPDF::Members* m;
         qpdf::Doc::Config& cf;
         QPDF::Doc::Pages& pages;
         QPDF::Doc::Objects& objects;
-    };
+    }; // class qpdf::Doc::Common
     Doc() = delete;
     Doc(Doc const&) = delete;