From ce19908ce4dceba0b6ac5d8a1b24a35fd1a24ea8 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Sat, 17 Aug 2024 08:43:22 +0100 Subject: [PATCH] draft xobjects --- VERSION | 2 +- composer.json | 2 +- resources/debian/control | 2 +- resources/rpm/rpm.spec | 40 ++++++++++++++++++++-------------------- src/Base.php | 2 +- src/Output.php | 28 ++++++++++++++-------------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/VERSION b/VERSION index 3e6a881..080c95b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.67 +8.0.68 diff --git a/composer.json b/composer.json index a12dc9d..2db05d2 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "tecnickcom/tc-lib-barcode": "^2.2", "tecnickcom/tc-lib-color": "^2.0", "tecnickcom/tc-lib-pdf-image": "^2.0", - "tecnickcom/tc-lib-pdf-font": "^2.2", + "tecnickcom/tc-lib-pdf-font": "^2.3", "tecnickcom/tc-lib-file": "^2.0", "tecnickcom/tc-lib-pdf-encrypt": "^2.1", "tecnickcom/tc-lib-unicode-data": "^2.0", diff --git a/resources/debian/control b/resources/debian/control index ca71eed..8555829 100644 --- a/resources/debian/control +++ b/resources/debian/control @@ -10,6 +10,6 @@ Vcs-Git: https://github.com/~#VENDOR#~/~#PROJECT#~.git Package: ~#PKGNAME#~ Provides: php-~#PROJECT#~ Architecture: all -Depends: php (>= 8.0.0), php-date, php-tecnickcom-tc-lib-barcode (<< 2.0.0), php-tecnickcom-tc-lib-barcode (>= 2.2.1), php-tecnickcom-tc-lib-color (<< 2.0.0), php-tecnickcom-tc-lib-color (>= 2.0.8), php-tecnickcom-tc-lib-pdf-image (<< 2.0.0), php-tecnickcom-tc-lib-pdf-image (>= 2.0.12), php-tecnickcom-tc-lib-pdf-font (<< 2.0.0), php-tecnickcom-tc-lib-pdf-font (>= 2.2.3), php-tecnickcom-tc-lib-file (<< 2.0.0), php-tecnickcom-tc-lib-file (>= 2.0.11), php-tecnickcom-tc-lib-pdf-encrypt (<< 2.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 2.1.2), php-tecnickcom-tc-lib-unicode-data (<< 2.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.11), php-tecnickcom-tc-lib-unicode (<< 2.0.0), php-tecnickcom-tc-lib-unicode (>= 2.0.11), php-tecnickcom-tc-lib-pdf-page (<< 3.0.0), php-tecnickcom-tc-lib-pdf-page (>= 4.0.8), php-tecnickcom-tc-lib-pdf-graph (<< 2.0.0), php-tecnickcom-tc-lib-pdf-graph (>= 2.0.12), ${misc:Depends} +Depends: php (>= 8.0.0), php-date, php-tecnickcom-tc-lib-barcode (<< 3.0.0), php-tecnickcom-tc-lib-barcode (>= 2.2.2), php-tecnickcom-tc-lib-color (<< 3.0.0), php-tecnickcom-tc-lib-color (>= 2.0.9), php-tecnickcom-tc-lib-pdf-image (<< 3.0.0), php-tecnickcom-tc-lib-pdf-image (>= 2.0.15), php-tecnickcom-tc-lib-pdf-font (<< 3.0.0), php-tecnickcom-tc-lib-pdf-font (>= 2.3.1), php-tecnickcom-tc-lib-file (<< 3.0.0), php-tecnickcom-tc-lib-file (>= 2.0.12), php-tecnickcom-tc-lib-pdf-encrypt (<< 3.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 2.1.3), php-tecnickcom-tc-lib-unicode-data (<< 3.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.12), php-tecnickcom-tc-lib-unicode (<< 3.0.0), php-tecnickcom-tc-lib-unicode (>= 2.0.12), php-tecnickcom-tc-lib-pdf-page (<< 5.0.0), php-tecnickcom-tc-lib-pdf-page (>= 4.0.10), php-tecnickcom-tc-lib-pdf-graph (<< 3.0.0), php-tecnickcom-tc-lib-pdf-graph (>= 2.0.13), ${misc:Depends} Description: PHP Barcode library This library includes PHP classes to generate PDF documents. diff --git a/resources/rpm/rpm.spec b/resources/rpm/rpm.spec index c3630d5..8f679a6 100644 --- a/resources/rpm/rpm.spec +++ b/resources/rpm/rpm.spec @@ -19,26 +19,26 @@ BuildArch: noarch Requires: php(language) >= 8.0.0 Requires: php-date Requires: php-pcre -Requires: php-composer(%{c_vendor}/tc-lib-barcode) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-barcode) >= 2.2.1 -Requires: php-composer(%{c_vendor}/tc-lib-color) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-color) >= 2.0.8 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-image) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-image) >= 2.0.12 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-font) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-font) >= 2.2.3 -Requires: php-composer(%{c_vendor}/tc-lib-file) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-file) >= 2.0.11 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 2.1.2 -Requires: php-composer(%{c_vendor}/tc-lib-unicode-data) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-unicode-data) >= 2.0.11 -Requires: php-composer(%{c_vendor}/tc-lib-unicode) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-unicode) >= 2.0.11 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-page) < 3.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-page) >= 4.0.8 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-graph) < 2.0.0 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-graph) >= 2.0.12 +Requires: php-composer(%{c_vendor}/tc-lib-barcode) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-barcode) >= 2.2.2 +Requires: php-composer(%{c_vendor}/tc-lib-color) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-color) >= 2.0.9 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-image) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-image) >= 2.0.15 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-font) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-font) >= 2.3.1 +Requires: php-composer(%{c_vendor}/tc-lib-file) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-file) >= 2.0.12 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 2.1.3 +Requires: php-composer(%{c_vendor}/tc-lib-unicode-data) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-unicode-data) >= 2.0.12 +Requires: php-composer(%{c_vendor}/tc-lib-unicode) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-unicode) >= 2.0.12 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-page) < 5.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-page) >= 4.0.10 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-graph) < 3.0.0 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-graph) >= 2.0.13 Provides: php-composer(%{c_vendor}/%{gh_project}) = %{version} Provides: php-%{gh_project} = %{version} diff --git a/src/Base.php b/src/Base.php index dd484e6..253651b 100644 --- a/src/Base.php +++ b/src/Base.php @@ -136,7 +136,7 @@ abstract class Base /** * TCPDF version. */ - protected string $version = '8.0.67'; + protected string $version = '8.0.68'; /** * Time is seconds since EPOCH when the document was created. diff --git a/src/Output.php b/src/Output.php index f2c2f46..41897b6 100644 --- a/src/Output.php +++ b/src/Output.php @@ -1043,24 +1043,24 @@ protected function getOutXObjects(): string if (empty($this->pdfa) || ($this->pdfa > 1)) { if (!empty($data['extgstate'])) { $out .= ' /ExtGState <<'; - foreach ($data['extgstate'] as $objref) { - $out .= $objref; + foreach ($data['extgstate'] as $objdic) { + $out .= $objdic; } $out .= ' >>'; } if (!empty($data['pattern'])) { $out .= ' /Pattern <<'; - foreach ($data['pattern'] as $objref) { - $out .= $objref; + foreach ($data['pattern'] as $objdic) { + $out .= $objdic; } $out .= ' >>'; } if (!empty($data['shading'])) { $out .= ' /Shading <<'; - foreach ($data['shading'] as $objref) { - $out .= $objref; + foreach ($data['shading'] as $objdic) { + $out .= $objdic; } $out .= ' >>'; } @@ -1068,16 +1068,16 @@ protected function getOutXObjects(): string if (! empty($data['colorspace'])) { $out .= ' /ColorSpace <<'; - foreach ($data['colorspace'] as $objref) { - $out .= $objref; + foreach ($data['colorspace'] as $objdic) { + $out .= $objdic; } $out .= ' >>'; } if (! empty($data['font'])) { $out .= ' /Font <<'; - foreach ($data['font'] as $objref) { - $out .= $objref; + foreach ($data['font'] as $objdic) { + $out .= $objdic; } $out .= ' >>'; } @@ -1085,14 +1085,14 @@ protected function getOutXObjects(): string if (! empty($data['image']) || ! empty($data['xobject'])) { $out .= ' /XObject <<'; if (! empty($data['image'])) { - foreach ($data['image'] as $objref) { - $out .= $objref; + foreach ($data['image'] as $objdic) { + $out .= $objdic; } } if (! empty($data['xobject'])) { - foreach ($data['xobject'] as $objref) { - $out .= $objref; + foreach ($data['xobject'] as $objdic) { + $out .= $objdic; } } $out .= ' >>';