helly Wed Oct 30 12:54:36 2002 EDT
Modified files:
/php4/ext/gd gd.c
/php4/ext/gd/libgd gdxpm.c
Log:
fix warnings
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.219 php4/ext/gd/gd.c:1.220
--- php4/ext/gd/gd.c:1.219 Tue Oct 29 20:05:15 2002
+++ php4/ext/gd/gd.c Wed Oct 30 12:54:36 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.219 2002/10/30 01:05:15 iliaa Exp $ */
+/* $Id: gd.c,v 1.220 2002/10/30 17:54:36 helly Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2826,7 +2826,7 @@
l = strlen(str);
#ifdef VIRTUAL_DIR
- if(virtual_filepath(Z_STRVAL_PP(FONTNAME), &fontname TSRMLS_CC)) {
+ if(virtual_filepath(Z_STRVAL_PP(FONTNAME), (char**)&fontname TSRMLS_CC)) {
fontname = (unsigned char*)Z_STRVAL_PP(FONTNAME);
}
#else
Index: php4/ext/gd/libgd/gdxpm.c
diff -u php4/ext/gd/libgd/gdxpm.c:1.1 php4/ext/gd/libgd/gdxpm.c:1.2
--- php4/ext/gd/libgd/gdxpm.c:1.1 Fri Apr 12 22:03:09 2002
+++ php4/ext/gd/libgd/gdxpm.c Wed Oct 30 12:54:36 2002
@@ -21,6 +21,7 @@
#else
#include "xpm.h"
+#include <string.h>
gdImagePtr
gdImageCreateFromXpm (char *filename)
@@ -32,7 +33,7 @@
gdImagePtr im = 0;
char *apixel;
int *pointer;
- int red = 0, green = 0, blue = 0, color = 0;
+ int red = 0, green = 0, blue = 0;
int *colors;
int ret;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php