]> granicus.if.org Git - php/commitdiff
bump up and use IMAGE_FILTER_MAX_ARGS instead of a magic number.
authorTakeshi Abe <tabe@php.net>
Mon, 19 Jan 2009 16:35:40 +0000 (16:35 +0000)
committerTakeshi Abe <tabe@php.net>
Mon, 19 Jan 2009 16:35:40 +0000 (16:35 +0000)
ext/gd/gd.c

index 06648b0f874a17f90b0fd7a2ed0e721b510ffee2..84f1a82ef22a211863d167a57cabd9617e1b34d1 100644 (file)
@@ -114,7 +114,7 @@ int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b);
 #define IMAGE_FILTER_SMOOTH         10
 #define IMAGE_FILTER_PIXELATE       11
 #define IMAGE_FILTER_MAX            11
-#define IMAGE_FILTER_MAX_ARGS       5
+#define IMAGE_FILTER_MAX_ARGS       6
 static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS);
 static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS);
 static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS);
@@ -4658,7 +4658,7 @@ PHP_FUNCTION(imagefilter)
                php_image_filter_pixelate
        };
 
-       if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 6) {
+       if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > IMAGE_FILTER_MAX_ARGS) {
                WRONG_PARAM_COUNT;
        } else if (zend_parse_parameters(2 TSRMLS_CC, "rl", &tmp, &filtertype) == FAILURE) {
                return;