]> granicus.if.org Git - php/commitdiff
fix warnings
authorMarcus Boerger <helly@php.net>
Wed, 30 Oct 2002 17:54:36 +0000 (17:54 +0000)
committerMarcus Boerger <helly@php.net>
Wed, 30 Oct 2002 17:54:36 +0000 (17:54 +0000)
ext/gd/gd.c
ext/gd/libgd/gdxpm.c

index 1177b095a3e407ad76a9495c12a60eeaae8fa13b..3ec5e9ca96bed87d0f5865c96fcf17b918a79f90 100644 (file)
@@ -2826,7 +2826,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
        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 839e6c87cfb9ee5a7cff29a7f2df8e49514e684a..b7eb92e333c643356e295a18ca5c19f32571d736 100644 (file)
@@ -21,6 +21,7 @@ gdImageCreateFromXpm (char *filename)
 #else
 
 #include "xpm.h"
+#include <string.h>
 
 gdImagePtr
 gdImageCreateFromXpm (char *filename)
@@ -32,7 +33,7 @@ gdImageCreateFromXpm (char *filename)
   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;