Petr Gajdos
9efc2099bf
b3646440b1
+ php7-gd-removed-unused-constants.patch
OBS-URL: https://build.opensuse.org/package/show/devel:languages:php/php7?expand=0&rev=332
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
Index: php-7.4.23/ext/gd/gd.c
|
|
===================================================================
|
|
--- php-7.4.23.orig/ext/gd/gd.c 2021-09-15 09:21:15.503241059 +0200
|
|
+++ php-7.4.23/ext/gd/gd.c 2021-09-15 09:29:04.434022076 +0200
|
|
@@ -91,6 +91,10 @@ static int le_gd, le_gd_font;
|
|
#define M_PI 3.14159265358979323846
|
|
#endif
|
|
|
|
+#define PHP_GD_FLIP_HORIZONTAL 1
|
|
+#define PHP_GD_FLIP_VERTICAL 2
|
|
+#define PHP_GD_FLIP_BOTH 3
|
|
+
|
|
#ifdef HAVE_GD_FREETYPE
|
|
static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int);
|
|
#endif
|
|
@@ -1137,9 +1141,9 @@ PHP_MINIT_FUNCTION(gd)
|
|
/* GD2 image format types */
|
|
REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT);
|
|
REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
|
|
- REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORINZONTAL, CONST_CS | CONST_PERSISTENT);
|
|
- REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
|
|
- REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
|
|
+ REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", PHP_GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
|
|
+ REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", PHP_GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
|
|
+ REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", PHP_GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
|
|
REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
|
|
REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
|
|
REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
|
|
@@ -4696,15 +4700,15 @@ PHP_FUNCTION(imageflip)
|
|
}
|
|
|
|
switch (mode) {
|
|
- case GD_FLIP_VERTICAL:
|
|
+ case PHP_GD_FLIP_VERTICAL:
|
|
gdImageFlipVertical(im);
|
|
break;
|
|
|
|
- case GD_FLIP_HORINZONTAL:
|
|
+ case PHP_GD_FLIP_HORIZONTAL:
|
|
gdImageFlipHorizontal(im);
|
|
break;
|
|
|
|
- case GD_FLIP_BOTH:
|
|
+ case PHP_GD_FLIP_BOTH:
|
|
gdImageFlipBoth(im);
|
|
break;
|
|
|