Reflect recent changes to exif.c

diff --git a/ext/exif/tests/003.phpt b/ext/exif/tests/003.phpt
index ce2c7f840a69cc31403f4787c7d7c916f8cff08b..5e07e0ee52e958a2c076fb60ac73914035b72693 100644 (file)
--- a/ext/exif/tests/003.phpt
+++ b/ext/exif/tests/003.phpt
@@ -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 @@ Check for exif_read_data, Unicode user comment
             copy of test1.jpg as a thumbnail.
   test3.jpg is the same as test2.jpg but with a UNICODE UserComment: &Auml;&Ouml;&&Uuml;&szlig;&auml;&ouml;&uuml;
 */
-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) {

diff --git a/ext/exif/tests/004.phpt b/ext/exif/tests/004.phpt
index 9dd5c90324bf964ca34cb2d340989133182ea662..28a1e437a718e2c71ba915a06f5e85c9c33d375c 100644 (file)
--- a/ext/exif/tests/004.phpt
+++ b/ext/exif/tests/004.phpt
@@ -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..."
+}