Refactor QPDF::createFromJSON

m-holger
1 parent 88fd7ca9
Showing 3 changed files with 12 additions and 12 deletions
libqpdf/QPDF.cc
libqpdf/QPDF_json.cc
libqpdf/qpdf/QPDF_private.hh
@@ -495,6 +495,14 @@ QPDF::Xref_table::initialize_empty()
 }
  
 void
+QPDF::Xref_table::initialize_json()
+{
+    initialized_ = true;
+    trailer_ = QPDFObjectHandle::newDictionary();
+    trailer_.replaceKey("/Size", QPDFObjectHandle::newInteger(1));
+}
+
+void
 QPDF::Xref_table::initialize()
 {
     // PDF spec says %%EOF must be found within the last 1024 bytes of/ the file.  We add an extra
@@ -51,17 +51,6 @@
 //   ]                            |   <- st_top
 // }                              |
  
-static char const* JSON_PDF = (
-    // force line break
-    "%PDF-1.3\n"
-    "xref\n"
-    "0 1\n"
-    "0000000000 65535 f \n"
-    "trailer << /Size 1 >>\n"
-    "startxref\n"
-    "9\n"
-    "%%EOF\n");
-
 // Validator methods -- these are much more performant than std::regex.
 static bool
 is_indirect_object(std::string const& v, int& obj, int& gen)
@@ -785,7 +774,9 @@ QPDF::createFromJSON(std::string const&amp; json_file)
 void
 QPDF::createFromJSON(std::shared_ptr<InputSource> is)
 {
-    processMemoryFile(is->getName().c_str(), JSON_PDF, strlen(JSON_PDF));
+    m->pdf_version = "1.3";
+    m->no_input_name = is->getName();
+    m->xref_table.initialize_json();
     importJSON(is, true);
 }
  
@@ -16,6 +16,7 @@ class QPDF::Xref_table
  
     void initialize();
     void initialize_empty();
+    void initialize_json();
     void reconstruct(QPDFExc& e);
     void show();
     bool resolve();