sas Sun Dec 22 11:03:28 2002 EDT
Modified files:
/php4/ext/exif exif.c
Log:
'index' is a function name in the C library, do not use it as variable name.
also, cast the 'void *' correctly to a 'char *' for manipulation
instead of an 'int'.
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.134 php4/ext/exif/exif.c:1.135
--- php4/ext/exif/exif.c:1.134 Mon Dec 16 12:52:43 2002
+++ php4/ext/exif/exif.c Sun Dec 22 11:03:28 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.134 2002/12/16 17:52:43 helly Exp $ */
+/* $Id: exif.c,v 1.135 2002/12/22 16:03:28 sas Exp $ */
/* ToDos
*
@@ -95,7 +95,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.134 2002/12/16 17:52:43 helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.135 2002/12/22 16:03:28 sas Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -1534,7 +1534,7 @@
*/
static void exif_iif_add_value(image_info_type *image_info, int section_index, char
*name, int tag, int format, size_t length, void* value, int motorola_intel TSRMLS_DC)
{
- size_t index;
+ size_t idex;
void *vptr;
image_info_value *info_value;
image_info_data *info_data;
@@ -1630,9 +1630,9 @@
} else {
info_value = &info_data->value;
}
- for (index=0,vptr=value; index<length;
index++,(int)vptr+=php_tiff_bytes_per_format[format]) {
+ for (idex=0,vptr=value; idex<length; idex++,(char
+*)vptr+=php_tiff_bytes_per_format[format]) {
if (length>1) {
- info_value = &info_data->value.list[index];
+ info_value = &info_data->value.list[idex];
}
switch (format) {
case TAG_FMT_USHORT:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
