diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2019-08-18 04:27:55 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2019-08-18 05:02:41 +0200 |
| commit | 5187a3ec85f1a83cbde9e77227e215a2dbcfccb0 (patch) | |
| tree | 23c9f79d872a46da2a5eba3b4ba66939276c9a7f | |
| parent | bf7c6a80705c2b913b63a84349e030f1d9dc8233 (diff) | |
| download | qpdf-5187a3ec85f1a83cbde9e77227e215a2dbcfccb0.tar.zst | |
Shallow copy arrays without removing sparseness
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 5 | ||||
| -rw-r--r-- | libqpdf/QPDF_Array.cc | 6 | ||||
| -rw-r--r-- | libqpdf/qpdf/QPDF_Array.hh | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index cd03ef1c..3fa0266c 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -2340,7 +2340,10 @@ QPDFObjectHandle::shallowCopy() if (isArray()) { QTC::TC("qpdf", "QPDFObjectHandle shallow copy array"); - new_obj = newArray(getArrayAsVector()); + // No newArray for shallow copying the sparse array + QPDF_Array* arr = dynamic_cast<QPDF_Array*>(m->obj.getPointer()); + new_obj = QPDFObjectHandle( + new QPDF_Array(arr->getElementsForShallowCopy())); } else if (isDictionary()) { diff --git a/libqpdf/QPDF_Array.cc b/libqpdf/QPDF_Array.cc index 45635f8a..31cd2dbc 100644 --- a/libqpdf/QPDF_Array.cc +++ b/libqpdf/QPDF_Array.cc @@ -136,3 +136,9 @@ QPDF_Array::eraseItem(int at) { this->elements.erase(QIntC::to_size(at)); } + +SparseOHArray const& +QPDF_Array::getElementsForShallowCopy() const +{ + return this->elements; +} diff --git a/libqpdf/qpdf/QPDF_Array.hh b/libqpdf/qpdf/QPDF_Array.hh index 08a5a608..eb0b594b 100644 --- a/libqpdf/qpdf/QPDF_Array.hh +++ b/libqpdf/qpdf/QPDF_Array.hh @@ -28,6 +28,8 @@ class QPDF_Array: public QPDFObject void appendItem(QPDFObjectHandle const& item); void eraseItem(int at); + SparseOHArray const& getElementsForShallowCopy() const; + protected: virtual void releaseResolved(); |