From 65ee87f20dfebb4cde5f908cd6ba57384810e740 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 25 Sep 2016 09:47:23 +0200
Subject: [PATCH] Refactor imagegammacorrect()

We apply the law `(b**r)**s == b**(r*s)` which holds for all non-negative b
and positive r,s, so a single pow() suffices. Furthermore, we precompute the
gamma, so the refactored code is simpler and faster.
---
 ext/gd/gd.c                                   |  16 ++--
 .../tests/imagegammacorrect_variation2.phpt   |  72 ++++++++++++++++++
 .../imagegammacorrect_variation2_1_1.png      | Bin 0 -> 2009 bytes
 .../imagegammacorrect_variation2_1_2.png      | Bin 0 -> 2121 bytes
 .../imagegammacorrect_variation2_2_1.png      | Bin 0 -> 2150 bytes
 5 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 ext/gd/tests/imagegammacorrect_variation2.phpt
 create mode 100644 ext/gd/tests/imagegammacorrect_variation2_1_1.png
 create mode 100644 ext/gd/tests/imagegammacorrect_variation2_1_2.png
 create mode 100644 ext/gd/tests/imagegammacorrect_variation2_2_1.png

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 692497d186..b726aab10c 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3025,7 +3025,7 @@ PHP_FUNCTION(imagegammacorrect)
 	zval *IM;
 	gdImagePtr im;
 	int i;
-	double input, output;
+	double input, output, gamma;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rdd", &IM, &input, &output) == FAILURE) {
 		return;
@@ -3036,6 +3036,8 @@ PHP_FUNCTION(imagegammacorrect)
 		RETURN_FALSE;
 	}
 
+	gamma = input / output;
+
 	if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
 		RETURN_FALSE;
 	}
@@ -3048,9 +3050,9 @@ PHP_FUNCTION(imagegammacorrect)
 				c = gdImageGetPixel(im, x, y);
 				gdImageSetPixel(im, x, y,
 					gdTrueColorAlpha(
-						(int) ((pow((pow((gdTrueColorGetRed(c)   / 255.0), input)), 1.0 / output) * 255) + .5),
-						(int) ((pow((pow((gdTrueColorGetGreen(c) / 255.0), input)), 1.0 / output) * 255) + .5),
-						(int) ((pow((pow((gdTrueColorGetBlue(c)  / 255.0), input)), 1.0 / output) * 255) + .5),
+						(int) ((pow((gdTrueColorGetRed(c)   / 255.0), gamma) * 255) + .5),
+						(int) ((pow((gdTrueColorGetGreen(c) / 255.0), gamma) * 255) + .5),
+						(int) ((pow((gdTrueColorGetBlue(c)  / 255.0), gamma) * 255) + .5),
 						gdTrueColorGetAlpha(c)
 					)
 				);
@@ -3060,9 +3062,9 @@ PHP_FUNCTION(imagegammacorrect)
 	}
 
 	for (i = 0; i < gdImageColorsTotal(im); i++) {
-		im->red[i]   = (int)((pow((pow((im->red[i]   / 255.0), input)), 1.0 / output) * 255) + .5);
-		im->green[i] = (int)((pow((pow((im->green[i] / 255.0), input)), 1.0 / output) * 255) + .5);
-		im->blue[i]  = (int)((pow((pow((im->blue[i]  / 255.0), input)), 1.0 / output) * 255) + .5);
+		im->red[i]   = (int)((pow((im->red[i]   / 255.0), gamma) * 255) + .5);
+		im->green[i] = (int)((pow((im->green[i] / 255.0), gamma) * 255) + .5);
+		im->blue[i]  = (int)((pow((im->blue[i]  / 255.0), gamma) * 255) + .5);
 	}
 
 	RETURN_TRUE;
