cvs: php4 /ext/exif exif.c

helly Sat Mar 30 09:28:06 2002 EDT Modified files: /php4/ext/exif exif.c Log: -compiler warnings Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.76 php4/ext/exif/exif.c:1.77 --- php4/ext/exif/exif.c:1.76 Thu Mar 28 20:32:26 2002 +++ php4/ext/exif/exif.c Sat Mar 30 09:28:05 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.76 2002/03/29 01:32:26 helly Exp $ */ +/* $Id: exif.c,v 1.77 2002/03/30 14:28:05 helly Exp $ */ /* ToDos * @@ -70,6 +70,8 @@ */ #undef EXIF_DEBUG +#undef EXIF_JPEG2000 + #include "php_exif.h" #include <math.h> #include "php_ini.h" @@ -100,7 +102,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.3 $Id: exif.c,v 1.76 2002/03/29 01:32:26 helly Exp $" +#define EXIF_VERSION "1.3 $Id: exif.c,v 1.77 2002/03/30 14:28:05 helly Exp $" PHP_MINFO_FUNCTION(exif); @@ -1576,6 +1578,7 @@ 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 @@ php_error(E_NOTICE,"JPEG2000 comment section to small"); } } +#endif /* }}} */ /* {{{ exif_process_SOFn @@ -3060,7 +3064,7 @@ 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);