From: Sean Fraser <frasmage@gmail.com>
Date: Fri, 26 May 2017 00:22:48 +0000 (-0400)
Subject: added test for imagecopymergegray(), added color check to test for imagecopymerge()
X-Git-Tag: php-7.2.0alpha1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a7e0f7da08b83a03a3e307ae135c31e695e9b99;p=php

added test for imagecopymergegray(), added color check to test for imagecopymerge()
---

diff --git a/ext/gd/tests/imagecopymerge_basic.phpt b/ext/gd/tests/imagecopymerge_basic.phpt
index 85f1162629..f324eaedf1 100644
--- a/ext/gd/tests/imagecopymerge_basic.phpt
+++ b/ext/gd/tests/imagecopymerge_basic.phpt
@@ -3,6 +3,9 @@ Testing imagecopymerge() of GD library
 --CREDITS--
 Cleston Viel Vieira de Sousa <cleston [dot] vs [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
+
+Updated by Sean Fraaser <frasmage [at] gmail [dot] com>
+PHP[tek] 2017
 --SKIPIF--
 <?php 
 if (!extension_loaded("gd")) die("skip GD not present");
@@ -13,18 +16,19 @@ if (!extension_loaded("gd")) die("skip GD not present");
 $des = imagecreate(120, 120);
 $src = imagecreate(100, 100);
 
-imagecolorallocate($des, 50, 50, 200);
-$colorTXT_des = imagecolorallocate($des, 255, 255, 255);
-
-imagecolorallocate($src, 255, 255, 255);
-$colorTXT_src = imagecolorallocate($src, 0, 255, 255);
+$color_des = imagecolorallocate($des, 50, 50, 200);
+$color_src = imagecolorallocate($src, 255, 255, 255);
 
-imagestring($src, 1, 5, 5,  "A Simple Text", $colorTXT_src);
-imagestring($des, 1, 5, 5,  "Another Simple Text", $colorTXT_des);
+imagefill($des, 0, 0, $color_des);
+imagefill($src, 0, 0, $color_src);
 
 var_dump(imagecopymerge($des, $src, 20, 20, 0, 0, 50, 50, 75));
 
+$color = imagecolorat($des, 30, 30);
+$rgb = imagecolorsforindex($des, $color);
+echo $rgb['red'], ", ", $rgb['green'], ", ", $rgb['blue'], "\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
+203, 203, 241
diff --git a/ext/gd/tests/imagecopymergegray_basic.phpt b/ext/gd/tests/imagecopymergegray_basic.phpt
new file mode 100644
index 0000000000..baad9b43ac
--- /dev/null
+++ b/ext/gd/tests/imagecopymergegray_basic.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Testing imagecopymergegray() of GD library
+--CREDITS--
+Sean Fraser <frasmage [at] gmail [dot] com>
+PHP[tek] 2017
+--SKIPIF--
+<?php 
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
+--FILE--
+<?php
+
+$des = imagecreate(120, 120);
+$src = imagecreate(100, 100);
+
+$color_des = imagecolorallocate($des, 50, 50, 200);
+$color_src = imagecolorallocate($src, 255, 255, 0);
+
+imagefill($des, 0, 0, $color_des);
+imagefill($src, 0, 0, $color_src);
+
+var_dump(imagecopymergegray($des, $src, 20, 20, 0, 0, 50, 50, 75));
+
+$color = imagecolorat($des, 30, 30);
+$rgb = imagecolorsforindex($des, $color);
+echo $rgb['red'], ", ", $rgb['green'], ", ", $rgb['blue'], "\n";
+
+?>
+--EXPECT--
+bool(true)
+208, 208, 16