-Add constant that shows whether or not exif uses mbstring.

-Fix tests

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index bdb671ae121030df301c6336d97dc6d7817b7b17..1101a678c2388df1704be03547744ef40391e388 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -58,10 +58,10 @@
 #include "ext/standard/php_image.h"
 #include "ext/standard/info.h" 
 
-#if HAVE_MBSTRING
-#if !defined(COMPILE_DL_MBSTRING) 
+#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING) 
 #define EXIF_USE_MBSTRING 1
-#endif
+#else
+#define EXIF_USE_MBSTRING 0
 #endif
 
 #ifdef EXIF_USE_MBSTRING
@@ -181,6 +181,7 @@ PHP_MINIT_FUNCTION(exif)
 {
        ZEND_INIT_MODULE_GLOBALS(exif, php_exif_init_globals, NULL);
        REGISTER_INI_ENTRIES();
+       REGISTER_LONG_CONSTANT("EXIF_USE_MBSTRING", EXIF_USE_MBSTRING, CONST_CS | CONST_PERSISTENT); 
        return SUCCESS;
 }
 /* }}} */

diff --git a/ext/exif/tests/exif002.phpt b/ext/exif/tests/exif002.phpt
index 29b7791503fec04a192c5a0a40eed8b1f0415718..77283c3cc089fb9db261d62339003dd7a80bc641 100644 (file)
--- a/ext/exif/tests/exif002.phpt
+++ b/ext/exif/tests/exif002.phpt
@@ -13,9 +13,9 @@ zlib.output_compression=0
   test2.jpg is the same image but contains Exif/Comment information and a
             copy of test1.jpg as a thumbnail.
 */
-$infile = './ext/exif/tests/test1.jpg';
+$infile = dirname(__FILE__).'./test1.jpg';
 echo md5_file($infile).'_'.filesize($infile);
-$thumb = exif_thumbnail('./ext/exif/tests/test2.jpg');
+$thumb = exif_thumbnail(dirname(__FILE__).'./test2.jpg');
 echo " == ";
 echo md5($thumb).'_'.strlen($thumb);
 echo "\n";

diff --git a/ext/exif/tests/exif003.phpt b/ext/exif/tests/exif003.phpt
index d61864e90983cbf2d674608f84714bc3769942cc..434dcd1407027253e90023538e87aefba7d86149 100644 (file)
--- a/ext/exif/tests/exif003.phpt
+++ b/ext/exif/tests/exif003.phpt
@@ -4,6 +4,7 @@ Check for exif_read_data, Unicode user comment
 <?php 
        if (!extension_loaded('exif')) die('skip exif extension not available');
        if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+       if (!EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
 ?>
 --INI--
 output_handler=
@@ -18,7 +19,7 @@ exif.encode_unicode=ISO-8859-15
             copy of test1.jpg as a thumbnail.
   test3.jpg is the same as test2.jpg but with a UNICODE UserComment: &Auml;&Ouml;&&Uuml;&szlig;&auml;&ouml;&uuml;
 */
-var_dump(exif_read_data('./ext/exif/tests/test3.jpg','',true,false));
+var_dump(exif_read_data(dirname(__FILE__).'./test3.jpg','',true,false));
 ?>
 --EXPECTF--
 array(5) {

diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index 7cf69e3513b82285e6e485be62a8fac363ae7abb..0259805b3a883fb409b05c04496ef89d26a43f5e 100644 (file)
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -4,6 +4,7 @@ Check for exif_read_data, Unicode WinXP tags
 <?php 
        if (!extension_loaded('exif')) die('skip exif extension not available');
        if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+       if (!EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
 ?>
 --INI--
 output_handler=
@@ -16,7 +17,7 @@ exif.encode_unicode=ISO-8859-1
 /*
   test4.jpg is a 1*1 image that contains Exif tags written by WindowsXP
 */
-$image  = exif_read_data('./ext/exif/tests/test4.jpg','',true,false);
+$image  = exif_read_data(dirname(__FILE__).'./test4.jpg','',true,false);
 echo var_dump($image['WINXP']);
 ?>
 --EXPECT--

diff --git a/ext/exif/tests/exif005.phpt b/ext/exif/tests/exif005.phpt
index 6bd6264a1f074a1d4e561cca3140c4401b6388b6..7f7607397117af005c3fcc1f9a9125b0d0fdef3e 100644 (file)
--- a/ext/exif/tests/exif005.phpt
+++ b/ext/exif/tests/exif005.phpt
@@ -10,7 +10,7 @@ zlib.output_compression=0
 /* Do not change this test it is a REATME.TESTING example.
  * test5.jpg is a 1*1 image that contains an Exif section with ifd = 00000009h
  */
-$image  = exif_read_data('./ext/exif/tests/test5.jpg','',true,false);
+$image  = exif_read_data(dirname(__FILE__).'./test5.jpg','',true,false);
 var_dump($image['IFD0']);
 ?>
 --EXPECT--

diff --git a/ext/exif/tests/exif006.phpt b/ext/exif/tests/exif006.phpt
index 698ec8ef72db917d116683ec954cfe09cd5c10dd..8f899eee367d3e6b8f745e85e3b5180fde9f160e 100644 (file)
--- a/ext/exif/tests/exif006.phpt
+++ b/ext/exif/tests/exif006.phpt
@@ -14,7 +14,7 @@ magic_quotes_runtime=1
             copy of test1.jpg as a thumbnail.
   test6.jpg is the same as test2.jpg but with a UNICODE UserComment: ÄÖ&Üßäöü
 */
-var_dump(exif_read_data('./ext/exif/tests/test6.jpg','',true,false));
+var_dump(exif_read_data(dirname(__FILE__).'./test6.jpg','',true,false));
 ?>
 --EXPECTF--
 array(5) {