iliaa Sun May 9 13:39:20 2004 EDT
Modified files:
/php-src/ext/gd gd.c
Log:
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.292&r2=1.293&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.292 php-src/ext/gd/gd.c:1.293
--- php-src/ext/gd/gd.c:1.292 Sun May 9 13:33:50 2004
+++ php-src/ext/gd/gd.c Sun May 9 13:39:20 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.292 2004/05/09 17:33:50 iliaa Exp $ */
+/* $Id: gd.c,v 1.293 2004/05/09 17:39:20 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3978,20 +3978,20 @@
/* Section Filters */
#ifdef HAVE_GD_BUNDLED
-static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS)
-{
- zval **SIM;
- gdImagePtr im_src;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(1, &SIM) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
+#define PHP_GD_SINGLE_RES \
+ zval **SIM; \
+ gdImagePtr im_src; \
+ if (zend_get_parameters_ex(1, &SIM) == FAILURE) { \
+ RETURN_FALSE; \
+ } \
+ ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd); \
+ if (im_src == NULL) { \
+ RETURN_FALSE; \
}
- ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd);
-
- if (im_src == NULL) {
- RETURN_FALSE;
- }
+static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS)
+{
+ PHP_GD_SINGLE_RES
if (gdImageNegate(im_src) == 1) {
RETURN_TRUE;
@@ -4002,18 +4002,7 @@
static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS)
{
- zval **SIM;
- gdImagePtr im_src;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_array_ex(1, &SIM) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
- }
-
- ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd);
-
- if (im_src == NULL) {
- RETURN_FALSE;
- }
+ PHP_GD_SINGLE_RES
if (gdImageGrayScale(im_src) == 1) {
RETURN_TRUE;
@@ -4028,8 +4017,8 @@
gdImagePtr im_src;
long brightness, tmp;
- if (ZEND_NUM_ARGS() != 3 || zend_parse_parameters(3 TSRMLS_CC, "zll", &SIM,
&tmp, &brightness) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zll", &SIM, &tmp,
&brightness) == FAILURE) {
+ RETURN_FALSE;
}
ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd);
@@ -4051,8 +4040,8 @@
gdImagePtr im_src;
long contrast, tmp;
- if (ZEND_NUM_ARGS() != 3 || zend_parse_parameters(3 TSRMLS_CC, "rll", &SIM,
&tmp, &contrast) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &SIM, &tmp,
&contrast) == FAILURE) {
+ RETURN_FALSE;
}
ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd);
@@ -4061,7 +4050,7 @@
RETURN_FALSE;
}
- if (gdImageBrightness(im_src, (int)contrast) == 1) {
+ if (gdImageContrast(im_src, (int)contrast) == 1) {
RETURN_TRUE;
}
@@ -4074,8 +4063,8 @@
gdImagePtr im_src;
long r,g,b,tmp;
- if (ZEND_NUM_ARGS() != 5 || zend_parse_parameters(5 TSRMLS_CC, "rllll", &SIM,
&tmp, &r, &g, &b) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllll", &SIM, &tmp, &r,
&g, &b) == FAILURE) {
+ RETURN_FALSE;
}
ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd);
@@ -4093,18 +4082,7 @@
static void php_image_filter_edgedetect(INTERNAL_FUNCTION_PARAMETERS)
{
- zval **SIM;
- gdImagePtr im_src;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(1, &SIM) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
- }
-
- ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd);
-
- if (im_src == NULL) {
- RETURN_FALSE;
- }
+ PHP_GD_SINGLE_RES
if (gdImageEdgeDetectQuick(im_src) == 1) {
RETURN_TRUE;
@@ -4115,18 +4093,7 @@
static void php_image_filter_emboss(INTERNAL_FUNCTION_PARAMETERS)
{
- zval **SIM;
- gdImagePtr im_src;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(1, &SIM) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
- }
-
- ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd);
-
- if (im_src == NULL) {
- RETURN_FALSE;
- }
+ PHP_GD_SINGLE_RES
if (gdImageEmboss(im_src) == 1) {
RETURN_TRUE;
@@ -4137,18 +4104,7 @@
static void php_image_filter_gaussian_blur(INTERNAL_FUNCTION_PARAMETERS)
{
- zval **SIM;
- gdImagePtr im_src;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(1, &SIM) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
- }
-
- ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd);
-
- if (im_src == NULL) {
- RETURN_FALSE;
- }
+ PHP_GD_SINGLE_RES
if (gdImageGaussianBlur(im_src) == 1) {
RETURN_TRUE;
@@ -4159,18 +4115,7 @@
static void php_image_filter_selective_blur(INTERNAL_FUNCTION_PARAMETERS)
{
- zval **SIM;
- gdImagePtr im_src;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(1, &SIM) == FAILURE){
- ZEND_WRONG_PARAM_COUNT();
- }
-
- ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd);
-
- if (im_src==NULL) {
- RETURN_FALSE;
- }
+ PHP_GD_SINGLE_RES
if (gdImageSelectiveBlur(im_src) == 1) {
RETURN_TRUE;
@@ -4181,18 +4126,7 @@
static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS)
{
- zval **SIM;
- gdImagePtr im_src;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(1, &SIM) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
- }
-
- ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, "Image", le_gd);
-
- if (im_src == NULL) {
- RETURN_FALSE;
- }
+ PHP_GD_SINGLE_RES
if (gdImageMeanRemoval(im_src) == 1) {
RETURN_TRUE;
@@ -4208,8 +4142,8 @@
gdImagePtr im_src;
double weight;
- if (ZEND_NUM_ARGS() != 3 || zend_parse_parameters(3 TSRMLS_CC, "rld", &SIM,
&tmp, &weight) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rld", &SIM, &tmp,
&weight) == FAILURE) {
+ RETURN_FALSE;
}
ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
