- add colorresolvealpha to colorresolve tests

- update colormatch

diff --git a/ext/gd/tests/colormatch.phpt b/ext/gd/tests/colormatch.phpt
index d940914ea5f992cdddb506a0414ce41fdb293be7..460b01a7e3847334b3f2c6218d535cc28096689a 100644 (file)
--- a/ext/gd/tests/colormatch.phpt
+++ b/ext/gd/tests/colormatch.phpt
@@ -12,10 +12,8 @@ $im2 = imagecreate(5,5);
 
 imagecolormatch($im, $im2);
 
-echo "ok\n";
-
 imagedestroy($im);
 ?>
 --EXPECTF--
-Fatal error: imagecolormatch(): Image2 must have at least one color in %s on line %d
+Warning: imagecolormatch(): Image2 must have at least one color in %s on line %d
 

diff --git a/ext/gd/tests/colorresolve.phpt b/ext/gd/tests/colorresolve.phpt
index c8e6a345af13713d6a398cc5a5447418e0fc1b5a..9af0f1860086550714e15b7066bced9be929312b 100644 (file)
--- a/ext/gd/tests/colorresolve.phpt
+++ b/ext/gd/tests/colorresolve.phpt
@@ -35,6 +35,36 @@ $c = imagecolorresolve($im, 255,10,10);
 print_r(imagecolorsforindex($im, $c));
 
 
+
+// with alpha
+$im = imagecreatetruecolor(5,5);
+$c = imagecolorresolvealpha($im, 255,0,255, 100);
+printf("%X\n", $c);
+imagedestroy($im);
+
+$im = imagecreate(5,5);
+$c = imagecolorresolvealpha($im, 255,0,255,100);
+print_r(imagecolorsforindex($im, $c));
+imagedestroy($im);
+
+$im = imagecreate(5,5);
+for ($i=0; $i<255; $i++) imagecolorresolvealpha($im, $i,0,0,1);
+$c = imagecolorresolvealpha($im, 255,0,0,1);
+print_r(imagecolorsforindex($im, $c));
+
+
+$im = imagecreate(5,5);
+for ($i=0; $i<256; $i++) {
+       if ($i == 246) {
+               imagecolorresolvealpha($im, $i,10,10,1);
+       } else {
+               imagecolorresolvealpha($im, $i,0,0,100);
+       }
+}
+$c = imagecolorresolvealpha($im, 255,10,10,0);
+print_r(imagecolorsforindex($im, $c));
+
+
 ?>
 --EXPECTF--
 FF00FF
@@ -59,3 +89,25 @@ Array
     [blue] => 10
     [alpha] => 0
 )
+64FF00FF
+Array
+(
+    [red] => 255
+    [green] => 0
+    [blue] => 255
+    [alpha] => 100
+)
+Array
+(
+    [red] => 255
+    [green] => 0
+    [blue] => 0
+    [alpha] => 1
+)
+Array
+(
+    [red] => 246
+    [green] => 10
+    [blue] => 10
+    [alpha] => 1
+)