cvs: php-src(PHP_5_2) /ext/gd gd.c /ext/gd/libgd gd_gd2.c
| From: | Pierre-Alain Joye | Date: | Tue, 08 Aug 2006 11:56:36 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/gd gd.c /ext/gd/libgd gd_gd2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39834@lists.php.net to get a copy of this message | ||
pajoye Tue Aug 8 11:56:36 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd gd.c
/php-src/ext/gd/libgd gd_gd2.c
Log:
- fix compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.4&r2=1.312.2.20.2.5&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.4 php-src/ext/gd/gd.c:1.312.2.20.2.5
--- php-src/ext/gd/gd.c:1.312.2.20.2.4 Tue Aug 1 22:42:11 2006
+++ php-src/ext/gd/gd.c Tue Aug 8 11:56:36 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.4 2006/08/01 22:42:11 tony2001 Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.5 2006/08/08 11:56:36 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3677,7 +3677,7 @@
ch = (int)((unsigned char)*(Z_STRVAL_PP(C)));
} else {
str = (unsigned char *) estrndup(Z_STRVAL_PP(C), Z_STRLEN_PP(C));
- l = strlen(str);
+ l = strlen((char *)str);
}
y = Z_LVAL_PP(Y);
@@ -4044,7 +4044,7 @@
{
char tmp_font_path[MAXPATHLEN];
- if (VCWD_REALPATH(fontname, tmp_font_path)) {
+ if (VCWD_REALPATH((char *)fontname, tmp_font_path)) {
fontname = (unsigned char *) fontname;
} else {
fontname = NULL;
@@ -4054,18 +4054,18 @@
fontname = (unsigned char *) fontname;
#endif
- PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename");
+ PHP_GD_CHECK_OPEN_BASEDIR((char *)fontname, "Invalid font filename");
#ifdef USE_GD_IMGSTRTTF
# if HAVE_GD_STRINGFTEX
if (extended) {
- error = gdImageStringFTEx(im, brect, col, fontname, ptsize, angle, x, y, str, &strex);
+ error = gdImageStringFTEx(im, brect, col, (char *)fontname, ptsize, angle, x, y, (char *)str,
&strex);
}
else
# endif
# if HAVE_GD_STRINGFT
- error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
+ error = gdImageStringFT(im, brect, col, (char *)fontname, ptsize, angle, x, y, (char *)str);
# elif HAVE_GD_STRINGTTF
error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str);
# endif
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gd2.c?r1=1.16.4.1.2.1&r2=1.16.4.1.2.2&diff_format=u
Index: php-src/ext/gd/libgd/gd_gd2.c
diff -u php-src/ext/gd/libgd/gd_gd2.c:1.16.4.1.2.1 php-src/ext/gd/libgd/gd_gd2.c:1.16.4.1.2.2
--- php-src/ext/gd/libgd/gd_gd2.c:1.16.4.1.2.1 Wed Jul 26 08:53:30 2006
+++ php-src/ext/gd/libgd/gd_gd2.c Tue Aug 8 11:56:36 2006
@@ -544,7 +544,7 @@
chunkNum = cx + cy * ncx;
chunkLen = chunkMax;
- if (!_gd2ReadChunk (chunkIdx[chunkNum].offset, compBuf, chunkIdx[chunkNum].size, chunkBuf,
&chunkLen, in)) {
+ if (!_gd2ReadChunk (chunkIdx[chunkNum].offset, compBuf, chunkIdx[chunkNum].size, (char
*)chunkBuf, &chunkLen, in)) {
php_gd_error("Error reading comproessed chunk");
goto fail2;
}
@@ -558,7 +558,7 @@
for (x = xlo; x < xhi; x++) {
if (!gd2_compressed(fmt)) {
if (im->trueColor) {
- if (!gdGetInt(&ch, in)) {
+ if (!gdGetInt((int *)&ch, in)) {
ch = 0;
}
} else {