octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-05-31 09:20:52 +00:00
Code Issues Releases Wiki Activity

Remove SparseOHArray::erase

Browse Source
This commit is contained in:
m-holger 2023-03-29 15:53:34 +01:00
parent 6295da436f
commit 1c85e7ece4
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libqpdf/QPDF_Array.cc
View File

@ -284,7 +284,20 @@ QPDF_Array::erase(int at)
return false;
}
if (sparse) {
sp_elements.erase(at);
auto end = sp_elements.elements.end();
if (auto iter = sp_elements.elements.lower_bound(at); iter != end) {
if (iter->first == at) {
iter++;
sp_elements.elements.erase(at);
}
while (iter != end) {
auto nh = sp_elements.elements.extract(iter++);
--nh.key();
sp_elements.elements.insert(std::move(nh));
}
}
--sp_elements.n_elements;
} else {
elements.erase(elements.cbegin() + at);
}

19
libqpdf/SparseOHArray.cc
View File

@ -30,25 +30,6 @@ SparseOHArray::disconnect()
}
}
void
SparseOHArray::erase(int at)
{
auto end = elements.end();
if (auto iter = elements.lower_bound(at); iter != end) {
if (iter->first == at) {
iter++;
elements.erase(at);
}
while (iter != end) {
auto nh = elements.extract(iter++);
--nh.key();
elements.insert(std::move(nh));
}
}
--n_elements;
}
SparseOHArray
SparseOHArray::copy()
{

1
libqpdf/qpdf/SparseOHArray.hh
View File

@ -33,7 +33,6 @@ class SparseOHArray
{
elements[idx] = oh.getObj();
}
void erase(int idx);
SparseOHArray copy();
void disconnect();