archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

-exif version

Browse source 
-missing constant (and notice)
-corrected error messages
This commit is contained in:
Marcus Boerger 2002-06-22 23:43:16 +00:00
parent 4c53f954be
commit d782c712ca
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/exif/exif.c
View file

@ -107,7 +107,7 @@ function_entry exif_functions[] = {
}; };
/* }}} */ /* }}} */
#define EXIF_VERSION "1.3 $Id$" #define EXIF_VERSION "1.4 $Id$"
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION
*/ */
@ -205,6 +205,7 @@ PHP_MINIT_FUNCTION(exif)
REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); 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_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, 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; return SUCCESS;
} }
/* }}} */ /* }}} */
@ -260,8 +261,8 @@ static size_t php_strnlen(char* str, size_t maxlen) {
static const char * EXIF_ERROR_EALLOC = "Cannot allocate memory for all data"; 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_FILEEOF = "Unexpected end of file reached";
static const char * EXIF_ERROR_CORRUPT = "File structure corrupted"; 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_THUMBEOF = "Thumbnail goes beyond IFD boundary or end of file reached";
static const char * EXIF_ERROR_FSREALLOC = "Illegal reallocating of undefined file section"; 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_EALLOC php_error(E_ERROR, EXIF_ERROR_EALLOC);
#define EXIF_ERRLOG_FILEEOF php_error(E_WARNING, EXIF_ERROR_FILEEOF); #define EXIF_ERRLOG_FILEEOF php_error(E_WARNING, EXIF_ERROR_FILEEOF);

1
ext/standard/php_image.h
View file

@ -45,6 +45,7 @@ typedef enum
IMAGE_FILETYPE_JPX, IMAGE_FILETYPE_JPX,
IMAGE_FILETYPE_JB2, IMAGE_FILETYPE_JB2,
IMAGE_FILETYPE_SWC IMAGE_FILETYPE_SWC
/* WHEN EXTENDING: PLEASE ALSO REGISTER IN ext/exif/exif.c:PHP_MINIT_FUNCTION(exif) */
} image_filetype; } image_filetype;
/* }}} */ /* }}} */