diff --git a/libqpdf/CMakeLists.txt b/libqpdf/CMakeLists.txt index 3e5a703..cae1526 100644 --- a/libqpdf/CMakeLists.txt +++ b/libqpdf/CMakeLists.txt @@ -83,7 +83,6 @@ set(libqpdf_SOURCES QPDFTokenizer.cc QPDFUsage.cc QPDFWriter.cc - QPDFXRefEntry.cc QPDF_Array.cc QPDF_Dictionary.cc QPDF_Stream.cc diff --git a/libqpdf/QPDFXRefEntry.cc b/libqpdf/QPDFXRefEntry.cc deleted file mode 100644 index e8ad48a..0000000 --- a/libqpdf/QPDFXRefEntry.cc +++ /dev/null @@ -1,44 +0,0 @@ -#include - -#include -#include -#include - -using namespace qpdf; - -QPDFXRefEntry::QPDFXRefEntry() = default; - -QPDFXRefEntry::QPDFXRefEntry(int type, qpdf_offset_t field1, int field2) : - type(type), - field1(field1), - field2(field2) -{ - util::assertion(type == 1 || type == 2, "invalid xref type " + std::to_string(type)); -} - -int -QPDFXRefEntry::getType() const -{ - return type; -} - -qpdf_offset_t -QPDFXRefEntry::getOffset() const -{ - util::assertion(type == 1, "getOffset called for xref entry of type != 1"); - return this->field1; -} - -int -QPDFXRefEntry::getObjStreamNumber() const -{ - util::assertion(type == 2, "getObjStreamNumber called for xref entry of type != 2"); - return QIntC::to_int(field1); -} - -int -QPDFXRefEntry::getObjStreamIndex() const -{ - util::assertion(type == 2, "getObjStreamIndex called for xref entry of type != 2"); - return field2; -} diff --git a/libqpdf/QPDF_objects.cc b/libqpdf/QPDF_objects.cc index 48de898..7467289 100644 --- a/libqpdf/QPDF_objects.cc +++ b/libqpdf/QPDF_objects.cc @@ -26,6 +26,43 @@ using namespace std::literals; using Objects = QPDF::Doc::Objects; +QPDFXRefEntry::QPDFXRefEntry() = default; + +QPDFXRefEntry::QPDFXRefEntry(int type, qpdf_offset_t field1, int field2) : + type(type), + field1(field1), + field2(field2) +{ + util::assertion(type == 1 || type == 2, "invalid xref type " + std::to_string(type)); +} + +int +QPDFXRefEntry::getType() const +{ + return type; +} + +qpdf_offset_t +QPDFXRefEntry::getOffset() const +{ + util::assertion(type == 1, "getOffset called for xref entry of type != 1"); + return this->field1; +} + +int +QPDFXRefEntry::getObjStreamNumber() const +{ + util::assertion(type == 2, "getObjStreamNumber called for xref entry of type != 2"); + return QIntC::to_int(field1); +} + +int +QPDFXRefEntry::getObjStreamIndex() const +{ + util::assertion(type == 2, "getObjStreamIndex called for xref entry of type != 2"); + return field2; +} + namespace { class InvalidInputSource: public InputSource