Fix broken TCPDF patch

diff --git a/galette/composer.json b/galette/composer.json
index 9897a3f2d88ad54dc93abb6f55e3cd8d5887af58..dfdb7a4cba630f399889f8f2f4bd694db2db13d8 100644 (file)
--- a/galette/composer.json
+++ b/galette/composer.json
@@ -68,8 +68,8 @@
             "patch -d vendor/smarty/smarty/ -p3 < ../patches/smarty-php81.patch",
             "patch -d vendor/mathmarques/smarty-view/ -p3 < ../patches/smarty-view-php81.patch",
             "patch -d vendor/laminas/ -p2 < ../patches/laminas-php81.patch",
-            "patch -d vendor/tecnickcom/tcpdf/ -p3 < ../patches/tcpdf-php81.patch",
             "patch -d vendor/soundasleep/html2text/ -p3 < ../patches/html2text-php80.patch",
+            "patch -d vendor/tecnickcom/tcpdf/ -p3 < ../patches/tcpdf-php81.patch",
             "patch -d vendor/slim/twig-view/ -p3 < ../patches/twig-view-php81.patch"
         ]
     }

diff --git a/patches/tcpdf-php81.patch b/patches/tcpdf-php81.patch
index ed9ba531776ad8f70eb26fb1b25114dc7a295aaa..575b9cdd841a702da8dbc2fc7990cf14155dbe9f 100644 (file)
--- a/patches/tcpdf-php81.patch
+++ b/patches/tcpdf-php81.patch
@@ -1,6 +1,6 @@
 diff -up vendor/tecnickcom/tcpdf/include/tcpdf_images.php.patch vendor/tecnickcom/tcpdf/include/tcpdf_images.php
---- vendor/tecnickcom/tcpdf/include/tcpdf_images.php.patch     2021-11-24 06:24:49.340507070 +0100
-+++ vendor/tecnickcom/tcpdf/include/tcpdf_images.php   2021-11-24 06:25:00.907754698 +0100
+--- vendor/tecnickcom/tcpdf/include/tcpdf_images.php.patch     2022-05-03 20:56:17.330248199 +0200
++++ vendor/tecnickcom/tcpdf/include/tcpdf_images.php   2022-05-03 20:56:28.359497624 +0200
 @@ -79,7 +79,7 @@ class TCPDF_IMAGES {
                        }
                }
@@ -10,15 +10,3 @@ diff -up vendor/tecnickcom/tcpdf/include/tcpdf_images.php.patch vendor/tecnickco
                }
                if ($type == 'jpg') {
                        $type = 'jpeg';
-diff -up vendor/tecnickcom/tcpdf/tcpdf.php.patch vendor/tecnickcom/tcpdf/tcpdf.php
---- vendor/tecnickcom/tcpdf/tcpdf.php.patch    2021-11-24 05:56:44.695440293 +0100
-+++ vendor/tecnickcom/tcpdf/tcpdf.php  2021-11-24 05:58:00.574064870 +0100
-@@ -7357,7 +7357,7 @@ class TCPDF {
-                                               $color = imagecolorat($img, $xpx, $ypx);
-                                               // get and correct gamma color
-                                               $alpha = $this->getGDgamma($img, $color);
--                                              imagesetpixel($imgalpha, $xpx, $ypx, $alpha);
-+                                              imagesetpixel($imgalpha, intval($xpx), intval($ypx), intval($alpha));
-                                       }
-                               }
-                               imagepng($imgalpha, $tempfile_alpha);