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

Inline QPDF_Array::getNItems and rename to size

Browse Source
This commit is contained in:
m-holger 2023-03-24 12:58:36 +00:00
parent e6db8ddeba
commit 51d350c98c
5 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libqpdf/QPDFObjectHandle.cc
View File

@ -789,9 +789,8 @@ QPDFObjectHandle::aitems()
int
QPDFObjectHandle::getArrayNItems()
{
auto array = asArray();
if (array) {
return array->getNItems();
if (auto array = asArray()) {
return array->size();
} else {
typeWarning("array", "treating as empty");
QTC::TC("qpdf", "QPDFObjectHandle array treating as empty");
@ -803,7 +802,7 @@ QPDFObjectHandle
QPDFObjectHandle::getArrayItem(int n)
{
auto array = asArray();
if (array && (n < array->getNItems()) && (n >= 0)) {
if (array && n < array->size() && n >= 0) {
return array->getItem(n);
} else {
if (array) {
@ -823,7 +822,7 @@ bool
QPDFObjectHandle::isRectangle()
{
auto array = asArray();
if ((array == nullptr) || (array->getNItems() != 4)) {
if (array == nullptr || array->size() != 4) {
return false;
}
for (int i = 0; i < 4; ++i) {
@ -838,7 +837,7 @@ bool
QPDFObjectHandle::isMatrix()
{
auto array = asArray();
if ((array == nullptr) || (array->getNItems() != 6)) {
if (array == nullptr || array->size() != 6) {
return false;
}
for (int i = 0; i < 6; ++i) {
@ -975,7 +974,7 @@ void
QPDFObjectHandle::eraseItem(int at)
{
auto array = asArray();
if (array && (at < array->getNItems()) && (at >= 0)) {
if (array && at < array->size() && at >= 0) {
array->eraseItem(at);
} else {
if (array) {
@ -991,11 +990,9 @@ QPDFObjectHandle::eraseItem(int at)
QPDFObjectHandle
QPDFObjectHandle::eraseItemAndGetOld(int at)
{
auto result = QPDFObjectHandle::newNull();
auto array = asArray();
if (array && (at < array->getNItems()) && (at >= 0)) {
result = array->getItem(at);
}
auto result = (array && at < array->size() && at >= 0) ? array->getItem(at)
: newNull();
eraseItem(at);
return result;
}
@ -1515,9 +1512,8 @@ QPDFObjectHandle::arrayOrStreamToStreamArray(
{
all_description = description;
std::vector<QPDFObjectHandle> result;
auto array = asArray();
if (array) {
int n_items = array->getNItems();
if (auto array = asArray()) {
int n_items = array->size();
for (int i = 0; i < n_items; ++i) {
QPDFObjectHandle item = array->getItem(i);
if (item.isStream()) {
@ -2217,7 +2213,7 @@ QPDFObjectHandle::makeDirect(
} else if (isArray()) {
std::vector<QPDFObjectHandle> items;
auto array = asArray();
int n = array->getNItems();
int n = array->size();
for (int i = 0; i < n; ++i) {
items.push_back(array->getItem(i));
items.back().makeDirect(visited, stop_at_streams);

12
libqpdf/QPDF_Array.cc
View File

@ -142,18 +142,6 @@ QPDF_Array::getJSON(int json_version)
}
}
int
QPDF_Array::getNItems() const
{
if (sparse) {
// This should really return a size_t, but changing it would break
// a lot of code.
return QIntC::to_int(sp_elements.size());
} else {
return QIntC::to_int(elements.size());
}
}
QPDFObjectHandle
QPDF_Array::getItem(int n) const
{

6
libqpdf/SparseOHArray.cc
View File

@ -2,12 +2,6 @@
#include <stdexcept>
int
SparseOHArray::size() const
{
return this->n_elements;
}
void
SparseOHArray::append(QPDFObjectHandle oh)
{

6
libqpdf/qpdf/QPDF_Array.hh
View File

@ -22,7 +22,11 @@ class QPDF_Array: public QPDFValue
virtual JSON getJSON(int json_version);
virtual void disconnect();
int getNItems() const;
int
size() const noexcept
{
return sparse ? sp_elements.size() : int(elements.size());
}
QPDFObjectHandle getItem(int n) const;
void getAsVector(std::vector<QPDFObjectHandle>&) const;

6
libqpdf/qpdf/SparseOHArray.hh
View File

@ -11,7 +11,11 @@ class SparseOHArray
{
public:
SparseOHArray() = default;
int size() const;
int
size() const
{
return n_elements;
}
void append(QPDFObjectHandle oh);
void append(std::shared_ptr<QPDFObject>&& obj);
QPDFObjectHandle at(int idx) const;