-compiler warnings

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index bb2ed73f49d85cadaf7b01c058816c254bdc186d..07067ae893f740c12b3f9e8705949c9c48470efa 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -70,6 +70,8 @@
  */
 #undef EXIF_DEBUG
 
+#undef EXIF_JPEG2000
+
 #include "php_exif.h"
 #include <math.h>
 #include "php_ini.h"
@@ -1576,6 +1578,7 @@ static void exif_process_COM (image_info_type *image_info, uchar *value, int len
    We want to print out the marker contents as legible text;
    we must guard against random junk and varying newline representations.
 */
+#ifdef EXIF_JPEG2000
 static void exif_process_CME (image_info_type *image_info, uchar *value, int length)
 {
        if (length>3) {
@@ -1595,6 +1598,7 @@ static void exif_process_CME (image_info_type *image_info, uchar *value, int len
                php_error(E_NOTICE,"JPEG2000 comment section to small");
        }
 }
+#endif
 /* }}} */
 
 /* {{{ exif_process_SOFn
@@ -3060,7 +3064,7 @@ PHP_FUNCTION(exif_read_data)
 
        ImageInfo.sections_found |= FOUND_COMPUTED;/* do not inform about in debug*/
 
-       if (ret==FALSE || (sections_needed && !(sections_needed&ImageInfo.sections_found) || array_init(return_value) == FAILURE)) {
+       if (ret==FALSE || (sections_needed && !(sections_needed&ImageInfo.sections_found)) || array_init(return_value) == FAILURE) {
                /* array_init must be checked at last! otherwise the array must be freed if a later test fails. */
                exif_discard_imageinfo(&ImageInfo);
                if ( sections_str) efree(sections_str);