[PHP-CVS] cvs: php4(PHP_4_3) /ext/exif exif.c

[Marcus Boerger]

helly           Mon Dec 16 10:54:05 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.9 php4/ext/exif/exif.c:1.118.2.10
--- php4/ext/exif/exif.c:1.118.2.9      Mon Dec 16 09:48:20 2002
+++ php4/ext/exif/exif.c        Mon Dec 16 10:54:04 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: exif.c,v 1.118.2.9 2002/12/16 14:48:20 helly Exp $ */
+/* $Id: exif.c,v 1.118.2.10 2002/12/16 15:54:04 helly Exp $ */
 
 /*  ToDos
  *
@@ -64,7 +64,7 @@
 #define EXIF_USE_MBSTRING 0
 #endif
 
-#ifdef EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
 #include "ext/mbstring/mbstring.h"
 #endif
 
@@ -95,7 +95,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.9 2002/12/16 14:48:20 helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.10 2002/12/16 15:54:04 helly Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -132,7 +132,7 @@
 
 ZEND_API ZEND_INI_MH(OnUpdateEncode)
 {
-#ifdef EXIF_USE_MBSTRING
+#if 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);
                return FAILURE;
@@ -143,7 +143,7 @@
 
 ZEND_API ZEND_INI_MH(OnUpdateDecode)
 {
-#ifdef EXIF_USE_MBSTRING
+#if 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);
                return FAILURE;
@@ -2560,7 +2560,7 @@
 {
        int   a;
 
-#ifdef EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
        size_t len;;
 #endif
 
@@ -2571,7 +2571,7 @@
                        *pszEncoding = estrdup((const char*)szValuePtr);
                        szValuePtr = szValuePtr+8;
                        ByteCount -= 8;
-#ifdef EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
                        if (ImageInfo->motorola_intel) {
                                *pszInfoPtr = php_mb_convert_encoding(szValuePtr, 
ByteCount, ImageInfo->encode_unicode, ImageInfo->decode_unicode_be, &len TSRMLS_CC);
                        } else {
@@ -2592,7 +2592,7 @@
                        *pszEncoding = estrdup((const char*)szValuePtr);
                        szValuePtr = szValuePtr+8;
                        ByteCount -= 8;
-#ifdef EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
                        if (ImageInfo->motorola_intel) {
                                *pszInfoPtr = php_mb_convert_encoding(szValuePtr, 
ByteCount, ImageInfo->encode_jis, ImageInfo->decode_jis_be, &len TSRMLS_CC);
                        } else {
@@ -2631,7 +2631,7 @@
        xp_field->tag = tag;    
 
        /* Copy the comment */
-#ifdef EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
 /*  What if MS supports big-endian with XP? */
 /*     if (ImageInfo->motorola_intel) {
                xp_field->value = php_mb_convert_encoding(szValuePtr, ByteCount, 
ImageInfo->encode_unicode, ImageInfo->decode_unicode_be, &xp_field->size TSRMLS_CC);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php