diff options
| author | Martin Jansen <mj@php.net> | 2010-12-11 20:10:15 +0000 |
|---|---|---|
| committer | Martin Jansen <mj@php.net> | 2010-12-11 20:10:15 +0000 |
| commit | cedbc50f9ddd1a7d8c46863916a8b592d86d9199 (patch) | |
| tree | 9814285c26cd94cf4c6f91a1a3f075b52718f107 | |
| parent | 67db41671157611f935a22f610965b1d04f68a01 (diff) | |
| download | php-git-cedbc50f9ddd1a7d8c46863916a8b592d86d9199.tar.gz | |
Merge from trunk:
* Fixed parameter check introduced with the recent fix for bug #53492.
* Improved the error message along the way.
| -rw-r--r-- | ext/gd/gd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 8588e12798..1d06a194c3 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -4593,8 +4593,8 @@ PHP_FUNCTION(imagepstext) return; } - if (aa_steps != 4 || aa_steps != 16) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be 4 or 16"); + if (aa_steps != 4 && aa_steps != 16) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Antialias steps must be 4 or 16"); RETURN_FALSE; } |