cvs: php4 /ext/exif exif.c

helly Mon Mar 4 04:29:06 2002 EDT Modified files: /php4/ext/exif exif.c Log: -addition to last change: php_image.h must be included now Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.44 php4/ext/exif/exif.c:1.45 --- php4/ext/exif/exif.c:1.44 Mon Mar 4 02:21:28 2002 +++ php4/ext/exif/exif.c Mon Mar 4 04:29:06 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.44 2002/03/04 07:21:28 rasmus Exp $ */ +/* $Id: exif.c,v 1.45 2002/03/04 09:29:06 helly Exp $ */ /* Some parts of the code in this module was borrowed from the public domain * jhead.c package with the author's consent. @@ -57,13 +57,13 @@ #if HAVE_EXIF -#undef EXIF_DEBUG +#define EXIF_DEBUG #include "php_exif.h" #include <math.h> #include "php_ini.h" #include "ext/standard/php_string.h" -/* include "ext/standard/php_image.h" */ +#include "ext/standard/php_image.h" #include "ext/standard/info.h" typedef unsigned char uchar; @@ -203,7 +203,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.1a $Revision: 1.44 $" +#define EXIF_VERSION "1.1a $Revision: 1.45 $" PHP_MINFO_FUNCTION(exif); @@ -967,7 +967,7 @@ /* Extract useful components of IFD */ #ifdef EXIF_DEBUG - php_error(E_NOTICE,"process tag(x%04x=%s,%i): %s", Tag, exif_get_headername(Tag), ByteCount, Format==FMT_STRING?(ValuePtr?ValuePtr:"<no data>"):"<no string>"); + php_error(E_NOTICE,"process tag(x%04x=%s,@x%04X+%i): %s", Tag, exif_get_headername(Tag), ValuePtr-OffsetBase, ByteCount, Format==FMT_STRING?(ValuePtr?ValuePtr:"<no data>"):"<no string>"); #endif switch(Tag) { case TAG_MAKE: