cvs: php4 /ext/exif exif.c
| From: | Markus Fischer | Date: | Sun, 31 Mar 2002 23:00:31 +0000 |
| Subject: | cvs: php4 /ext/exif exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10803@lists.php.net to get a copy of this message | ||
mfischer Sun Mar 31 18:00:31 2002 EDT
Modified files:
/php4/ext/exif exif.c
Log:
- Fix compilation.
# Marcus, could you please fix the whitespace in this file?
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.77 php4/ext/exif/exif.c:1.78
--- php4/ext/exif/exif.c:1.77 Sat Mar 30 09:28:05 2002
+++ php4/ext/exif/exif.c Sun Mar 31 18:00:31 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.77 2002/03/30 14:28:05 helly Exp $ */
+/* $Id: exif.c,v 1.78 2002/03/31 23:00:31 mfischer Exp $ */
/* ToDos
*
@@ -102,7 +102,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.3 $Id: exif.c,v 1.77 2002/03/30 14:28:05 helly Exp $"
+#define EXIF_VERSION "1.3 $Id: exif.c,v 1.78 2002/03/31 23:00:31 mfischer Exp $"
PHP_MINFO_FUNCTION(exif);
@@ -2031,6 +2031,7 @@
int tag, format, components;
char *value_ptr, tagname[64], cbuf[32], *outside=NULL;
size_t byte_count, offset_val, fpos, fgot;
+ TSRMLS_FETCH();
tag = php_ifd_get16u(dir_entry, ImageInfo->motorola_intel);
format = php_ifd_get16u(dir_entry+2, ImageInfo->motorola_intel);
@@ -2427,6 +2428,7 @@
uchar *Data;
size_t fpos, size;
jpeg_sof_info sof_info;
+ TSRMLS_FETCH();
for(section=0;;section++)
{
@@ -2666,6 +2668,7 @@
unsigned char *dir_entry;
size_t ifd_size, dir_size, entry_offset, next_offset, entry_length, entry_value, fgot;
int entry_tag , entry_type;
+ TSRMLS_FETCH();
if ( ImageInfo->FileSize >= dir_offset+2) {
if ( (sn=exif_file_sections_add(ImageInfo, M_PSEUDO, 2, NULL))==-1) {
@@ -2865,6 +2868,7 @@
{
unsigned char file_header[8];
int ret = FALSE;
+ TSRMLS_FETCH();
ImageInfo->FileType = IMAGE_FILETYPE_UNKNOWN;