cvs: php4 /ext/exif exif.c
| From: | Marcus B�rger | Date: | Tue, 12 Mar 2002 13:49:41 +0000 |
| Subject: | cvs: php4 /ext/exif exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9948@lists.php.net to get a copy of this message | ||
helly Tue Mar 12 08:49:41 2002 EDT
Modified files:
/php4/ext/exif exif.c
Log:
-return size of thumbnail even if it not read
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.58 php4/ext/exif/exif.c:1.59
--- php4/ext/exif/exif.c:1.58 Tue Mar 12 01:14:30 2002
+++ php4/ext/exif/exif.c Tue Mar 12 08:49:40 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.58 2002/03/12 06:14:30 helly Exp $ */
+/* $Id: exif.c,v 1.59 2002/03/12 13:49:40 helly Exp $ */
/* ToDos
*
@@ -99,7 +99,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.3 $Id: exif.c,v 1.58 2002/03/12 06:14:30 helly Exp $"
+#define EXIF_VERSION "1.3 $Id: exif.c,v 1.59 2002/03/12 13:49:40 helly Exp $"
PHP_MINFO_FUNCTION(exif);
@@ -3047,8 +3047,10 @@
}
}
- if ( read_thumbnail && ImageInfo.Thumbnail.size) {
- exif_iif_add_tag( &ImageInfo, SECTION_THUMBNAIL, "THUMBNAIL", TAG_NONE,
TAG_FMT_UNDEFINED, ImageInfo.Thumbnail.size, ImageInfo.Thumbnail.data);
+ if ( ImageInfo.Thumbnail.size) {
+ if ( read_thumbnail) {
+ exif_iif_add_tag( &ImageInfo, SECTION_THUMBNAIL, "THUMBNAIL", TAG_NONE,
TAG_FMT_UNDEFINED, ImageInfo.Thumbnail.size, ImageInfo.Thumbnail.data);
+ }
if ( !ImageInfo.Thumbnail.width || !ImageInfo.Thumbnail.height) {
exif_scan_thumbnail( &ImageInfo);
}