diff --git a/ext/gd/tests/imagegammacorrect_variation2.phpt b/ext/gd/tests/imagegammacorrect_variation2.phpt
new file mode 100644
index 0000000000..4a317b5d90
--- /dev/null
+++ b/ext/gd/tests/imagegammacorrect_variation2.phpt
@@ -0,0 +1,72 @@
+--TEST--
+Apply imagegammacorrect() to a step wedge
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+?>
+--FILE--
+<?php
+require __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
+
+test_gamma_both(1, 2);
+test_gamma_both(1, 1);
+test_gamma_both(2, 1);
+
+function test_gamma_both($in, $out)
+{
+    test_gamma($in, $out, 'imagecreate');
+    test_gamma($in, $out, 'imagecreatetruecolor');
+}
+
+function test_gamma($in, $out, $constructor)
+{
+    $im = $constructor(640, 480);
+    for ($j = 0; $j < 4; $j++) {
+        for ($i = 0; $i < 32; $i++) {
+            draw_cell($im, $i, $j);
+        }
+    }
+    
+    imagegammacorrect($im, $in, $out);
+    
+    $filename = __DIR__ . DIRECTORY_SEPARATOR
+        . "imagegammacorrect_variation2_{$in}_{$out}.png";
+    $kind = $constructor === 'imagecreate' ? 'palette' : 'truecolor';
+    echo "$kind gamma ($in, $out): ";
+    test_image_equals_file($filename, $im);
+}
+
+function draw_cell($im, $x, $y)
+{
+    $x1 = 20 * $x;
+    $y1 = 120 * $y;
+    $x2 = $x1 + 19;
+    $y2 = $y1 + 119;
+    $color = cell_color($im, $x, $y);
+    imagefilledrectangle($im, $x1,$y1, $x2,$y2, $color);
+}
+
+function cell_color($im, $x, $y)
+{
+    $channel = 8 * $x + 4;
+    switch ($y) {
+        case 0:
+            return imagecolorallocate($im, $channel, $channel, $channel);
+        case 1:
+            return imagecolorallocate($im, $channel, 0, 0);
+        case 2:
+            return imagecolorallocate($im, 0, $channel, 0);
+        case 3:
+            return imagecolorallocate($im, 0, 0, $channel);
+    }
+}
+?>
+===DONE===
+--EXPECT--
+palette gamma (1, 2): The images are equal.
+truecolor gamma (1, 2): The images are equal.
+palette gamma (1, 1): The images are equal.
+truecolor gamma (1, 1): The images are equal.
+palette gamma (2, 1): The images are equal.
+truecolor gamma (2, 1): The images are equal.
+===DONE===
diff --git a/ext/gd/tests/imagegammacorrect_variation2_1_1.png b/ext/gd/tests/imagegammacorrect_variation2_1_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..517010b42ffe99a80fc22fb519a34b54f707a268
GIT binary patch
literal 2009
zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sV0^&A1Qgk|*?TjP;w<opEM{QfI|9OtQ?>b|
z85r2RJzX3_D(1YszL58bg8<9H&#w<Wm0!KEu{fgnns;bTLH4@6-)C7pzi|r;`2HO8
zW=Qa9U{p{zz#t%yz`(&_z`(*H!NA1C!@$VM*3iJf?BFmeJw$?~aqqnJef!?0aWmAP
zV;+sX;ghDX-;%#}{2CaP9U6_<VN_aOkNSQ153Dq<7%hZ{Pv!G~)nEZ%$;ER`7lCy(
NgQu&X%Q~loCIEU$H&g%s

literal 0
HcmV?d00001

diff --git a/ext/gd/tests/imagegammacorrect_variation2_1_2.png b/ext/gd/tests/imagegammacorrect_variation2_1_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b9d7f04a6c57dbfaf0a3807799645adc59dafc0
GIT binary patch
literal 2121
zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sV0^&A1Qgk|*?TjP;w<opEM{QfI|9OtQ?>b|
z85r1qd%8G=RLpsM-Eq~c01;QmzegmFI#j*1`X9J=;UCK<P2Ce#{d;C2{`}wHx_tMy
zzw0V?=iYw!cGtT0?eot+|M2Z^o&3FhaqCld>zsc0_Vdp@SIXu+znm-IfBfaUTmRCm
zeJ{U!7nl3{{Rbfi3!er?1%(3)0s;vP92^D=EG!ZXOiVlsjErmz4Ghc<4x`dTBv=|>
ze*0ctW4np9f%`M#Xv7Vh^xXLSt@Va`?AvZ1D3iTW$F}W#<6G@pdd#<<AKmtub9=w=
zy{&)GmRUW#+nrlGnvI7~@%5l?cP;y~-v`R1Z>(d!eg42V+YPm@w^I{-@3~QC_wZZc
uq21f|-}F=8Q@wUA|7ejte5$HH>_0d07{0Ro{2JIcVDNPHb6Mw<&;$UEEPSs3

literal 0
HcmV?d00001

diff --git a/ext/gd/tests/imagegammacorrect_variation2_2_1.png b/ext/gd/tests/imagegammacorrect_variation2_2_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7384be913a4581f91d67b275b91a7f528192cc9
GIT binary patch
literal 2150
zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sV0^&A1Qgk|*?TjP;w<opEM{QfI|9OtQ?>b|
z85lSuJY5_^D(1Ys?wKcJD8lMEeOHy-`}$DF3GW@GJOuh~*f;Eca{r&tjcvI*-(J6d
z{lm8c3!UwEzt>h&+sIA7J<o6X!?!<c;_|9@#<Xp}{<?JM+qY%X_wK#_p7OiGX4-AL
z`R5<Lef>2m?|0q)_U-e}r&n0VDKjL@U|@D|Xkb)OIKUtvkifvfVZgw`BEi7K#KXYI
z$kxy>Dm_$!<@c3e-?!g9_v5GJ{kr=9yUQ6q#1}J;M((gl)Q!5);kRe%A5T2^)^4M%
z-VR&eob%jy`ogzgH{HH{<eOZsJa^uF;oH}nZht@W&DgGVH13B=&Lv#dHm;owjC*?`
j<9<)cXxtB@xZnRIN1*fZkCYN%!-2um)z4*}Q$iB}?s<X6

literal 0
HcmV?d00001

-- 
2.50.1