From 53acbf15f867100b92f987f5d80e1e74ba978c75 Mon Sep 17 00:00:00 2001
From: m-holger <m.holger@qpdf.org>
Date: Mon, 18 Aug 2025 14:26:30 +0100
Subject: [PATCH] Refactor `QPDFObjectHandle::isRectangle` etc methods: replace `as_array` with `Array`, use subscript operators, simplify logic, and improve readability.

---
 libqpdf/QPDF_Array.cc | 69 +++++++++++++++++++++++++++++++--------------------------------------
 1 file changed, 31 insertions(+), 38 deletions(-)

diff --git a/libqpdf/QPDF_Array.cc b/libqpdf/QPDF_Array.cc
index f6e41cc..b6a31fc 100644
--- a/libqpdf/QPDF_Array.cc
+++ b/libqpdf/QPDF_Array.cc
@@ -2,6 +2,7 @@
 
 #include <qpdf/QTC.hh>
 
+#include <array>
 #include <utility>
 
 using namespace std::literals;
@@ -381,69 +382,61 @@ QPDFObjectHandle::getArrayItem(int n) const
 bool
 QPDFObjectHandle::isRectangle() const
 {
-    if (auto array = as_array(strict)) {
-        for (int i = 0; i < 4; ++i) {
-            if (auto item = array.at(i).second; !item.isNumber()) {
-                return false;
-            }
+    Array array(*this);
+    for (auto const& oh: array) {
+        if (!oh.isNumber()) {
+            return false;
         }
-        return array.size() == 4;
     }
-    return false;
+    return array.size() == 4;
 }
 
 bool
 QPDFObjectHandle::isMatrix() const
 {
-    if (auto array = as_array(strict)) {
-        for (int i = 0; i < 6; ++i) {
-            if (auto item = array.at(i).second; !item.isNumber()) {
-                return false;
-            }
+    Array array(*this);
+    for (auto const& oh: array) {
+        if (!oh.isNumber()) {
+            return false;
         }
-        return array.size() == 6;
     }
-    return false;
+    return array.size() == 6;
 }
 
 QPDFObjectHandle::Rectangle
 QPDFObjectHandle::getArrayAsRectangle() const
 {
-    if (auto array = as_array(strict)) {
-        if (array.size() != 4) {
+    Array array(*this);
+    if (array.size() != 4) {
+        return {};
+    }
+    std::array<double, 4> items;
+    for (size_t i = 0; i < 4; ++i) {
+        if (!array[i].getValueAsNumber(items[i])) {
             return {};
         }
-        double items[4];
-        for (int i = 0; i < 4; ++i) {
-            if (auto item = array.at(i).second; !item.getValueAsNumber(items[i])) {
-                return {};
-            }
-        }
-        return {
-            std::min(items[0], items[2]),
-            std::min(items[1], items[3]),
-            std::max(items[0], items[2]),
-            std::max(items[1], items[3])};
     }
-    return {};
+    return {
+        std::min(items[0], items[2]),
+        std::min(items[1], items[3]),
+        std::max(items[0], items[2]),
+        std::max(items[1], items[3])};
 }
 
 QPDFObjectHandle::Matrix
 QPDFObjectHandle::getArrayAsMatrix() const
 {
-    if (auto array = as_array(strict)) {
-        if (array.size() != 6) {
+    Array array(*this);
+    if (array.size() != 6) {
+        return {};
+    }
+    std::array<double, 6> items;
+    for (size_t i = 0; i < 6; ++i) {
+        if (!array[i].getValueAsNumber(items[i])) {
             return {};
         }
-        double items[6];
-        for (int i = 0; i < 6; ++i) {
-            if (auto item = array.at(i).second; !item.getValueAsNumber(items[i])) {
-                return {};
-            }
-        }
-        return {items[0], items[1], items[2], items[3], items[4], items[5]};
     }
-    return {};
+    return {items[0], items[1], items[2], items[3], items[4], items[5]};
 }
 
 std::vector<QPDFObjectHandle>
--
libgit2 0.21.4