diff options
author | Marcus Boerger <helly@php.net> | 2002-03-12 06:08:48 +0000 |
---|---|---|
committer | Marcus Boerger <helly@php.net> | 2002-03-12 06:08:48 +0000 |
commit | e39dcad91a8d4b437c3fe1bdb383a4b9c4c0ed78 (patch) | |
tree | 2e81fc50a0a71d8722d7a702cac9b789e8c51beb /ext/standard/php_image.h | |
parent | e0867ffcf1c608c1767c59aa9c3a882ba4c8011a (diff) | |
download | php-git-e39dcad91a8d4b437c3fe1bdb383a4b9c4c0ed78.tar.gz |
-fixed bug 15174
-support for some broken jpegs: bug 13213
-better memory handling
-initial jpeg2000 support (only jpc not jp2,jb2,jpx)
Diffstat (limited to 'ext/standard/php_image.h')
-rw-r--r-- | ext/standard/php_image.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/standard/php_image.h b/ext/standard/php_image.h index d8a68efec7..1837bab6a2 100644 --- a/ext/standard/php_image.h +++ b/ext/standard/php_image.h @@ -12,7 +12,8 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Author: Rasmus Lerdorf <rasmus@php.net> | + | Authors: Rasmus Lerdorf <rasmus@php.net> | + | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ */ @@ -35,8 +36,15 @@ typedef enum IMAGE_FILETYPE_SWF, IMAGE_FILETYPE_PSD, IMAGE_FILETYPE_BMP, - IMAGE_FILETYPE_TIFF + IMAGE_FILETYPE_TIFF_II, /* intel */ + IMAGE_FILETYPE_TIFF_MM, /* motorola */ + IMAGE_FILETYPE_JPC, + IMAGE_FILETYPE_JP2, + IMAGE_FILETYPE_JPX, + IMAGE_FILETYPE_JB2 } image_filetype; /* }}} */ +extern int php_getimagetype(int socketd, FILE *fp, int issock, char *filetype); + #endif /* PHP_IMAGE_H */ |