From 301330ff883f3b9183b5351e0f8d6d142f1f1100 Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Mon, 18 Nov 2002 16:51:02 +0000
Subject: [PATCH] -Added colordepth for png -Added tests for width/heidth for
 unsigned/signed problems

---
 ext/standard/tests/image/246x247.png          | Bin 0 -> 360 bytes
 ext/standard/tests/image/384x385.png          | Bin 0 -> 267 bytes
 ext/standard/tests/image/getimagesize.phpt    |   4 +-
 .../tests/image/getimagesize_246x247.phpt     |  42 ++++++++++++++++++
 .../tests/image/getimagesize_384x385.phpt     |  42 ++++++++++++++++++
 5 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 ext/standard/tests/image/246x247.png
 create mode 100644 ext/standard/tests/image/384x385.png
 create mode 100644 ext/standard/tests/image/getimagesize_246x247.phpt
 create mode 100644 ext/standard/tests/image/getimagesize_384x385.phpt

diff --git a/ext/standard/tests/image/246x247.png b/ext/standard/tests/image/246x247.png
new file mode 100644
index 0000000000000000000000000000000000000000..648a64e0aa83d8ec0f95879b6df8083c96d0ebfe
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^-+=f#3p0?sldvTYNNJb2MwB=gr6!hS=I1GdWag$a
z_~t7ZS}6GCmnj$-7#JxSnp+u~SQ%L=Xd4(B7+6d6@B+25mw5WRvR~pB5>OBqnY?=n
zP>8d@BeIx*f$IYZGdis?nE@1JNq6*hWMJ6X&;2Kn705RT@Ck7R(*OVe2a-gB=%wvb
zfl6CET^vIyZoNHg$jHFJ!=#{nWB(e(vNw%POX?q$?Y^70{q|cLQ{N9VJaBpVymRjo
QNs!Y$UHx3vIVCg!09*ZrcmMzZ

literal 0
HcmV?d00001

diff --git a/ext/standard/tests/image/384x385.png b/ext/standard/tests/image/384x385.png
new file mode 100644
index 0000000000000000000000000000000000000000..843ddfaf08e3222f090205c292ce4db738ab8aec
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0y~yU~B;5Mn-0!NNDJnNFb$M;u=xnT$Gwvl9`{U5R#dj
z%HW%?U}&M>mtUq}WME*VU}$b-Xkuk#si19OXkcJ1(ZdVW#$Mv->&kwKTS$OkW5dgJ
zM}R_{1s;*b3=G^tAk28_ZrvZCAWOQVuOkD)#(wTUiL5|ATYyi9E0F&G|NqjP^X~##
zfu1goAr-gYo;GA;VBld=_&xm^&u(`6mw_yf0%V|ht&Gv3uYZ|8kP8JG&fw|l=d#Wz
Gp$PzgB0&=X

literal 0
HcmV?d00001

diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt
index 57310c32f7..9d28acf7ac 100644
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@@ -121,7 +121,7 @@ array(10) {
     string(9) "image/iff"
   }
   ["test4pix.png"]=>
-  array(5) {
+  array(6) {
     [0]=>
     int(4)
     [1]=>
@@ -130,6 +130,8 @@ array(10) {
     int(3)
     [3]=>
     string(20) "width="4" height="1""
+    ["bits"]=>
+    int(4)
     ["mime"]=>
     string(9) "image/png"
   }
diff --git a/ext/standard/tests/image/getimagesize_246x247.phpt b/ext/standard/tests/image/getimagesize_246x247.phpt
new file mode 100644
index 0000000000..e5a0aea779
--- /dev/null
+++ b/ext/standard/tests/image/getimagesize_246x247.phpt
@@ -0,0 +1,42 @@
+--TEST--
+GetImageSize() with 246x247 pixels
+--SKIPIF--
+<?php
+	require_once('skipif_imagetype.inc');
+?>
+--FILE--
+<?php
+	// Note: SWC requires zlib
+	$dir = opendir(dirname(__FILE__)) or die('cannot open directory: '.dirname(__FILE__));
+	$result = array();
+	$files  = array();
+	while (($file = readdir($dir)) !== FALSE) {
+		if (preg_match('/^246x247\./',$file)) {
+			$files[] = $file;
+		}
+	}
+	closedir($dir);
+	sort($files);
+	foreach($files as $file) {
+		$result[$file] = getimagesize(dirname(__FILE__)."/$file");
+	}
+	var_dump($result);
+?>
+--EXPECT--
+array(1) {
+  ["246x247.png"]=>
+  array(6) {
+    [0]=>
+    int(246)
+    [1]=>
+    int(247)
+    [2]=>
+    int(3)
+    [3]=>
+    string(24) "width="246" height="247""
+    ["bits"]=>
+    int(4)
+    ["mime"]=>
+    string(9) "image/png"
+  }
+}
diff --git a/ext/standard/tests/image/getimagesize_384x385.phpt b/ext/standard/tests/image/getimagesize_384x385.phpt
new file mode 100644
index 0000000000..0051df71e0
--- /dev/null
+++ b/ext/standard/tests/image/getimagesize_384x385.phpt
@@ -0,0 +1,42 @@
+--TEST--
+GetImageSize() with 384x385 pixels
+--SKIPIF--
+<?php
+	require_once('skipif_imagetype.inc');
+?>
+--FILE--
+<?php
+	// Note: SWC requires zlib
+	$dir = opendir(dirname(__FILE__)) or die('cannot open directory: '.dirname(__FILE__));
+	$result = array();
+	$files  = array();
+	while (($file = readdir($dir)) !== FALSE) {
+		if (preg_match('/^384x385\./',$file)) {
+			$files[] = $file;
+		}
+	}
+	closedir($dir);
+	sort($files);
+	foreach($files as $file) {
+		$result[$file] = getimagesize(dirname(__FILE__)."/$file");
+	}
+	var_dump($result);
+?>
+--EXPECT--
+array(1) {
+  ["384x385.png"]=>
+  array(6) {
+    [0]=>
+    int(384)
+    [1]=>
+    int(385)
+    [2]=>
+    int(3)
+    [3]=>
+    string(24) "width="384" height="385""
+    ["bits"]=>
+    int(1)
+    ["mime"]=>
+    string(9) "image/png"
+  }
+}
-- 
2.40.0