helly           Mon Nov 18 11:55:36 2002 EDT

  Added files:                 (Branch: PHP_4_3)
    /php4/ext/standard/tests/image      246x247.png 384x385.png 
                                        getimagesize_246x247.phpt 
                                        getimagesize_384x385.phpt 

  Modified files:              
    /php4/ext/standard/tests/image      getimagesize.phpt 
  Log:
  MFH
  -Added colordepth for png
  -Added tests for width/heidth for unsigned/signed problems
  
  
Index: php4/ext/standard/tests/image/getimagesize.phpt
diff -u php4/ext/standard/tests/image/getimagesize.phpt:1.3 
php4/ext/standard/tests/image/getimagesize.phpt:1.3.2.1
--- php4/ext/standard/tests/image/getimagesize.phpt:1.3 Thu Nov  7 21:50:28 2002
+++ php4/ext/standard/tests/image/getimagesize.phpt     Mon Nov 18 11:55:35 2002
@@ -121,7 +121,7 @@
     string(9) "image/iff"
   }
   ["test4pix.png"]=>
-  array(5) {
+  array(6) {
     [0]=>
     int(4)
     [1]=>
@@ -130,6 +130,8 @@
     int(3)
     [3]=>
     string(20) "width="4" height="1""
+    ["bits"]=>
+    int(4)
     ["mime"]=>
     string(9) "image/png"
   }

Index: php4/ext/standard/tests/image/getimagesize_246x247.phpt
+++ php4/ext/standard/tests/image/getimagesize_246x247.phpt
--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"
  }
}

Index: php4/ext/standard/tests/image/getimagesize_384x385.phpt
+++ php4/ext/standard/tests/image/getimagesize_384x385.phpt
--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"
  }
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to