]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2cdb9f1)
-change IsColor from non zero to 1
authorMarcus Boerger <helly@php.net>
Fri, 8 Mar 2002 11:33:46 +0000 (11:33 +0000)
committerMarcus Boerger <helly@php.net>
Fri, 8 Mar 2002 11:33:46 +0000 (11:33 +0000)
-new test and example for documentation

ext/exif/example.php [new file with mode: 0644] patch | blob
ext/exif/exif.c patch | blob | history
ext/exif/test.txt patch | blob | history

diff --git a/ext/exif/example.php b/ext/exif/example.php
new file mode 100644 (file)
index 0000000..e34dc05
--- /dev/null
+++ b/ext/exif/example.php
@@ -0,0 +1,23 @@
+<?php
+// (c) M.Boerger
+//
+// $Id$
+//
+?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
+<html>
+<head>
+<title>exif_read_data example</title>
+</head>
+<body>
+<?php
+$exif = exif_read_data ('tests/test1.jpg','IFD0');
+echo $exif===false ? "No header data found.<br>\n" : "Image contains headers<br>";
+$exif = exif_read_data ('tests/test2.jpg',0,true);
+foreach($exif as $key=>$section) {
+    foreach($section as $name=>$val) {
+        echo "$key.$name: $val<br>\n";
+    }
+}
+?>
+</body>
+</html>
\ No newline at end of file
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 6e1226d96c8c2bfad3cfe903a0fcd2c989a8314c..c0b551da9f90ad96a4a325eb96e053add29d66e5 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2373,7 +2373,7 @@ PHP_FUNCTION(exif_read_data)
                exif_iif_add_int( &ImageInfo, SECTION_COMPUTED, "Height", ImageInfo.Height);
                exif_iif_add_int( &ImageInfo, SECTION_COMPUTED, "Width",  ImageInfo.Width);
        }
-       exif_iif_add_tag( &ImageInfo, SECTION_COMPUTED, "IsColor", TAG_NONE, TAG_FMT_SLONG, 1, &ImageInfo.IsColor);
+       exif_iif_add_int( &ImageInfo, SECTION_COMPUTED, "IsColor", ImageInfo.IsColor);
        if (ImageInfo.FocalLength) {
                sprintf(tmp, "%4.1fmm", ImageInfo.FocalLength);
                exif_iif_add_tag( &ImageInfo, SECTION_COMPUTED, "FocalLength", TAG_NONE, TAG_FMT_STRING, strlen(tmp), tmp);
diff --git a/ext/exif/test.txt b/ext/exif/test.txt
index 8845b2832a89553b764d0149588a2e98ffefc27e..75fc0a9be5b166fc66bab633048c3884f417e2b3 100644 (file)
--- a/ext/exif/test.txt
+++ b/ext/exif/test.txt
@@ -4,6 +4,8 @@
  *
  * (c) Marcus Boerger, 2002
  *
+ * $Id$
+ *
  * Rename the file to test.php and read the instructions. If the
  * script cannot be executed or does not generate any output check
  * you error log. In most cases this would mean you found an error
@@ -16,6 +18,7 @@
 $file = array_key_exists('thumbnail',$_REQUEST) ? $_REQUEST['thumbnail'] : '';
 //$file = '/t/temp/kodak-dc4800.tif';
 //$file = '/t/temp/canon-ixus.jpg';
+//$file = '/t/temp/test2.jpg';
 if ( $file) {
        $image = exif_thumbnail($file);
        if ( $image!==false) {
@@ -63,6 +66,7 @@ function _search_file($root,&$possible,$path='') {
                                        if ( $pos !== false
                                           && (  strtolower(substr($found,$pos+1))=='jpg'
                                              || strtolower(substr($found,$pos+1))=='tif'
+                                             || strtolower(substr($found,$pos+1))=='gif'
                                              )
                                           )
                                        {
@@ -112,6 +116,7 @@ function search_file() {
 // Searches for $file in document tree. The path is ignored.
 //
 function AddInfo($Name,$Value) {
+       if (is_array($Value)) $Value = 'Array: ('.join(',',$Value).')';
        $Value = nl2br($Value);
        return "<tr><td>$Name</td><td>$Value&nbsp;</td></tr>\n";
 }
@@ -217,7 +222,7 @@ if (function_exists('exif_tagname')) {
 <h2>function exif_read_data for <?=count($possible)?> images</h2>
 <table border='1' cellspacing='0' cellpadding='3' summary="EXIF information">
 <?php
-if (function_exists('read_exif_data')) {
+if (function_exists('exif_read_data')) {
        $num = 0;
        foreach($possible as $idx => $file) {
                $num++;
@@ -234,6 +239,7 @@ if (function_exists('read_exif_data')) {
                error_log("exif_read_data($file,'COMMENT,IFD0,EXIF,APP12', true);",0);
                $image = exif_read_data($file,'COMMENT,IFD0,EXIF,APP12',true);
                $error = error_msg();// clear message
+               error_log("exif_read_data($file,'COMMENT,IFD0,EXIF,APP12', true): $error",0);
                //error_log("exif_read_data($file)",0);
                $res   = '';
                if ( $image === false) {
@@ -246,7 +252,7 @@ if (function_exists('read_exif_data')) {
                                                $len++;
                                                $res .= AddInfo($Name,'Array('.count($Value).')');
                                                foreach( $Value as $idx => $Entry) {
-                                                       if ($idx=='Thumbnail') $Entry = '&lt;data&gt;';
+                                                       if ($idx==='Thumbnail') $Entry = '&lt;data&gt;';
                                                        $len++;
                                                        $res .= AddInfo($Name.':'.$idx,$Entry);
                                                }
Unnamed repository; edit this file 'description' to name the repository.