cvs: php4 /ext/exif exif.c /ext/standard php_image.h

helly Sat Jun 22 19:43:17 2002 EDT Modified files: /php4/ext/exif exif.c /php4/ext/standard php_image.h Log: -exif version -missing constant (and notice) -corrected error messages Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.93 php4/ext/exif/exif.c:1.94 --- php4/ext/exif/exif.c:1.93 Sat Jun 22 14:38:33 2002 +++ php4/ext/exif/exif.c Sat Jun 22 19:43:16 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.93 2002/06/22 18:38:33 helly Exp $ */ +/* $Id: exif.c,v 1.94 2002/06/22 23:43:16 helly Exp $ */ /* ToDos * @@ -107,7 +107,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.3 $Id: exif.c,v 1.93 2002/06/22 18:38:33 helly Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.94 2002/06/22 23:43:16 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -205,6 +205,7 @@ REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); return SUCCESS; } /* }}} */ @@ -260,8 +261,8 @@ static const char * EXIF_ERROR_EALLOC = "Cannot allocate memory for all data"; static const char * EXIF_ERROR_FILEEOF = "Unexpected end of file reached"; static const char * EXIF_ERROR_CORRUPT = "File structure corrupted"; -static const char * EXIF_ERROR_THUMBEOF = "Thumbnail goes IFD boundary or end of file reached"; -static const char * EXIF_ERROR_FSREALLOC = "Illegal reallocating of undefined file section"; +static const char * EXIF_ERROR_THUMBEOF = "Thumbnail goes beyond IFD boundary or end of file reached"; +static const char * EXIF_ERROR_FSREALLOC = "Illegal reallocation of undefined file section"; #define EXIF_ERRLOG_EALLOC php_error(E_ERROR, EXIF_ERROR_EALLOC); #define EXIF_ERRLOG_FILEEOF php_error(E_WARNING, EXIF_ERROR_FILEEOF); Index: php4/ext/standard/php_image.h diff -u php4/ext/standard/php_image.h:1.15 php4/ext/standard/php_image.h:1.16 --- php4/ext/standard/php_image.h:1.15 Sat Jun 22 14:14:39 2002 +++ php4/ext/standard/php_image.h Sat Jun 22 19:43:16 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_image.h,v 1.15 2002/06/22 18:14:39 helly Exp $ */ +/* $Id: php_image.h,v 1.16 2002/06/22 23:43:16 helly Exp $ */ #ifndef PHP_IMAGE_H #define PHP_IMAGE_H @@ -45,6 +45,7 @@ IMAGE_FILETYPE_JPX, IMAGE_FILETYPE_JB2, IMAGE_FILETYPE_SWC +/* WHEN EXTENDING: PLEASE ALSO REGISTER IN ext/exif/exif.c:PHP_MINIT_FUNCTION(exif) */ } image_filetype; /* }}} */