cvs: php4 /ext/exif/tests 003.phpt 004.phpt
| From: | Marcus B�rger | Date: | Wed, 21 Aug 2002 11:37:23 +0000 |
| Subject: | cvs: php4 /ext/exif/tests 003.phpt 004.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13528@lists.php.net to get a copy of this message | ||
helly Wed Aug 21 07:37:23 2002 EDT
Modified files:
/php4/ext/exif/tests 003.phpt 004.phpt
Log:
Reflect recent changes to exif.c
Index: php4/ext/exif/tests/003.phpt
diff -u php4/ext/exif/tests/003.phpt:1.5 php4/ext/exif/tests/003.phpt:1.6
--- php4/ext/exif/tests/003.phpt:1.5 Mon Jun 24 18:22:42 2002
+++ php4/ext/exif/tests/003.phpt Wed Aug 21 07:37:22 2002
@@ -2,8 +2,11 @@
Check for exif_read_data, Unicode user comment
--SKIPIF--
<?php if (!extension_loaded("exif")) print "skip";?>
---POST--
---GET--
+--INI--
+output_handler =
+zlib.output_compression = Off
+exif.decode_unicode_motorola=UCS-2BE
+exif.encode_unicode=ISO-8859-15
--FILE--
<?php
/*
@@ -12,9 +15,6 @@
copy of test1.jpg as a thumbnail.
test3.jpg is the same as test2.jpg but with a UNICODE UserComment:
ÄÖ&Üßäöü
*/
-chdir($_ENV['PHP_DIR']);
-ini_alter('exif.decode_unicode_motorola', 'UCS-2BE');
-ini_alter('exif.encode_unicode', 'ISO-8859-15');
$image = exif_read_data('./ext/exif/tests/test3.jpg','',true,false);
$accept = '';
foreach($image as $idx=>$section) {
Index: php4/ext/exif/tests/004.phpt
diff -u php4/ext/exif/tests/004.phpt:1.1 php4/ext/exif/tests/004.phpt:1.2
--- php4/ext/exif/tests/004.phpt:1.1 Sat Jun 22 20:39:34 2002
+++ php4/ext/exif/tests/004.phpt Wed Aug 21 07:37:22 2002
@@ -2,31 +2,33 @@
Check for exif_read_data, Unicode WinXP tags
--SKIPIF--
<?php if (!extension_loaded("exif")) print "skip";?>
---POST--
---GET--
+--INI--
+output_handler =
+zlib.output_compression = Off
+exif.decode_unicode_intel=UCS-2LE
+exif.decode_unicode_motorola=UCS-2BE
+exif.encode_unicode=ISO-8859-1
--FILE--
<?php
/*
test4.jpg is a 1*1 image that contains Exif tags written by WindowsXP
*/
-chdir($_ENV['PHP_DIR']);
-ini_alter('exif.decode_unicode_motorola', 'UCS-2BE');
-ini_alter('exif.encode_unicode', 'ISO-8859-15');
$image = exif_read_data('./ext/exif/tests/test4.jpg','',true,false);
-$accept = '';
-foreach($image as $idx=>$section) {
- $accept .= $section;
- foreach($section as $name=>$value) {
- if ( $idx!='FILE' || $name!='FileDateTime') {
- $accept .= substr($name,0,2);
- $accept .= $value;
- }
- }
-}
-echo $accept;
+echo var_dump($image['WINXP']);
?>
--EXPECT--
-ArrayFitest4.jpgFi713Fi2Miimage/jpegSeANY_TAG, IFD0, WINXPArrayhtwidth="1"
height="1"He1Wi1Is1By0ArraySuArrayKeArrayAuArrayCoArrayTiArrayArraySuSubject...KeKeywords...AuRui
CarmoCoComments
+array(5) {
+ ["Subject"]=>
+ string(10) "Subject..."
+ ["Keywords"]=>
+ string(11) "Keywords..."
+ ["Author"]=>
+ string(9) "Rui Carmo"
+ ["Comments"]=>
+ string(29) "Comments
Line2
Line3
-Line4TiTitle...
\ No newline at end of file
+Line4"
+ ["Title"]=>
+ string(8) "Title..."
+}