Let getimagesize() and read_exif_data() share the same constants to

promote a little bit of code reuse here on two very similar problems.

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 4307116b9bd69f406e6720b6ac54d6a73b60d4e8..745a458d530db9aedbed844c43dce40aa9bfa244 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -78,22 +78,6 @@ typedef unsigned char uchar;
 /* 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

diff --git a/ext/standard/php_image.h b/ext/standard/php_image.h
index 3cde4e6ba093573745ee76048a272ca674ad68b0..d8a68efec7a33a1b5e8a8ab63940fc3637215f7f 100644 (file)
--- a/ext/standard/php_image.h
+++ b/ext/standard/php_image.h
@@ -23,4 +23,20 @@
 
 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 */