mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 22:03:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

A small fix to make the function imageloadfont portable.

Browse Source
This commit is contained in:
Alexander Feldman 2001-03-12 13:57:53 +00:00
parent 0fa068e1fa
commit 1791658112
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/gd/gd.c
View File

@ -371,13 +371,15 @@ gdImageColorResolve(gdImagePtr im, int r, int g, int b)
#endif
#define FLIPWORD(a) (((a & 0xff000000) >> 24) | ((a & 0x00ff0000) >> 8) | ((a & 0x0000ff00) << 8) | ((a & 0x000000ff) << 24))
/* {{{ proto int imageloadfont(string filename)
Load a new font */
PHP_FUNCTION(imageloadfont)
{
zval **file;
int hdr_size = sizeof(gdFont) - sizeof(char *);
int ind, body_size, n=0, b;
int ind, body_size, n=0, b, i, body_size_check;
gdFontPtr font;
FILE *fp;
int issock=0, socketd=0;
@ -425,7 +427,23 @@ PHP_FUNCTION(imageloadfont)
}
RETURN_FALSE;
}
i = ftell(fp);
fseek(fp, 0, SEEK_END);
body_size_check = ftell(fp) - hdr_size;
fseek(fp, i, SEEK_SET);
body_size = font->w * font->h * font->nchars;
if (body_size != body_size_check) {
font->w = FLIPWORD(font->w);
font->h = FLIPWORD(font->h);
font->nchars = FLIPWORD(font->nchars);
body_size = font->w * font->h * font->nchars;
}
if (body_size != body_size_check) {
php_error(E_WARNING, "ImageFontLoad: error reading font");
efree(font);
RETURN_FALSE;
}
font->data = emalloc(body_size);
b = 0;
while (b < body_size && (n = fread(&font->data[b], 1, body_size - b, fp)))