Move php_gd_image_reader and php_is_image_avif()

Move these from ext/gd/php_gd.h to ext/standard/php_image.h, so an optional extension depends on a standard library, not the reverse

Author: morsssss

ext/gd/gd.c

@@ -31,6 +31,7 @@
 #include <math.h>
 #include "SAPI.h"
 #include "php_gd.h"
+#include "ext/standard/php_image.h"
 #include "ext/standard/info.h"
 #include "php_open_temporary_file.h"
 #include "zend_object_handlers.h"

ext/gd/php_gd.h

@@ -89,15 +89,6 @@ PHP_RSHUTDOWN_FUNCTION(gd);
 
 PHP_GD_API struct gdImageStruct *php_gd_libgdimageptr_from_zval_p(zval* zp);
 
-/* Struct and function to be used for testing whether an image is AVIF */
-typedef struct {
-  php_stream * stream;
-  zend_string * data;
-  size_t data_pos;
-} php_gd_image_reader;
-
-int php_is_image_avif(php_gd_image_reader * reader);
-
 #else
 
 #define phpext_gd_ptr NULL

ext/standard/image.c

@@ -26,7 +26,6 @@
 #include <unistd.h>
 #endif
 #include "php_image.h"
-#include "../gd/php_gd.h"
 
 #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 #include "zlib.h"

ext/standard/php_image.h

@@ -55,4 +55,13 @@ PHPAPI int php_getimagetype(php_stream *stream, const char *input, char *filetyp
 
 PHPAPI char * php_image_type_to_mime_type(int image_type);
 
+/* Struct and function to be used for testing whether an image is AVIF */
+typedef struct {
+  php_stream * stream;
+  zend_string * data;
+  size_t data_pos;
+} php_gd_image_reader;
+
+PHPAPI int php_is_image_avif(php_gd_image_reader * reader);
+
 #endif /* PHP_IMAGE_H */