helly Sun Dec 15 13:49:07 2002 EDT Modified files: /php4/ext/exif exif.c Log: ws Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.129 php4/ext/exif/exif.c:1.130 --- php4/ext/exif/exif.c:1.129 Sat Dec 14 14:53:20 2002 +++ php4/ext/exif/exif.c Sun Dec 15 13:49:07 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.129 2002/12/14 19:53:20 helly Exp $ */ +/* $Id: exif.c,v 1.130 2002/12/15 18:49:07 helly Exp $ */ /* ToDos * @@ -93,7 +93,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.129 2002/12/14 19:53:20 helly Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.130 2002/12/15 18:49:07 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -132,7 +132,7 @@ { #ifdef EXIF_USE_MBSTRING if (new_value && strlen(new_value) && !php_mb_check_encoding_list(new_value TSRMLS_CC)) { - php_error_docref( NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: '%s'", new_value); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: +'%s'", new_value); return FAILURE; } #endif @@ -143,7 +143,7 @@ { #ifdef EXIF_USE_MBSTRING if (!php_mb_check_encoding_list(new_value TSRMLS_CC)) { - php_error_docref( NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: '%s'", new_value); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: +'%s'", new_value); return FAILURE; } #endif @@ -1134,12 +1134,12 @@ /* 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"); + 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"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Found value of +type double"); #endif return *(double *)value; } @@ -1183,12 +1183,12 @@ /* 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"); + 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"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Found value of +type double"); #endif return (size_t)*(double *)value; } @@ -1660,13 +1660,13 @@ case TAG_FMT_SINGLE: #ifdef EXIF_DEBUG - php_error_docref( NULL TSRMLS_CC, E_WARNING, "Found value of type single"); + 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"); + php_error_docref(NULL TSRMLS_CC, +E_WARNING, "Found value of type double"); #endif info_value->d = *(double *)value; break; @@ -1881,7 +1881,7 @@ pval *tmpi, *array = NULL; #ifdef EXIF_DEBUG -/* php_error_docref( NULL TSRMLS_CC, E_NOTICE, "Adding %d infos from section %s", image_info->info_list[section_index].count, exif_get_sectionname(section_index));*/ +/* php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Adding %d infos from +section %s", image_info->info_list[section_index].count, +exif_get_sectionname(section_index));*/ #endif if (image_info->info_list[section_index].count) { if (sub_array) { @@ -1903,7 +1903,7 @@ name = uname; } #ifdef EXIF_DEBUG -/* php_error_docref( NULL TSRMLS_CC, E_NOTICE, "Adding infos: tag(0x%04X,%12s,L=0x%04X): %s", info_tag, exif_get_tagname(info_tag, buffer, -12, exif_get_tag_table(section_index) TSRMLS_CC), info_data->length, info_data->format==TAG_FMT_STRING?(info_value&&info_value->s?info_value->s:"<no data>"):exif_get_tagformat(info_data->format));*/ +/* php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Adding infos: +tag(0x%04X,%12s,L=0x%04X): %s", info_tag, exif_get_tagname(info_tag, buffer, -12, +exif_get_tag_table(section_index) TSRMLS_CC), info_data->length, +info_data->format==TAG_FMT_STRING?(info_value&&info_value->s?info_value->s:"<no +data>"):exif_get_tagformat(info_data->format));*/ #endif if (info_data->length==0) { add_assoc_null(tmpi, name); @@ -2173,12 +2173,12 @@ exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length, value); break; default: - php_error_docref( NULL TSRMLS_CC, E_NOTICE, "Undefined JPEG2000 comment encoding"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Undefined +JPEG2000 comment encoding"); break; } } else { exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_UNDEFINED, 0, NULL); - php_error_docref( NULL TSRMLS_CC, E_NOTICE, "JPEG2000 comment section to small"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "JPEG2000 comment section +to small"); } } #endif
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php