diff options
| author | Marcus Boerger <helly@php.net> | 2002-03-08 11:33:46 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-03-08 11:33:46 +0000 |
| commit | 27242a7a462940d90fd685a0f67de7da331b4447 (patch) | |
| tree | fc48f2b6314089dec5d6e71234416c0011965e6b | |
| parent | 2cdb9f1bf9949a8643d2ba7f53a9242918f3315f (diff) | |
| download | php-git-27242a7a462940d90fd685a0f67de7da331b4447.tar.gz | |
-change IsColor from non zero to 1
-new test and example for documentation
| -rw-r--r-- | ext/exif/example.php | 23 | ||||
| -rw-r--r-- | ext/exif/exif.c | 2 | ||||
| -rw-r--r-- | ext/exif/test.txt | 10 |
3 files changed, 32 insertions, 3 deletions
diff --git a/ext/exif/example.php b/ext/exif/example.php new file mode 100644 index 0000000000..e34dc05f6d --- /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 6e1226d96c..c0b551da9f 100644 --- 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 8845b2832a..75fc0a9be5 100644 --- 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 </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 = '<data>'; + if ($idx==='Thumbnail') $Entry = '<data>'; $len++; $res .= AddInfo($Name.':'.$idx,$Entry); } |