From 41e9f7eb2676cf975ded22cb7f2d573b3b315dd8 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 31 Dec 2024 12:16:58 +0100
Subject: [PATCH 1/9] Use type declarations instead of doc-block annotations

---
 ext/gd/tests/func.inc       | 10 ++--------
 ext/gd/tests/similarity.inc | 25 +++++--------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc
index 0f10aa7d83dee..9873d532c9f74 100644
--- a/ext/gd/tests/func.inc
+++ b/ext/gd/tests/func.inc
@@ -128,11 +128,8 @@ function test_image_equals_image(GdImage $expected, GdImage $actual, bool $save_
 
 /**
  * Returns the truecolor version of an image.
- *
- * @param resource $image
- * @return resource
  */
-function test_to_truecolor($image)
+function test_to_truecolor(GdImage $image): GdImage
 {
     if (imageistruecolor($image)) {
         return $image;
@@ -150,11 +147,8 @@ function test_to_truecolor($image)
  *
  * The image is saved right beside the temporary .php test file with the
  * extension .out.png.
- *
- * @param resource $image
- * @return void
  */
-function save_actual_image($image)
+function save_actual_image(GdImage $image): void
 {
     $pathinfo = pathinfo($_SERVER['SCRIPT_FILENAME']);
     $filename = "{$pathinfo['dirname']}/{$pathinfo['filename']}.out.png";
diff --git a/ext/gd/tests/similarity.inc b/ext/gd/tests/similarity.inc
index cb0dba77f2064..c4c3988fcac22 100644
--- a/ext/gd/tests/similarity.inc
+++ b/ext/gd/tests/similarity.inc
@@ -7,15 +7,8 @@
 
 /**
  * Gets the individual components of an RGB value.
- *
- * @param int $color
- * @param int $red
- * @param int $green
- * @param int $blue
- *
- * @return void
  */
-function get_rgb($color, &$red, &$green, &$blue)
+function get_rgb(int $color, &$red, &$green, &$blue): void
 {
     // assumes $color is an RGB value
     $red = ($color >> 16) & 0xFF;
@@ -25,13 +18,8 @@ function get_rgb($color, &$red, &$green, &$blue)
 
 /**
  * Calculates the euclidean distance of two RGB values.
- *
- * @param int $color1
- * @param int $color2
- *
- * @return int
  */
-function calc_pixel_distance($color1, $color2)
+function calc_pixel_distance(int $color1, int $color2): float
 {
     get_rgb($color1, $red1, $green1, $blue1);
     get_rgb($color2, $red2, $green2, $blue2);
@@ -43,13 +31,10 @@ function calc_pixel_distance($color1, $color2)
 /**
  * Calculates dissimilarity of two images.
  *
- * @param resource $image1
- * @param resource $image2
- *
- * @return int The dissimilarity. 0 means the images are identical. The higher
- *             the value, the more dissimilar are the images.
+ * The dissimilarity. 0 means the images are identical. The higher
+ * the value, the more dissimilar are the images.
  */
-function calc_image_dissimilarity($image1, $image2)
+function calc_image_dissimilarity(GdImage $image1, GdImage $image2): float
 {
     // assumes image1 and image2 have same width and height
     $dissimilarity = 0;

From b5234c739fa8d580786cb43dabb96702a906a511 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 31 Dec 2024 12:25:56 +0100
Subject: [PATCH 2/9] Inline the terrible get_rgb() function

---
 ext/gd/tests/similarity.inc | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/ext/gd/tests/similarity.inc b/ext/gd/tests/similarity.inc
index c4c3988fcac22..2caba5796b68b 100644
--- a/ext/gd/tests/similarity.inc
+++ b/ext/gd/tests/similarity.inc
@@ -5,26 +5,15 @@
  * mainly useful for checking lossy compression.
  */
 
-/**
- * Gets the individual components of an RGB value.
- */
-function get_rgb(int $color, &$red, &$green, &$blue): void
-{
-    // assumes $color is an RGB value
-    $red = ($color >> 16) & 0xFF;
-    $green = ($color >> 8) & 0xFF;
-    $blue = $color & 0xFF;
-}
-
 /**
  * Calculates the euclidean distance of two RGB values.
  */
 function calc_pixel_distance(int $color1, int $color2): float
 {
-    get_rgb($color1, $red1, $green1, $blue1);
-    get_rgb($color2, $red2, $green2, $blue2);
     return sqrt(
-        pow($red1 - $red2, 2) + pow($green1 - $green2, 2) + pow($blue1 - $blue2, 2)
+        ((($color1 >> 16) & 0xFF) - (($color2 >> 16) & 0xFF)) ** 2 +
+        ((($color1 >>  8) & 0xFF) - (($color2 >>  8) & 0xFF)) ** 2 +
+        ((($color1 >>  0) & 0xFF) - (($color2 >>  0) & 0xFF)) ** 2
     );
 }
 

From 93c8b7053045a4a5de6720e641ef4a1a67c9b26f Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 31 Dec 2024 12:41:37 +0100
Subject: [PATCH 3/9] Always traverse pixels in Z order

libgd stores the pixel as an array of rows, so we should use row-major-
order traversal to improve caching.
---
 ext/gd/tests/similarity.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/gd/tests/similarity.inc b/ext/gd/tests/similarity.inc
index 2caba5796b68b..c0b7ef86f366f 100644
--- a/ext/gd/tests/similarity.inc
+++ b/ext/gd/tests/similarity.inc
@@ -27,8 +27,8 @@ function calc_image_dissimilarity(GdImage $image1, GdImage $image2): float
 {
     // assumes image1 and image2 have same width and height
     $dissimilarity = 0;
-    for ($i = 0, $n = imagesx($image1); $i < $n; $i++) {
-        for ($j = 0, $m = imagesy($image1); $j < $m; $j++) {
+    for ($j = 0, $m = imagesy($image1); $j < $m; $j++) {
+        for ($i = 0, $n = imagesx($image1); $i < $n; $i++) {
             $color1 = imagecolorat($image1, $i, $j);
             $color2 = imagecolorat($image2, $i, $j);
             $dissimilarity += calc_pixel_distance($color1, $color2);

From 518474fdd4daecf3b7f8f5db7d08e68da05a6714 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 31 Dec 2024 14:08:12 +0100
Subject: [PATCH 4/9] Add assertions to avoid misuse of the functions

The assertion regarding the image dimensions won't break any tests, and
we had it already as a comment.

However, asserting that the images are truecolor images is important
for `calc_image_dissimilarity()` which otherwise would calculate
nonsense, and not unreasonable for `test_image_equals_image()` which
otherwise is overspecified (for our purposes, it doesn't matter which
palette entry a pixel refers to, but rather whether the actual colors
referred by a palette color match).

Since the truecolor assertions break two tests, we fix these by
converting to truecolor.  That should likely be backported to lower
branches.
---
 ext/gd/tests/bug43475.phpt  |   1 +
 ext/gd/tests/bug43475.png   | Bin 4697 -> 11430 bytes
 ext/gd/tests/func.inc       |   1 +
 ext/gd/tests/gd276.phpt     |   2 ++
 ext/gd/tests/similarity.inc |   3 ++-
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt
index 454d2daad0f1a..a5b4ac6d22885 100644
--- a/ext/gd/tests/bug43475.phpt
+++ b/ext/gd/tests/bug43475.phpt
@@ -60,6 +60,7 @@ imageline($im, 700, 100, 700, 600, IMG_COLOR_STYLED);
 imageline($im, 700, 600, 200, 100, IMG_COLOR_STYLED);
 
 $ex = imagecreatefrompng(__DIR__ . '/bug43475.png');
+imagepalettetotruecolor($im);
 var_dump(calc_image_dissimilarity($ex, $im) < 1e-5);
 ?>
 --EXPECT--
diff --git a/ext/gd/tests/bug43475.png b/ext/gd/tests/bug43475.png
index 774270f63db86efd053f126ab9d66a9e50569768..d53a9a3322ae6aab3ce1840db001f63cd2360295 100644
GIT binary patch
literal 11430
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
M^SoTj#Qxj=2jQFG2LJ#7

literal 4697
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
WgTe{iOXy|@=DuZzTQ%)K;(q~-Qc&{%

diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc
index 9873d532c9f74..65332ff441ce3 100644
--- a/ext/gd/tests/func.inc
+++ b/ext/gd/tests/func.inc
@@ -95,6 +95,7 @@ function test_image_equals_file(string $filename, GdImage $actual): void
  */
 function test_image_equals_image(GdImage $expected, GdImage $actual, bool $save_actual = false): void
 {
+    assert(imageistruecolor($expected) && imageistruecolor($actual));
     $exp_x = imagesx($expected);
     $exp_y = imagesy($expected);
     $act_x = imagesx($actual);
diff --git a/ext/gd/tests/gd276.phpt b/ext/gd/tests/gd276.phpt
index a12bce3983049..ad7b6343f520d 100644
--- a/ext/gd/tests/gd276.phpt
+++ b/ext/gd/tests/gd276.phpt
@@ -15,6 +15,8 @@ $filename = __DIR__ . "/gd276.bmp";
 imagebmp($orig, $filename, true);
 $saved = imagecreatefrombmp($filename);
 var_dump($saved !== false);
+imagepalettetotruecolor($orig);
+imagepalettetotruecolor($saved);
 test_image_equals_image($orig, $saved);
 ?>
 --EXPECT--
diff --git a/ext/gd/tests/similarity.inc b/ext/gd/tests/similarity.inc
index c0b7ef86f366f..7654e6ff31fad 100644
--- a/ext/gd/tests/similarity.inc
+++ b/ext/gd/tests/similarity.inc
@@ -25,7 +25,8 @@ function calc_pixel_distance(int $color1, int $color2): float
  */
 function calc_image_dissimilarity(GdImage $image1, GdImage $image2): float
 {
-    // assumes image1 and image2 have same width and height
+    assert(imageistruecolor($image1) && imageistruecolor($image2));
+    assert(imagesx($image1) === imagesx($image2) && imagesy($image1) === imagesy($image2));
     $dissimilarity = 0;
     for ($j = 0, $m = imagesy($image1); $j < $m; $j++) {
         for ($i = 0, $n = imagesx($image1); $i < $n; $i++) {

From 8464a45bbfe0c669f862a0352f8fe28cda34d7fd Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 31 Dec 2024 15:03:48 +0100
Subject: [PATCH 5/9] Drop implicit conversion to truecolor

Conversion to truecolor is a relatively expensive operation, and as
such should not be implicit; instead test authors are encouraged to use
truecolor images in the first place where possible, or to even find
better ways to verify expectations than doing a full image comparison.
---
 ext/gd/tests/bug52070.phpt                    |   1 +
 ext/gd/tests/bug52070.png                     | Bin 2223 -> 8724 bytes
 ext/gd/tests/bug72913.phpt                    |  14 +++++++++++---
 ext/gd/tests/bug72913.png                     | Bin 147 -> 0 bytes
 ext/gd/tests/func.inc                         |  18 ------------------
 ext/gd/tests/imagebmp_basic.phpt              |   2 +-
 ext/gd/tests/imagebmp_basic.png               | Bin 141 -> 584 bytes
 ext/gd/tests/imagecolorset_basic.phpt         |   1 +
 ext/gd/tests/imagecolorset_basic.png          | Bin 99 -> 434 bytes
 ext/gd/tests/imagecreatefromstring_bmp.phpt   |   2 +-
 ext/gd/tests/imagecreatefromstring_bmp.png    | Bin 126 -> 134 bytes
 .../tests/imagegammacorrect_variation1.phpt   |   2 +-
 ext/gd/tests/imagegammacorrect_variation1.png | Bin 199 -> 686 bytes
 .../tests/imagegammacorrect_variation2.phpt   |   3 +++
 .../tests/imagetruecolortopalette_basic.phpt  |   2 +-
 .../tests/imagetruecolortopalette_basic.png   | Bin 208 -> 709 bytes
 .../tests/test_image_equals_file_palette.phpt |   3 +++
 17 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 ext/gd/tests/bug72913.png

diff --git a/ext/gd/tests/bug52070.phpt b/ext/gd/tests/bug52070.phpt
index 6bbe2363a650b..8bc653ae95ef8 100644
--- a/ext/gd/tests/bug52070.phpt
+++ b/ext/gd/tests/bug52070.phpt
@@ -20,6 +20,7 @@ imagedashedline($im, 800, 400, 500, 800, $color);
 imagedashedline($im, 800, 400, 600, 800, $color);
 imagedashedline($im, 800, 400, 700, 800, $color);
 imagedashedline($im, 800, 400, 800, 800, $color);
+imagepalettetotruecolor($im);
 include_once __DIR__ . '/func.inc';
 test_image_equals_file(__DIR__ . '/bug52070.png', $im);
 ?>
diff --git a/ext/gd/tests/bug52070.png b/ext/gd/tests/bug52070.png
index 5ce54b121bc2ed6f250dd98505cfafb50e48b9fc..a6f9a3b875d560724e5f91744c15fe31fd835422 100644
GIT binary patch
literal 8724
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

literal 2223
zcmcIm`#TeCA6I%)dPwD1nCi*-EQA=b9I7GXozs@B(J+!j$jBqogcsQ!vcxd8p|KGa
zZ-|srPSY6WRI^5H&Zj-=y1akFd;f6X*ZsY(>vMgs&*$^K@B4up*ilOIxTKhvn3S`V
z!&Nb{eJ{ks#MSnQiz)~8588>A{ce{bAWcn8p-{*=vY9I;cHp|RgB>Kch&SrqTlP{e
zEkH8|=tnOteAR?IZxvBSRU>%!xK{`6@dkMnw3>C?eWpE-*|$zwEkGMaT}r6UKCIm&
zEyDeOj5Y71b*}3X-j?T^8yb}xb)xAwLwtzM5KqtnTiLRKAS=5b9<WrUWX@G6!#iM_
zos<!?Z!4+Eg167JZBkVFLv9+Nj@(`u(_|?HC${`PEqWYtw+R5YvK!tGCmrL-$O(;=
zD1ZfdWb`yUBPLCSbRwc(+AU~VfiVbn`}QXN#{JP_G)2ndW-p9dvtTwmkVQj9pAME-
zgB8WxwM+tp&$;XryjOZ?y41(1Rp9>m!C!srr<;&u{umSTeXDN5G2{#|?eZLgy~#<6
zq&*ooDR>KAd-MrD1PraOy7P^U{obAbdR(_-z8Jd`W-v1Jtyl-Gga4HIo?K<JU^X@)
za71X{rg`%Hao6>{06Qk~T*~8k2g$(upEJ`<ep3+oy^n}D#l_@;oTj_q9k1v$>>*S^
zvpH&g(3EG;wVf~#h#{uUjYlfa1w@|mpe=ZeNlJLo_A1nQXQcKiZiBYl0>_$MF*;%P
zL6jMkk8>n#qo1=lf`|@y-ij!EfQmZJM{^&(>Zu=2by+PLeFyHk4N{}YQi_G<vRobI
zaFp?(A7KtfU+LmQ>n|Q56RdH!{?<Gb(SeYn>8%+C#2~DvoG(yI>W&_ooP^APt=cCb
zGd9ePQ6;T)+3VPW+u0Z$Vt2cXA2>)`-X>s4VL7|^`dDG`xWTLb=olB+l+W=D)1INB
z8S;ZjVgWP{T`>^vlfKKUv0IAIzB(@eh?nsl;qWb^qg)*#*@lLz`1tc;yOJm-#KkED
zI9eW-Q>v)`Udt~?Yh<ZZ+WPJ7h>p<q_-=6yf*Q~)mgu5+ldOy|kbSv`a{+uyu24n*
z`_D4&C7K!@(TViW=>zM&4iYh2LVvtACb`Ueb?aCYN6j+AtLzd5t?l)9W&cducq2#6
zC%~-LVfKt?)-JvB4&JYIHExQ&g=OVDQ$n29%-4*<Va)XK=BIjZvi8hxMIHF4<f7NC
z4$|sYPkt<Y5s|789eN<q@}AaU_A)fhSmgpWpmG0>Bkd(IEd331JW=UGlp>)d>y$0F
z^7K+lq7@|D^X6cQ(~UpnCyX{SEE8C@%z6Z7ljF8vr;s&pzSk!<(a+VMHg*1;I)L1l
zO1g3HGfn`ZK8NX&PUN`y20i*$Se8Lnt=01!f}`H{LZvd7qSy&@KgfK-*-aQAE5Z)R
zDF1i4=Dp80>{L=J^cRTOlzh1JTu>8Dbr#eugOr-p`$C6|f=%0D+M#fm)48l!PzdEd
z08W>GYzJ?2%VbQoM&y6Gp!+&-Ng;ZRj;h9#H?4eqIq{eNlQL9M=GqT>X&|B;?Q+GY
z=V^upS|w29%3yGSCqjvxp1`t1`m;yYhMj{or1(2!Piu&>NNiR0)rLxPNY~1)%h_al
z*|RTm%<{9+b$4nrG?t+pkafdefGc`n31K}#(6YsuQWy7Xbc1+j?SJ%ucuc}k*XfN~
zVowSjUY}=a2XBF7FuqQq^R8OU!+tA?Wz~+<&lRrxqO+6riRJD^RZHV>S2EiRgV14o
z!Jkc0cznRhoHvV#;X*H(pDM2J9mUrhB}U>?B9UXA0OHvE;a(S7vl%n8<=jJN+OJ(T
zi+cs7y`}_s!GK}+&NF>tG_uEFeq18Kvahb<7?<|O2#C!x4HfQPbJD*-Rzw&m&?hJU
z6Q$Z<?lWq=w4EtGXVwpxaC^X*9*864HKX!HSBZeEhs5YG>s-HW?~fALR%h3l08MJ1
zKY+&N-pcC}e4k6EOM2vJpc`IGA$J9ZGwavbwpkLq*9T~Tvx9)cvIq<iBd0R$*-Y`C
zOh4C#mZ%g6)C@xOU(GVKGFu@}L?{UARw=CTZm~ohi`B`(vb0r+NU6;h@d+sIGbeS_
z7x#HFyz9K;YD2YW+?Sw+>ij#l!g((NR4z;vk~`4whp|Z2Bv$QkJ>F+U@U&j&r`lB>
zvBDSNqfKQ(3P|N$1|A%~lh3_p-gA|;t(aZ&NnS%0Yag6oS%tAGC1$}TNfyD%Awo3e
zhf?@nSm)NR|9vD>0O5lUjCc!+pC9y7MZfcb4S^(n#?iZd$DsMHzO#`8s6DSH*&cM#
ziXn3cbaIn*rHe$15oizJ$0iE2FNuGj91lHC`7rBls)PL~Pim<oxcXMGyxco&vggP8
z^z0k8!SDD~1Zo&5=K(ppjxb{zKccijL>vE^kGsN>V4v`7^KKJTH7jPe*jU;Q`$Yhi
zMXvH>#uopST=`$u8|&ihHJka%T7-)hvAMo!+BBR(bmR86v95ZxKXsm5HEf>&wcmz|
z$)S!|Rmt2z9ogK#c&CY;vYOjJpGGz$y+N$5E{2<DME_T>Erq_MXYz2TRNn^U9qfye
z+C;_DH~oz8ho**P`?Q!|7G4(is5}FWAvt8D@nwGtdkJm=YPb89^XpFTT+;<SG+64I
z&hB7xfQsfgPa&PLZ~_3@Vl=<qmDiwSb_&1T5TE+N(^<NB3Ky{noy~}6tYVGygQ~Ak
zQ(S$y8hBb7DQO>-Dmkhp3WMAW;Km`Xj_FVEgt->`ke?U64xB9f{Y`KNfgP$ZT>I-E
D7F$KO

diff --git a/ext/gd/tests/bug72913.phpt b/ext/gd/tests/bug72913.phpt
index 9eb9c24653530..eea77b6ed56b1 100644
--- a/ext/gd/tests/bug72913.phpt
+++ b/ext/gd/tests/bug72913.phpt
@@ -23,8 +23,16 @@ imagesavealpha($dst, true);
 
 imagecopy($dst, $src, 0,0, 0,0, 50,50);
 
-include_once __DIR__ . '/func.inc';
-test_image_equals_file(__DIR__ . '/bug72913.png', $dst);
+var_dump(imagecolorsforindex($dst, imagecolorat($dst, 0, 0)));
 ?>
 --EXPECT--
-The images are equal.
+array(4) {
+  ["red"]=>
+  int(255)
+  ["green"]=>
+  int(255)
+  ["blue"]=>
+  int(255)
+  ["alpha"]=>
+  int(127)
+}
diff --git a/ext/gd/tests/bug72913.png b/ext/gd/tests/bug72913.png
deleted file mode 100644
index 83eeb81fb16acb3131c987d331ebeb53962ccb1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_{3?x-PN__%SYymzYuK$66f#G%3^T|LF#*!ev
zU<QY0H`0I{Yfl%)5Q(YD2@)0`7@Ri#Z@lp7zv7m^|Je*;fm*o!{{PRMWAga_fB6j;
qcU(!H!M&M3&Hjw7!S{=z3=Dj+Iu&Mit!hAH7(8A5T-G@yGywod=`<t&

diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc
index 65332ff441ce3..483594d526fc2 100644
--- a/ext/gd/tests/func.inc
+++ b/ext/gd/tests/func.inc
@@ -78,9 +78,7 @@ function test_image_equals_file(string $filename, GdImage $actual): void
         save_actual_image($actual);
         return;
     }
-    $actual = test_to_truecolor($actual);
     $expected = imagecreatefrompng($filename);
-    $expected = test_to_truecolor($expected);
     test_image_equals_image($expected, $actual, true);
 }
 
@@ -127,22 +125,6 @@ function test_image_equals_image(GdImage $expected, GdImage $actual, bool $save_
     }
 }
 
-/**
- * Returns the truecolor version of an image.
- */
-function test_to_truecolor(GdImage $image): GdImage
-{
-    if (imageistruecolor($image)) {
-        return $image;
-    } else {
-        $width = imagesx($image);
-        $height = imagesy($image);
-        $result = imagecreatetruecolor($width, $height);
-        imagecopy($result, $image, 0,0, 0,0, $width, $height);
-        return $result;
-    }
-}
-
 /**
  * Saves an actual image to disk.
  *
diff --git a/ext/gd/tests/imagebmp_basic.phpt b/ext/gd/tests/imagebmp_basic.phpt
index b3d1212d014cd..31a62e674a845 100644
--- a/ext/gd/tests/imagebmp_basic.phpt
+++ b/ext/gd/tests/imagebmp_basic.phpt
@@ -13,7 +13,7 @@ $im = imagecreate(100, 100);
 imagecolorallocate($im, 0, 0, 0);
 $white = imagecolorallocate($im, 255, 255, 255);
 imageline($im, 10,10, 89,89, $white);
-
+imagepalettetotruecolor($im);
 require __DIR__ . "/func.inc";
 test_image_equals_file(__DIR__ . "/imagebmp_basic.png", $im);
 ?>
diff --git a/ext/gd/tests/imagebmp_basic.png b/ext/gd/tests/imagebmp_basic.png
index 26fc7d0afcf9fc37dc565ce1ffa7c08f83f0d2b6..d52dd04fb0987c6d654fa5ae11d41ae6770a1bd5 100644
GIT binary patch
delta 571
zcmeBWJi#(SqMn0|fq|jm(bNzi#aZAHS<Jw|cLanPr)u*_GcYjz@^o<wshIQjR%Fp3
z0}<AXW#9Ivf112Rq49y^;i*^lGOhBHjP}oG&WrGo-&@~ctL72W)S`+?Y?Xde_Sxb7
zqPq&Ww{>1x;9MWM=*s&K)-F?a&8@Fm*&Ve0ay(Gv<)!rX8c%oE@Ch!>aph}UG-dS-
z&)6wOqOx;4iuOL*tP{8{G<Ao@sh_KSt6eR_uYTOEaeQ^1ywa(Svtj}|H|<X|Z(H<c
z^-Ixp8t=2~mg}ARUm95?@U-;qHb0ljxa+10f&Z@6>U&Q)zN@)G<GX7^gU0=%K%!oN
zjcL)5#sjxBCMs;u^U~p1(<#Ku^m^fu<^xe0&J72wG!8c$kkW8&Jn%>3aN~hH8qQ4z
z_Glb#Ixt7Wx%ohi#^L4zF&e=Q2W&JhHyn`B2yQ&^L*sJefg2jZO$T;pTy8orLnFBP
zK!wKT<^vHL-VFyVG)^}hkkIgMbg(;Bq%fhkev=BvlSMk*OfxmSn;qm%eNvdvs&pb;
zQ={q5)CQ#!>#G)Xd|EP3qiN3y@h*k`SD0NVm~V9xOmWu@WVsosE#k;`g~@e7^Hn#&
zCoZOeES8bFB93|?KvmsS-2|67s0OlVhG>d7a)kj^9g1}oT;dcSz_Rj6q==(d8Jp{b
rQ?e$mHyi%#*8euyA2rHgF*rZn{?j3OsYYPxU|{fc^>bP0l+XkKkY@Jw

delta 105
zcmX@X(#tqOLYk48fq}tGhg}><u?6^qxB}__|Nk$&IsfiNMR8{aT~8Os5R2aA1PLDp
z##Z%)LysLEZd~wTMnFZ+iZ-(aA7tEgWwsVvIW#fvp#w8RAvfpu&qZ86fQB%5y85}S
Ib4q9e02=5e;Q#;t

diff --git a/ext/gd/tests/imagecolorset_basic.phpt b/ext/gd/tests/imagecolorset_basic.phpt
index 5ed9a1ab8600e..7677b85948aa4 100644
--- a/ext/gd/tests/imagecolorset_basic.phpt
+++ b/ext/gd/tests/imagecolorset_basic.phpt
@@ -25,6 +25,7 @@ $bg = imagecolorat($im, 0, 0);
 // Set the background to be blue
 imagecolorset($im, $bg, 0, 0, 255);
 
+imagepalettetotruecolor($im);
 include_once __DIR__ . '/func.inc';
 test_image_equals_file(__DIR__ . '/imagecolorset_basic.png', $im);
 imagedestroy($im);
diff --git a/ext/gd/tests/imagecolorset_basic.png b/ext/gd/tests/imagecolorset_basic.png
index b9e77d116932d30b8dc5866706b08701dab0b0b2..6a37d1d87176f08c5b1caf1ded356956e774522e 100644
GIT binary patch
literal 434
zcmeAS@N?(olHy`uVBq!ia0y~yVAKJ!Q#jawqzxnQ0U*U$;1OBOz`%C|gc+x5^GO3$
zrFgnHhE&XXd&QBLK|$ca2Il|s4l>zqS`xb9`n5Bb%mN$g*%|g2=_nlD(7<z;$%u#h
hguy6>v@q!5e&51$Y@*eK-@r&<@O1TaS?83{1ORKWio*Z^

delta 81
zcmdnQoIF9on~|A;fr0J({AM7<9N-h;%E0iytKw2PkSp!!;uzx5`SxHVki&3z!O!6P
e4_HDOf$Z}P{5A}XzJg(@AQ?|rKbLh*2~7Z&1Qt{P

diff --git a/ext/gd/tests/imagecreatefromstring_bmp.phpt b/ext/gd/tests/imagecreatefromstring_bmp.phpt
index 34db04297e3aa..746e566fdbfea 100644
--- a/ext/gd/tests/imagecreatefromstring_bmp.phpt
+++ b/ext/gd/tests/imagecreatefromstring_bmp.phpt
@@ -22,7 +22,7 @@ $bmp = "\x42\x4D\x3E\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x00\x00\x28\x00"
      . "\x01\x00\x05\x00\x00\x00\x02\x00\x01\x01\x01\x00\x06\x00\x00\x00"
      . "\x0A\x00\x00\x00\x0A\x00\x00\x00\x00\x01";
 $im = imagecreatefromstring($bmp);
-
+imagepalettetotruecolor($im);
 include_once __DIR__ . '/func.inc';
 test_image_equals_file(__DIR__ . '/imagecreatefromstring_bmp.png', $im);
 ?>
diff --git a/ext/gd/tests/imagecreatefromstring_bmp.png b/ext/gd/tests/imagecreatefromstring_bmp.png
index 04ffc83c468e3066d4214f06698547c2ba7ed74f..a9ae65fdc9827c0d0b56752782658283fb3376dc 100644
GIT binary patch
delta 116
zcmb<xW1Jw7$HB(Hz|d=SelL*XEbxddW?<ku0>X?_wfUrhf)<`Gjv*3LlT#8Bew=q;
zNl<bV>^k)S|3_(_@DnFabc7prUHu`FyhCt$(wcb(mq{#Ne^J!fD8O2VG5MAV-}6h;
RdVppyc)I$ztaD0e0swT2DDeOQ

delta 88
zcmZo;teYSq&B)Baz_9&K>^~sI7T^=&3Z(!4|G)I+{JRqsC5+`fT^vI=W+o>vFtf6;
pF|x7ov9XD<v8l1KxpinTGqB1qIJ9rC;Q?x5@O1TaS?83{1OPlR7Eb^G

diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt
index 55370aa49cf87..67a8e403377ca 100644
--- a/ext/gd/tests/imagegammacorrect_variation1.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation1.phpt
@@ -26,7 +26,7 @@ $half2 =  imagefilledarc ( $image, 75, 75, 70, 70, 0, -180, $gray, IMG_ARC_PIE )
 
 $gamma = imagegammacorrect($image, 1, 5);
 var_dump((bool) $gamma);
-
+imagepalettetotruecolor($image);
 include_once __DIR__ . '/func.inc';
 test_image_equals_file(__DIR__ . '/imagegammacorrect_variation1.png', $image);
 ?>
diff --git a/ext/gd/tests/imagegammacorrect_variation1.png b/ext/gd/tests/imagegammacorrect_variation1.png
index f9718890968a2eae8faad02ef6a536ddb3000ec5..8b0e80c5ea0345cade6f903a41a4613b8b1f16ea 100644
GIT binary patch
literal 686
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7Cr(}oCO|{#S9F5M?jcysy3fA0|Qfn
zr;B4q#hkadFXl=c3OG2bdI-O|BD=fiNq0k{!bXALkumptSXJH^`U@?P*VotIpa0=#
zon1BK9M1@q7FVYsN7UI?Gs^G0|Nea3p>1*T@$>h#?7vl)^tPtr{FdK4bL7R0IlEgn
zcyK_7BOM#c{%8HYt2XC&$A%g1AkQZGL<rl3*R*RsH&D|_lN7x+<#yD}E&l@(4Ug~G
zpmz7xdXwDyj}IlaO-%INy?4H8;eO@AN%hHxXH|6nKYpdQkN0)i?CKZ&v-a%2n7DEM
z+yDQ*PApyR|7-S*C!SkpM5y#}zHW)G+dX%4|Ht)*wyW(I^XJU6OiS80eX-g#qs*eY
zW-F&HR=@U+Kll6B+G7)iU$2#2e*L7Q?(z1mZv<|LHbv<PU;ET^V4cX7qMaM2z2|t-
z<)}NIH@oux2YcaLQ=O~ce@fi@eZ9rI@4GAHO1_-ujrR@d7Z&48oG3su;s>+)l%l(S
T|609(36R0l)z4*}Q$iB}bm|H*

delta 183
zcmV;o07(C?1;+u97=Hl+00006&*Py0000J1OjJd9czBVKkv6>FPyhe`d`Uz>R7i>K
z(Y+0TAP|OO2!*9?z$lESqcI92SXvnT37-kMBe}-H$i3y000$VOX_}_}vjgSIX4w7#
z3$X1a^RQL05talSU{Np!TLiN(Q^&ukZGm04ZJu5C89It)`7n58m`p6NW6KLBVvf83
lHl*9#i|Nv<iIb*v-U+%W@TaSj<x2nn002ovPDHLkV1i<$PA~uf

diff --git a/ext/gd/tests/imagegammacorrect_variation2.phpt b/ext/gd/tests/imagegammacorrect_variation2.phpt
index 33c89d205a1a7..7621ff98c8945 100644
--- a/ext/gd/tests/imagegammacorrect_variation2.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation2.phpt
@@ -33,6 +33,9 @@ function test_gamma($in, $out, $constructor)
 
     imagegammacorrect($im, $in, $out);
 
+    if ($constructor === "imagecreate") {
+        imagepalettetotruecolor($im);
+    }
     $filename = __DIR__ . DIRECTORY_SEPARATOR
         . "imagegammacorrect_variation2_{$in}_{$out}.png";
     $kind = $constructor === 'imagecreate' ? 'palette' : 'truecolor';
diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt
index 2f1c2961a603c..4abe6cf0b37ad 100644
--- a/ext/gd/tests/imagetruecolortopalette_basic.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt
@@ -25,7 +25,7 @@ $half =  imagefilledarc ( $image, 75, 75, 70, 70, 0, 180, $a, IMG_ARC_PIE );
 $half2 =  imagefilledarc ( $image, 75, 55, 80, 70, 0, -180, $b, IMG_ARC_PIE );
 
 var_dump(imagetruecolortopalette($image, true, 2));
-
+imagepalettetotruecolor($image);
 include_once __DIR__ . '/func.inc';
 test_image_equals_file(__DIR__ . '/imagetruecolortopalette_basic.png', $image);
 ?>
diff --git a/ext/gd/tests/imagetruecolortopalette_basic.png b/ext/gd/tests/imagetruecolortopalette_basic.png
index 7d042f2ac3da278c8ebeedd18665cdbae49e86d4..79e14eef35908f66237035ea8e7b8e6af6357b00 100644
GIT binary patch
literal 709
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7Cr(}oCO|{#S9F5M?jcysy3fA0|QgJ
zr;B4q#hkad4gHiI1spE2P0W9g@V?&0sYu0aQ_9*Kq6&7GP3zvX+<p4~(~U{;di~S4
zv)+I6@da~%-ytPM9iagxK9+o8%-g%iPQJF~W1a0^yI&mHYtNcp({rAgwftwUsMvE9
zC*E$|dO7@=XW8uAWr>A+hm<y^M(keu_3m4X^}2_X>=Gy5Fk2&g{dZs4+{@b%*KU1(
zp={&lnr(dDJGb#?KQDhev26b7Z;6JNJ2sTnm;c+s`B_5nT9k3yPvK=}5`7}F&q`*c
zUi$0adQ^sg`tj4ZFSh^as{Xb5#uDFB)3Rh=nQ!4fd!OIfaBY_Lm;PBb`!6Q0HLd>f
z-}rCb<HJ$e|GGbHH@=hp=J4<RK6NYXodd#`bHC0CN=WB=^-4s(_5I9GNxqiP)902Y
z-@R2>J=b)_>fIc#uT7jd*LGQSx%joK{%mFbj<I)hBi{e)yYbF&(RYs5!f|o)TR%G<
qQYySPU)o~Y1`m$zmO(@OVf_DI$62MOC>xkA89ZJ6T-G@yGywo>bt(h^

delta 192
zcmV;x06+i51<(PI7=Hl+00006&*Py0000J1OjJb^0uu!O{2_F>GXMYpg-Jv~R7i>K
z&@m2xAPhj!8U{zb0Y~9za5Rs?5f~ka8Y68A9SDhu4*laBXeofEY1&KK6H8<ZS^V5)
zvTfK5Ss1p7j2#Q<=$J2-JLZb*%xtm53=b1Kh93#c@FT#JD>>tWxiTl#!@;pKBgW!j
usPkgP^I&Yui09xwO=<~Xm85B!_M<M+nH5;T09JGW0000<MNUMnLSTZ+c1_j*

diff --git a/ext/gd/tests/test_image_equals_file_palette.phpt b/ext/gd/tests/test_image_equals_file_palette.phpt
index 2e294c04c4066..d8f6a0556b20c 100644
--- a/ext/gd/tests/test_image_equals_file_palette.phpt
+++ b/ext/gd/tests/test_image_equals_file_palette.phpt
@@ -18,6 +18,7 @@ $red = imagecolorallocate($im, 255, 0, 0);
 imagefilledrectangle($im, 3,3, 7,7, $red);
 
 $filename = __DIR__ . DIRECTORY_SEPARATOR . 'test_image_equals_file_palette.png';
+imagepalettetotruecolor($im);
 imagepng($im, $filename);
 
 $im = imagecreate(10, 10);
@@ -25,6 +26,7 @@ imagecolorallocate($im, 255, 255, 255);
 $blue = imagecolorallocate($im, 0, 0, 255);
 imagefilledrectangle($im, 3,3, 7,7, $blue);
 
+imagepalettetotruecolor($im);
 test_image_equals_file($filename, $im);
 
 $im = imagecreate(10, 10);
@@ -33,6 +35,7 @@ imagecolorallocate($im, 0, 0, 0);
 $red = imagecolorallocate($im, 255, 0, 0);
 imagefilledrectangle($im, 3,3, 7,7, $red);
 
+imagepalettetotruecolor($im);
 test_image_equals_file($filename, $im);
 ?>
 --EXPECT--

From a0f26996b650b5cc8502be5974fe690f90984e30 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 31 Dec 2024 15:18:14 +0100
Subject: [PATCH 6/9] Merge similarity.inc into func.inc

There is no particular reason to have a separate file for similarity
comparisons.
---
 ext/gd/tests/avif_decode_encode.phpt |  2 +-
 ext/gd/tests/bug43475.phpt           |  2 +-
 ext/gd/tests/bug64641.phpt           |  2 +-
 ext/gd/tests/func.inc                | 37 ++++++++++++++++++++++++++
 ext/gd/tests/similarity.inc          | 39 ----------------------------
 ext/gd/tests/webp_basic.phpt         |  2 +-
 6 files changed, 41 insertions(+), 43 deletions(-)
 delete mode 100644 ext/gd/tests/similarity.inc

diff --git a/ext/gd/tests/avif_decode_encode.phpt b/ext/gd/tests/avif_decode_encode.phpt
index cb7f1ce95a67c..010ad82629891 100644
--- a/ext/gd/tests/avif_decode_encode.phpt
+++ b/ext/gd/tests/avif_decode_encode.phpt
@@ -14,7 +14,7 @@ gd
 --FILE--
 <?php
 
-    require_once __DIR__ . '/similarity.inc';
+    require_once __DIR__ . '/func.inc';
 
     $infile = __DIR__  . '/girl.avif';
     $outfile = __DIR__  . '/test.avif';
diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt
index a5b4ac6d22885..9d3931bd5d737 100644
--- a/ext/gd/tests/bug43475.phpt
+++ b/ext/gd/tests/bug43475.phpt
@@ -13,7 +13,7 @@ gd
 ?>
 --FILE--
 <?php
-require_once __DIR__ . '/similarity.inc';
+require_once __DIR__ . '/func.inc';
 
 function setStyleAndThickness($im, $color, $thickness)
 {
diff --git a/ext/gd/tests/bug64641.phpt b/ext/gd/tests/bug64641.phpt
index edfebee99c92a..c2676b77817a4 100644
--- a/ext/gd/tests/bug64641.phpt
+++ b/ext/gd/tests/bug64641.phpt
@@ -13,7 +13,7 @@ if (!(imagetypes() & IMG_PNG)) {
 ?>
 --FILE--
 <?php
-require_once __DIR__ . '/similarity.inc';
+require_once __DIR__ . '/func.inc';
 
 $im = imagecreatetruecolor(640, 480);
 
diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc
index 483594d526fc2..445f844ec55ab 100644
--- a/ext/gd/tests/func.inc
+++ b/ext/gd/tests/func.inc
@@ -155,3 +155,40 @@ function trycatch_dump(...$tests) {
     }
 }
 
+/**
+ * A very simple algorithm for finding the dissimilarity between images,
+ * mainly useful for checking lossy compression.
+ */
+
+/**
+ * Calculates the euclidean distance of two RGB values.
+ */
+function calc_pixel_distance(int $color1, int $color2): float
+{
+    return sqrt(
+        ((($color1 >> 16) & 0xFF) - (($color2 >> 16) & 0xFF)) ** 2 +
+        ((($color1 >>  8) & 0xFF) - (($color2 >>  8) & 0xFF)) ** 2 +
+        ((($color1 >>  0) & 0xFF) - (($color2 >>  0) & 0xFF)) ** 2
+    );
+}
+
+/**
+ * Calculates dissimilarity of two images.
+ *
+ * The dissimilarity. 0 means the images are identical. The higher
+ * the value, the more dissimilar are the images.
+ */
+function calc_image_dissimilarity(GdImage $image1, GdImage $image2): float
+{
+    assert(imageistruecolor($image1) && imageistruecolor($image2));
+    assert(imagesx($image1) === imagesx($image2) && imagesy($image1) === imagesy($image2));
+    $dissimilarity = 0;
+    for ($j = 0, $m = imagesy($image1); $j < $m; $j++) {
+        for ($i = 0, $n = imagesx($image1); $i < $n; $i++) {
+            $color1 = imagecolorat($image1, $i, $j);
+            $color2 = imagecolorat($image2, $i, $j);
+            $dissimilarity += calc_pixel_distance($color1, $color2);
+        }
+    }
+    return $dissimilarity;
+}
diff --git a/ext/gd/tests/similarity.inc b/ext/gd/tests/similarity.inc
deleted file mode 100644
index 7654e6ff31fad..0000000000000
--- a/ext/gd/tests/similarity.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * A very simple algorithm for finding the dissimilarity between images,
- * mainly useful for checking lossy compression.
- */
-
-/**
- * Calculates the euclidean distance of two RGB values.
- */
-function calc_pixel_distance(int $color1, int $color2): float
-{
-    return sqrt(
-        ((($color1 >> 16) & 0xFF) - (($color2 >> 16) & 0xFF)) ** 2 +
-        ((($color1 >>  8) & 0xFF) - (($color2 >>  8) & 0xFF)) ** 2 +
-        ((($color1 >>  0) & 0xFF) - (($color2 >>  0) & 0xFF)) ** 2
-    );
-}
-
-/**
- * Calculates dissimilarity of two images.
- *
- * The dissimilarity. 0 means the images are identical. The higher
- * the value, the more dissimilar are the images.
- */
-function calc_image_dissimilarity(GdImage $image1, GdImage $image2): float
-{
-    assert(imageistruecolor($image1) && imageistruecolor($image2));
-    assert(imagesx($image1) === imagesx($image2) && imagesy($image1) === imagesy($image2));
-    $dissimilarity = 0;
-    for ($j = 0, $m = imagesy($image1); $j < $m; $j++) {
-        for ($i = 0, $n = imagesx($image1); $i < $n; $i++) {
-            $color1 = imagecolorat($image1, $i, $j);
-            $color2 = imagecolorat($image2, $i, $j);
-            $dissimilarity += calc_pixel_distance($color1, $color2);
-        }
-    }
-    return $dissimilarity;
-}
diff --git a/ext/gd/tests/webp_basic.phpt b/ext/gd/tests/webp_basic.phpt
index 97b0451c09b8d..2e074c23ef5ed 100644
--- a/ext/gd/tests/webp_basic.phpt
+++ b/ext/gd/tests/webp_basic.phpt
@@ -12,7 +12,7 @@ if (!function_exists('imagewebp') || !function_exists('imagecreatefromwebp'))
 ?>
 --FILE--
 <?php
-require_once __DIR__ . '/similarity.inc';
+require_once __DIR__ . '/func.inc';
 
 $filename = __DIR__ . '/webp_basic.webp';
 

From fc0b2296cd235ed3011003601fad01c77f96f5e7 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 31 Dec 2024 16:43:25 +0100
Subject: [PATCH 7/9] Simplify bug43475.phpt and bug64641.phpt

`calc_image_dissimilarity()` calculates the sum of the euclidean
distance of the RGB channels of all pixels.  The euclidean distance is
either zero or greater than or equal to one (but never in ]0, 1[).  The
sum of these values also has this property, so it doesn't make sense to
check for less than 1e-5.  Thus we just call `test_image_equals_file()`
instead.
---
 ext/gd/tests/bug43475.phpt |  5 ++---
 ext/gd/tests/bug64641.phpt | 12 ++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt
index 9d3931bd5d737..4d3db399a30e2 100644
--- a/ext/gd/tests/bug43475.phpt
+++ b/ext/gd/tests/bug43475.phpt
@@ -59,9 +59,8 @@ imageline($im, 200, 100, 700, 100, IMG_COLOR_STYLED);
 imageline($im, 700, 100, 700, 600, IMG_COLOR_STYLED);
 imageline($im, 700, 600, 200, 100, IMG_COLOR_STYLED);
 
-$ex = imagecreatefrompng(__DIR__ . '/bug43475.png');
 imagepalettetotruecolor($im);
-var_dump(calc_image_dissimilarity($ex, $im) < 1e-5);
+test_image_equals_file(__DIR__ . '/bug43475.png', $im);
 ?>
 --EXPECT--
-bool(true)
+The images are equal.
diff --git a/ext/gd/tests/bug64641.phpt b/ext/gd/tests/bug64641.phpt
index c2676b77817a4..d2e51817b9b48 100644
--- a/ext/gd/tests/bug64641.phpt
+++ b/ext/gd/tests/bug64641.phpt
@@ -31,15 +31,7 @@ $points = array(
 );
 imagefilledpolygon($im, $points, 0xFFFF00);
 
-$ex = imagecreatefrompng(__DIR__ . '/bug64641.png');
-if (($diss = calc_image_dissimilarity($ex, $im)) < 1e-5) {
-    echo "IDENTICAL";
-} else {
-    echo "DISSIMILARITY: $diss";
-}
-imagedestroy($ex);
-
-imagedestroy($im);
+test_image_equals_file(__DIR__ . '/bug64641.png', $im);
 ?>
 --EXPECT--
-IDENTICAL
+The images are equal.

From 9efc96f665f2c700a5a3a6d470da77b74382285e Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 31 Dec 2024 16:52:29 +0100
Subject: [PATCH 8/9] Replace calc_image_dissimilarity() with the well-known
 mse()

`calc_image_dissimilarity()` has the drawback that it did sum up the
pixel differences, so for large images the result could be way larger
than for small images.  It also has the drawback that it likely is not
as well understood as the mean squared error.  Thus we replace it with
the latter, and calculate the mean squared error of the individual RGB
channels (to be precise).  The result is always in range 0..255**2 what
makes reasoning about thresholds easier.
---
 ext/gd/tests/avif_decode_encode.phpt |  6 ++---
 ext/gd/tests/func.inc                | 37 ++++++++--------------------
 ext/gd/tests/webp_basic.phpt         |  4 +--
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/ext/gd/tests/avif_decode_encode.phpt b/ext/gd/tests/avif_decode_encode.phpt
index 010ad82629891..b73f61a537b50 100644
--- a/ext/gd/tests/avif_decode_encode.phpt
+++ b/ext/gd/tests/avif_decode_encode.phpt
@@ -58,8 +58,8 @@ gd
 
     // Note we could also forgive a certain number of pixel differences.
     // With the current test image, we just didn't need to.
-    echo 'How many pixels are different in the two images? ';
-    print_r(calc_image_dissimilarity($img, $img_from_avif));
+    echo 'What is the mean squared error of the two images? ';
+    print_r(mse($img, $img_from_avif));
 
     unlink($outfile);
 
@@ -79,4 +79,4 @@ Encoding AVIF with illegal quality: imageavif(): Argument #3 ($quality) must be
 Encoding AVIF with illegal speed: imageavif(): Argument #4 ($speed) must be between -1 and 10
 Encoding AVIF losslessly... ok
 Decoding the AVIF we just wrote...
-How many pixels are different in the two images? 0
+What is the mean squared error of the two images? 0
diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc
index 445f844ec55ab..0668742d2b8a7 100644
--- a/ext/gd/tests/func.inc
+++ b/ext/gd/tests/func.inc
@@ -156,39 +156,22 @@ function trycatch_dump(...$tests) {
 }
 
 /**
- * A very simple algorithm for finding the dissimilarity between images,
- * mainly useful for checking lossy compression.
+ * Calculate the mean squared error (in range 0..255**2)
  */
-
-/**
- * Calculates the euclidean distance of two RGB values.
- */
-function calc_pixel_distance(int $color1, int $color2): float
-{
-    return sqrt(
-        ((($color1 >> 16) & 0xFF) - (($color2 >> 16) & 0xFF)) ** 2 +
-        ((($color1 >>  8) & 0xFF) - (($color2 >>  8) & 0xFF)) ** 2 +
-        ((($color1 >>  0) & 0xFF) - (($color2 >>  0) & 0xFF)) ** 2
-    );
-}
-
-/**
- * Calculates dissimilarity of two images.
- *
- * The dissimilarity. 0 means the images are identical. The higher
- * the value, the more dissimilar are the images.
- */
-function calc_image_dissimilarity(GdImage $image1, GdImage $image2): float
+function mse(GdImage $image1, GdImage $image2): float
 {
     assert(imageistruecolor($image1) && imageistruecolor($image2));
     assert(imagesx($image1) === imagesx($image2) && imagesy($image1) === imagesy($image2));
-    $dissimilarity = 0;
+    $e = $count = 0;
     for ($j = 0, $m = imagesy($image1); $j < $m; $j++) {
         for ($i = 0, $n = imagesx($image1); $i < $n; $i++) {
-            $color1 = imagecolorat($image1, $i, $j);
-            $color2 = imagecolorat($image2, $i, $j);
-            $dissimilarity += calc_pixel_distance($color1, $color2);
+            $c1 = imagecolorat($image1, $i, $j);
+            $c2 = imagecolorat($image2, $i, $j);
+            $e += ((($c1 >> 16) & 255) - (($c2 >> 16) & 255)) ** 2
+                + ((($c1 >>  8) & 255) - (($c2 >>  8) & 255)) ** 2
+                + ((($c1 >>  0) & 255) - (($c2 >>  0) & 255)) ** 2;
+            $count += 3;
         }
     }
-    return $dissimilarity;
+    return $e / $count;
 }
diff --git a/ext/gd/tests/webp_basic.phpt b/ext/gd/tests/webp_basic.phpt
index 2e074c23ef5ed..ef2fae8652560 100644
--- a/ext/gd/tests/webp_basic.phpt
+++ b/ext/gd/tests/webp_basic.phpt
@@ -30,12 +30,12 @@ imagewebp($im1, $filename);
 $im2 = imagecreatefromwebp($filename);
 imagewebp($im2, $filename);
 echo 'Is lossy conversion close enough? ';
-var_dump(calc_image_dissimilarity($im1, $im2) < 10e5);
+var_dump(mse($im1, $im2) < 500);
 
 imagewebp($im1, $filename, IMG_WEBP_LOSSLESS);
 $im_lossless = imagecreatefromwebp($filename);
 echo 'Does lossless conversion work? ';
-var_dump(calc_image_dissimilarity($im1, $im_lossless) == 0);
+var_dump(mse($im1, $im_lossless) == 0);
 
 try {
 	imagewebp($im1, $filename, -10);

From 2f1d25f9f16f308297b7849d127fafc12edc363a Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Thu, 2 Jan 2025 14:28:29 +0100
Subject: [PATCH 9/9] review

---
 ext/gd/tests/avif_decode_encode.phpt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/gd/tests/avif_decode_encode.phpt b/ext/gd/tests/avif_decode_encode.phpt
index b73f61a537b50..054eb52467637 100644
--- a/ext/gd/tests/avif_decode_encode.phpt
+++ b/ext/gd/tests/avif_decode_encode.phpt
@@ -58,8 +58,8 @@ gd
 
     // Note we could also forgive a certain number of pixel differences.
     // With the current test image, we just didn't need to.
-    echo 'What is the mean squared error of the two images? ';
-    print_r(mse($img, $img_from_avif));
+    echo 'What is the mean squared error of the two images? ',
+        mse($img, $img_from_avif);
 
     unlink($outfile);