mirror of
https://github.com/php/php-src.git
synced 2025-08-19 08:49:28 +02:00
- also test TIFF support in GetImageSize
This commit is contained in:
parent
6b2a074330
commit
ce4bf31268
1 changed files with 18 additions and 4 deletions
|
@ -205,15 +205,25 @@ if (function_exists('read_exif_data')) {
|
||||||
$num = 0;
|
$num = 0;
|
||||||
foreach($possible as $idx => $file) {
|
foreach($possible as $idx => $file) {
|
||||||
$num++;
|
$num++;
|
||||||
$res = '';
|
$error = '';
|
||||||
$len = 2;
|
$len = 4;
|
||||||
|
$size = GetImageSize($file);
|
||||||
|
$error = error_msg();// clear message
|
||||||
|
if ( $image === false) {
|
||||||
|
$getimagesize = '<b style="color:red">GetImageSize returned false</b><br>'.$error;
|
||||||
|
} else {
|
||||||
|
$getimagesize = "[ $size[0], $size[1], $size[2], $size[3] ]";
|
||||||
|
}
|
||||||
|
/**/
|
||||||
error_log("exif_read_data($file,'COMMENT,IFD0,EXIF,APP12');",0);
|
error_log("exif_read_data($file,'COMMENT,IFD0,EXIF,APP12');",0);
|
||||||
$image = exif_read_data($file,'COMMENT,IFD0,EXIF,APP12');
|
$image = exif_read_data($file,'COMMENT,IFD0,EXIF,APP12');
|
||||||
$error = error_msg();
|
$error = error_msg();// clear message
|
||||||
//error_log("exif_read_data($file)",0);
|
//error_log("exif_read_data($file)",0);
|
||||||
|
$res = '';
|
||||||
if ( $image === false) {
|
if ( $image === false) {
|
||||||
$error = '<b style="color:red">exif_read_data returned false</b><br>'.$error;
|
$error = '<b style="color:red">exif_read_data returned false</b><br>'.$error;
|
||||||
} else {
|
} else {
|
||||||
|
// ah no!$error = error_msg(); // force o.k.
|
||||||
foreach($image as $Name => $Value) {
|
foreach($image as $Name => $Value) {
|
||||||
if ( $Name!='Thumbnail') {
|
if ( $Name!='Thumbnail') {
|
||||||
if ( is_array($Value)) {
|
if ( is_array($Value)) {
|
||||||
|
@ -230,7 +240,11 @@ if (function_exists('read_exif_data')) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo "<tr><td rowspan='$len' valign='top'>$num</td></tr><tr><th>$file</th><td>$error</td></tr>\n$res";
|
echo "<tr><td rowspan='$len' valign='top'>$num</td></tr>\n";
|
||||||
|
echo "<tr><th colspan='2'>$file</th></tr>\n";
|
||||||
|
echo "<tr><td><b>GetImageSize</b></td><td>$getimagesize</td></tr>\n";
|
||||||
|
echo "<tr><td><b>exif_read_data</b></td><td>$error</td></tr>\n";
|
||||||
|
echo $res;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
echo "<tr><td>function exif_read_data is not supported</td></tr>\n";
|
echo "<tr><td>function exif_read_data is not supported</td></tr>\n";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue