Merge from trunk:

* Fixed parameter check introduced with the recent fix for bug #53492.

* Improved the error message along the way.
This commit is contained in:
Martin Jansen 2010-12-11 20:10:39 +00:00
parent 9e48381b28
commit f6cedd2ad5

View file

@ -4228,8 +4228,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;
}