diff options
| author | Greg Roach <fisharebest@gmail.com> | 2020-02-23 19:27:07 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2020-02-23 19:27:07 +0000 |
| commit | 1c7feab282e8e647fe2be7b913b8b267ddc98b32 (patch) | |
| tree | 2bd7a71b4cbec8740ce9a0c350d3b3bf407f829c /vendor/tecnickcom | |
| parent | 8c627a69bcf55b7e1db9014c067e8dfad205fb47 (diff) | |
| download | webtrees-1c7feab282e8e647fe2be7b913b8b267ddc98b32.tar.gz webtrees-1c7feab282e8e647fe2be7b913b8b267ddc98b32.tar.bz2 webtrees-1c7feab282e8e647fe2be7b913b8b267ddc98b32.zip | |
Update vendor dependencies
Diffstat (limited to 'vendor/tecnickcom')
| -rw-r--r-- | vendor/tecnickcom/tcpdf/README.md | 2 | ||||
| -rw-r--r-- | vendor/tecnickcom/tcpdf/VERSION | 2 | ||||
| -rw-r--r-- | vendor/tecnickcom/tcpdf/composer.json | 2 | ||||
| -rw-r--r-- | vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php | 6 | ||||
| -rw-r--r-- | vendor/tecnickcom/tcpdf/include/tcpdf_static.php | 2 | ||||
| -rw-r--r-- | vendor/tecnickcom/tcpdf/tcpdf.php | 3 | ||||
| -rw-r--r-- | vendor/tecnickcom/tcpdf/tcpdf.php.rej | 31 |
7 files changed, 9 insertions, 39 deletions
diff --git a/vendor/tecnickcom/tcpdf/README.md b/vendor/tecnickcom/tcpdf/README.md index 734b9879fa..db0149f69c 100644 --- a/vendor/tecnickcom/tcpdf/README.md +++ b/vendor/tecnickcom/tcpdf/README.md @@ -6,7 +6,7 @@ * **category** Library * **author** Nicola Asuni <info@tecnick.com> -* **copyright** 2002-2019 Nicola Asuni - Tecnick.com LTD +* **copyright** 2002-2020 Nicola Asuni - Tecnick.com LTD * **license** http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT) * **link** http://www.tcpdf.org * **source** https://github.com/tecnickcom/TCPDF diff --git a/vendor/tecnickcom/tcpdf/VERSION b/vendor/tecnickcom/tcpdf/VERSION index 8ac3c44511..b98d1d3fa7 100644 --- a/vendor/tecnickcom/tcpdf/VERSION +++ b/vendor/tecnickcom/tcpdf/VERSION @@ -1 +1 @@ -6.3.4 +6.3.5 diff --git a/vendor/tecnickcom/tcpdf/composer.json b/vendor/tecnickcom/tcpdf/composer.json index 839f60b013..9f1cc67194 100644 --- a/vendor/tecnickcom/tcpdf/composer.json +++ b/vendor/tecnickcom/tcpdf/composer.json @@ -1,6 +1,6 @@ { "name": "tecnickcom/tcpdf", - "version": "6.3.4", + "version": "6.3.5", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents and barcodes.", diff --git a/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php b/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php index 3b1774eaae..9a58a21f67 100644 --- a/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php +++ b/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php @@ -878,7 +878,7 @@ class PDF417 { $txtarr = array(); // array of characters and sub-mode switching characters $codelen = strlen($code); for ($i = 0; $i < $codelen; ++$i) { - $chval = ord($code{$i}); + $chval = ord($code[$i]); if (($k = array_search($chval, $this->textsubmodes[$submode])) !== false) { // we are on the same sub-mode $txtarr[] = $k; @@ -888,7 +888,7 @@ class PDF417 { // search new sub-mode if (($s != $submode) AND (($k = array_search($chval, $this->textsubmodes[$s])) !== false)) { // $s is the new submode - if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code{($i + 1)}), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) { + if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code[($i + 1)]), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) { // shift (temporary change only for this char) if ($s == 3) { // shift to puntuaction @@ -952,7 +952,7 @@ class PDF417 { $cw = array_merge($cw, $cw6); } else { for ($i = 0; $i < $sublen; ++$i) { - $cw[] = ord($code{$i}); + $cw[] = ord($code[$i]); } } $code = $rest; diff --git a/vendor/tecnickcom/tcpdf/include/tcpdf_static.php b/vendor/tecnickcom/tcpdf/include/tcpdf_static.php index 8e96869535..0139dbe9be 100644 --- a/vendor/tecnickcom/tcpdf/include/tcpdf_static.php +++ b/vendor/tecnickcom/tcpdf/include/tcpdf_static.php @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.3.4'; + private static $tcpdf_version = '6.3.5'; /** * String alias for total number of pages. diff --git a/vendor/tecnickcom/tcpdf/tcpdf.php b/vendor/tecnickcom/tcpdf/tcpdf.php index be32cae7ab..8b7d812236 100644 --- a/vendor/tecnickcom/tcpdf/tcpdf.php +++ b/vendor/tecnickcom/tcpdf/tcpdf.php @@ -12384,7 +12384,8 @@ class TCPDF { $x = $this->w; } $fixed = false; - if ((string)$page && (((string)$page)[0] == '*')) { + $pageAsString = (string) $page; + if ($pageAsString && $pageAsString[0] == '*') { $page = intval(substr($page, 1)); // this page number will not be changed when moving/add/deleting pages $fixed = true; diff --git a/vendor/tecnickcom/tcpdf/tcpdf.php.rej b/vendor/tecnickcom/tcpdf/tcpdf.php.rej deleted file mode 100644 index a202d0c89d..0000000000 --- a/vendor/tecnickcom/tcpdf/tcpdf.php.rej +++ /dev/null @@ -1,31 +0,0 @@ -*************** -*** 4715,4728 **** - * Defines the page and position a link points to. - * @param $link (int) The link identifier returned by AddLink() - * @param $y (float) Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page) -- * @param $page (int) Number of target page; -1 indicates the current page (default value). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages. - * @public - * @since 1.5 - * @see AddLink() - */ - public function SetLink($link, $y=0, $page=-1) { - $fixed = false; -- if (!empty($page) AND ($page[0] == '*')) { - $page = intval(substr($page, 1)); - // this page number will not be changed when moving/add/deleting pages - $fixed = true; ---- 4715,4728 ---- - * Defines the page and position a link points to. - * @param $link (int) The link identifier returned by AddLink() - * @param $y (float) Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page) -+ * @param $page (int|string) Number of target page; -1 indicates the current page (default value). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages. - * @public - * @since 1.5 - * @see AddLink() - */ - public function SetLink($link, $y=0, $page=-1) { - $fixed = false; -+ if (!empty($page) AND is_string($page) AND ($page[0] == '*')) { - $page = intval(substr($page, 1)); - // this page number will not be changed when moving/add/deleting pages - $fixed = true; |
