pajoye Sun Dec 25 20:33:05 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/gd gd.c
Log:
- MFH: raise warnings instead of errors in colormatch
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.312.2.9&r2=1.312.2.10&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.9 php-src/ext/gd/gd.c:1.312.2.10
--- php-src/ext/gd/gd.c:1.312.2.9 Sun Dec 25 19:39:53 2005
+++ php-src/ext/gd/gd.c Sun Dec 25 20:33:05 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.9 2005/12/25 19:39:53 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.10 2005/12/25 20:33:05 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -919,19 +919,19 @@
result = gdImageColorMatch(im1, im2);
switch (result) {
case -1:
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Image1 must
be TrueColor" );
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Image1
must be TrueColor" );
RETURN_FALSE;
break;
case -2:
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Image2 must
be Palette" );
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Image2
must be Palette" );
RETURN_FALSE;
break;
case -3:
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Image1 and
Image2 must be the same size" );
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Image1 and
Image2 must be the same size" );
RETURN_FALSE;
break;
case -4:
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Image2 must
have at least one color" );
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Image2
must have at least one color" );
RETURN_FALSE;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
