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

rasmus Mon Mar 4 02:21:31 2002 EDT Modified files: /php4/ext/exif exif.c /php4/ext/standard php_image.h Log: Let getimagesize() and read_exif_data() share the same constants to promote a little bit of code reuse here on two very similar problems. Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.43 php4/ext/exif/exif.c:1.44 --- php4/ext/exif/exif.c:1.43 Mon Mar 4 01:21:58 2002 +++ php4/ext/exif/exif.c Mon Mar 4 02:21:28 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.43 2002/03/04 06:21:58 helly Exp $ */ +/* $Id: exif.c,v 1.44 2002/03/04 07:21:28 rasmus Exp $ */ /* Some parts of the code in this module was borrowed from the public domain * jhead.c package with the author's consent. @@ -78,22 +78,6 @@ /* EXIF standard defines Copyright as "<Photographer> [ '\0' <Editor> ] ['\0']" */ #define EXIF_MAX_COPYRIGHT 2 -/* {{{ enum image_filetype - This enum is used to have ext/standard/image.c and ext/exif/exif.c use - the same constants for file types. -*/ -typedef enum -{ IMAGE_FILETYPE_UNKNOWN=0, - IMAGE_FILETYPE_GIF=1, - IMAGE_FILETYPE_JPEG, - IMAGE_FILETYPE_PNG, - IMAGE_FILETYPE_SWF, - IMAGE_FILETYPE_PSD, - IMAGE_FILETYPE_BMP, - IMAGE_FILETYPE_TIFF -} image_filetype; -/* }}} */ - /* {{{ structs This structure stores Exif header image elements in a simple manner Used to store camera data as extracted from the various ways that it can be @@ -219,7 +203,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.1a $Revision: 1.43 $" +#define EXIF_VERSION "1.1a $Revision: 1.44 $" PHP_MINFO_FUNCTION(exif); Index: php4/ext/standard/php_image.h diff -u php4/ext/standard/php_image.h:1.8 php4/ext/standard/php_image.h:1.9 --- php4/ext/standard/php_image.h:1.8 Thu Feb 28 03:26:47 2002 +++ php4/ext/standard/php_image.h Mon Mar 4 02:21:30 2002 @@ -16,11 +16,27 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_image.h,v 1.8 2002/02/28 08:26:47 sebastian Exp $ */ +/* $Id: php_image.h,v 1.9 2002/03/04 07:21:30 rasmus Exp $ */ #ifndef PHP_IMAGE_H #define PHP_IMAGE_H PHP_FUNCTION(getimagesize); + +/* {{{ enum image_filetype + This enum is used to have ext/standard/image.c and ext/exif/exif.c use + the same constants for file types. +*/ +typedef enum +{ IMAGE_FILETYPE_UNKNOWN=0, + IMAGE_FILETYPE_GIF=1, + IMAGE_FILETYPE_JPEG, + IMAGE_FILETYPE_PNG, + IMAGE_FILETYPE_SWF, + IMAGE_FILETYPE_PSD, + IMAGE_FILETYPE_BMP, + IMAGE_FILETYPE_TIFF +} image_filetype; +/* }}} */ #endif /* PHP_IMAGE_H */