cvs: php4 /ext/gd/libgd gd.c gd_topal.c gdft.c
| From: | Marcus B�rger | Date: | Thu, 22 Aug 2002 16:21:33 +0000 |
| Subject: | cvs: php4 /ext/gd/libgd gd.c gd_topal.c gdft.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13574@lists.php.net to get a copy of this message | ||
helly Thu Aug 22 12:21:33 2002 EDT
Modified files:
/php4/ext/gd/libgd gd.c gd_topal.c gdft.c
Log:
fiw warnings
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.14 php4/ext/gd/libgd/gd.c:1.15
--- php4/ext/gd/libgd/gd.c:1.14 Thu Aug 22 03:28:25 2002
+++ php4/ext/gd/libgd/gd.c Thu Aug 22 12:21:32 2002
@@ -86,6 +86,10 @@
static void gdImageBrushApply (gdImagePtr im, int x, int y);
static void gdImageTileApply (gdImagePtr im, int x, int y);
+static int gdFullAlphaBlend(int dst, int src);
+static int gdLayerOverlay(int dst, int src);
+static int gdAlphaBlendColor(int b1, int b2, int a1, int a2);
+static int gdAlphaOverlayColor(int src, int dst, int max);
gdImagePtr
gdImageCreate (int sx, int sy)
@@ -2577,7 +2581,7 @@
im->saveAlphaFlag = saveAlphaArg;
}
-int
+static int
gdFullAlphaBlend (int dst, int src)
{
int a1, a2;
@@ -2591,7 +2595,7 @@
);
}
-int
+static int
gdAlphaBlendColor( int b1, int b2, int a1, int a2 )
{
int c;
@@ -2617,7 +2621,7 @@
return ( a1 * b1 + ( gdAlphaMax - a1 ) * c ) / gdAlphaMax;
}
-int
+static int
gdLayerOverlay (int dst, int src)
{
int a1, a2;
@@ -2630,7 +2634,7 @@
);
}
-int
+static int
gdAlphaOverlayColor( int src, int dst, int max )
{
/* this function implements the algorithm
Index: php4/ext/gd/libgd/gd_topal.c
diff -u php4/ext/gd/libgd/gd_topal.c:1.4 php4/ext/gd/libgd/gd_topal.c:1.5
--- php4/ext/gd/libgd/gd_topal.c:1.4 Thu Aug 22 03:28:26 2002
+++ php4/ext/gd/libgd/gd_topal.c Thu Aug 22 12:21:32 2002
@@ -29,6 +29,7 @@
#include "gd.h"
#include "gdhelpers.h"
#include <string.h>
+#include <stdlib.h>
/*
* This module implements the well-known Heckbert paradigm for color
Index: php4/ext/gd/libgd/gdft.c
diff -u php4/ext/gd/libgd/gdft.c:1.7 php4/ext/gd/libgd/gdft.c:1.8
--- php4/ext/gd/libgd/gdft.c:1.7 Sun Aug 11 15:13:07 2002
+++ php4/ext/gd/libgd/gdft.c Thu Aug 22 12:21:32 2002
@@ -703,7 +703,7 @@
/* pull in supplied extended settings */
if (strex) {
- if (strex->flags & gdFTEX_LINESPACE == gdFTEX_LINESPACE)
+ if ((strex->flags & gdFTEX_LINESPACE) == gdFTEX_LINESPACE)
linespace = strex->linespacing;
}
@@ -725,7 +725,7 @@
if (font->have_char_map_sjis)
{
#endif
- if (tmpstr = (char *) gdMalloc (BUFSIZ))
+ if ((tmpstr = (char *) gdMalloc (BUFSIZ)) != NULL)
{
any2eucjp (tmpstr, string, BUFSIZ);
next = tmpstr;