helly Tue Dec 10 09:35:36 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/exif exif.c
Log:
MFH
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.118.2.4 php4/ext/exif/exif.c:1.118.2.5
--- php4/ext/exif/exif.c:1.118.2.4 Mon Dec 9 19:10:37 2002
+++ php4/ext/exif/exif.c Tue Dec 10 09:35:36 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.118.2.4 2002/12/10 00:10:37 iliaa Exp $ */
+/* $Id: exif.c,v 1.118.2.5 2002/12/10 14:35:36 helly Exp $ */
/* ToDos
*
@@ -89,7 +89,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.4 2002/12/10 00:10:37 iliaa Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.5 2002/12/10 14:35:36 helly Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -1129,10 +1129,14 @@
/* Not sure if this is correct (never seen float used in Exif format)
*/
case TAG_FMT_SINGLE:
+#ifdef EXIF_DEBUG
php_error_docref( NULL TSRMLS_CC, E_NOTICE, "Found value of
type single");
+#endif
return (double)*(float *)value;
case TAG_FMT_DOUBLE:
+#ifdef EXIF_DEBUG
php_error_docref( NULL TSRMLS_CC, E_NOTICE, "Found value of
type double");
+#endif
return *(double *)value;
}
return 0;
@@ -1174,10 +1178,14 @@
/* Not sure if this is correct (never seen float used in Exif format)
*/
case TAG_FMT_SINGLE:
+#ifdef EXIF_DEBUG
php_error_docref( NULL TSRMLS_CC, E_NOTICE, "Found value of
type single");
+#endif
return (size_t)*(float *)value;
case TAG_FMT_DOUBLE:
+#ifdef EXIF_DEBUG
php_error_docref( NULL TSRMLS_CC, E_NOTICE, "Found value of
type double");
+#endif
return (size_t)*(double *)value;
}
return 0;
@@ -1556,7 +1564,7 @@
if (!info_value->s) {
EXIF_ERRLOG_EALLOC
info_data->length = 0;
- break; /* better return with "" instead of possible
casing problems */
+ break; /* better return with "" instead of possible
+causing problems */
}
break;
@@ -1637,11 +1645,15 @@
break;
case TAG_FMT_SINGLE:
+#ifdef EXIF_DEBUG
php_error_docref( NULL TSRMLS_CC,
E_WARNING, "Found value of type single");
+#endif
info_value->f = *(float *)value;
case TAG_FMT_DOUBLE:
+#ifdef EXIF_DEBUG
php_error_docref( NULL TSRMLS_CC,
E_WARNING, "Found value of type double");
+#endif
info_value->d = *(double *)value;
break;
}
@@ -3426,7 +3438,7 @@
return FALSE;
}
php_stream_read(ImageInfo->infile,
ImageInfo->file.list[sn].data+2, dir_size-2);
- /*exif_error_docref(NULL TSRMLS_CC, ImageInfo, E_NOTICE,
"Dump: %s", exif_char_dump(ImageInfo->file.list[sn].data, dir_size, 1));*/
+ /*exif_error_docref(NULL TSRMLS_CC, ImageInfo, E_NOTICE,
+"Dump: %s", exif_char_dump(ImageInfo->file.list[sn].data, dir_size, 0));*/
next_offset = php_ifd_get32u(ImageInfo->file.list[sn].data +
dir_size - 4, ImageInfo->motorola_intel);
#ifdef EXIF_DEBUG
exif_error_docref(NULL TSRMLS_CC, ImageInfo, E_NOTICE, "read
from TIFF done, next offset x%04X", next_offset);
@@ -4085,4 +4097,3 @@
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
