rasmus Sat Mar 5 13:30:49 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/exif exif.c
Log:
wtf?
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.118.2.34&r2=1.118.2.35&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.34 php-src/ext/exif/exif.c:1.118.2.35
--- php-src/ext/exif/exif.c:1.118.2.34 Wed Mar 2 13:23:49 2005
+++ php-src/ext/exif/exif.c Sat Mar 5 13:30:47 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.118.2.34 2005/03/02 18:23:49 sesser Exp $ */
+/* $Id: exif.c,v 1.118.2.35 2005/03/05 18:30:47 rasmus Exp $ */
/* ToDos
*
@@ -101,7 +101,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.34 2005/03/02 18:23:49 sesser
Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.35 2005/03/05 18:30:47 rasmus
Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -2713,7 +2713,7 @@
byte_count = components * php_tiff_bytes_per_format[format];
if ((ssize_t)byte_count < 0) {
- exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC,
ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal byte_count(%ld)", tag,
exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), byte_count);
+ exif_error_docref("exif_read_data#error_ifd" TSRMLS_CC,
ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal byte_count(%ld)", tag,
exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), byte_count);
return FALSE;
}
@@ -3387,7 +3387,7 @@
return FALSE;
}
php_stream_read(ImageInfo->infile,
(char*)(ImageInfo->file.list[sn].data+2), dir_size-2);
- /*exif_error_docref(NULL EXIFERR_CC, ImageInfo,
E_NOTICE, "Dump: %s", exif_char_dump(ImageInfo->file.list[sn].data, dir_size,
0));*/
+ /*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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
