diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2012-06-22 15:46:33 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2012-06-22 15:46:33 +0200 |
| commit | b6bdc0f5950287c1c9e76115bdec230dcf99b964 (patch) | |
| tree | 5912f9a181e4350e7fd39867523081cd7d1327b4 /libqpdf | |
| parent | a0768e419064b66ea6eb3e06a4398806b24311e8 (diff) | |
| download | qpdf-b6bdc0f5950287c1c9e76115bdec230dcf99b964.tar.zst | |
Add factory methods for creating empty arrays and dictionaries.
Also updated pdf_from_scratch test driver to use the new factories,
and made some cosmetic improvements and documentation updates for the
emptyPDF() method.
Diffstat (limited to 'libqpdf')
| -rw-r--r-- | libqpdf/QPDF.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 12 | ||||
| -rw-r--r-- | libqpdf/QUtil.cc | 5 |
3 files changed, 17 insertions, 2 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index b0a8741c..5f1ab48c 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -370,7 +370,7 @@ QPDF::processMemoryFile(char const* description, void QPDF::emptyPDF() { - processMemoryFile("empty file", EMPTY_PDF, strlen(EMPTY_PDF)); + processMemoryFile("empty PDF", EMPTY_PDF, strlen(EMPTY_PDF)); } void diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index 1c2481f8..d0d911f7 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -616,12 +616,24 @@ QPDFObjectHandle::newString(std::string const& str) } QPDFObjectHandle +QPDFObjectHandle::newArray() +{ + return newArray(std::vector<QPDFObjectHandle>()); +} + +QPDFObjectHandle QPDFObjectHandle::newArray(std::vector<QPDFObjectHandle> const& items) { return QPDFObjectHandle(new QPDF_Array(items)); } QPDFObjectHandle +QPDFObjectHandle::newDictionary() +{ + return newDictionary(std::map<std::string, QPDFObjectHandle>()); +} + +QPDFObjectHandle QPDFObjectHandle::newDictionary( std::map<std::string, QPDFObjectHandle> const& items) { diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc index 3c3bf011..bdb73f54 100644 --- a/libqpdf/QUtil.cc +++ b/libqpdf/QUtil.cc @@ -1,5 +1,8 @@ -#include <qpdf/QUtil.hh> +// Include qpdf-config.h first so off_t is gauaranteed to have the right size. #include <qpdf/qpdf-config.h> + +#include <qpdf/QUtil.hh> + #include <stdio.h> #include <errno.h> #include <ctype.h> |