python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-12 18:26:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix msvc compile errors (issue #230)

Browse Source
This commit is contained in:
Christoph Gohlke 2013-05-24 11:19:51 -06:00
parent aad417dcbe
commit df31b3d53e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_imagingft.c
View File

@ -208,6 +208,8 @@ font_getsize(FontObject* self, PyObject* args)
for (x = i = 0; font_getchar(string, i, &ch); i++) { for (x = i = 0; font_getchar(string, i, &ch); i++) {
int index, error; int index, error;
FT_BBox bbox;
FT_Glyph glyph;
face = self->face; face = self->face;
index = FT_Get_Char_Index(face, ch); index = FT_Get_Char_Index(face, ch);
if (kerning && last_index && index) { if (kerning && last_index && index) {
@ -223,8 +225,6 @@ font_getsize(FontObject* self, PyObject* args)
xoffset = face->glyph->metrics.horiBearingX; xoffset = face->glyph->metrics.horiBearingX;
x += face->glyph->metrics.horiAdvance; x += face->glyph->metrics.horiAdvance;
FT_BBox bbox;
FT_Glyph glyph;
FT_Get_Glyph(face->glyph, &glyph); FT_Get_Glyph(face->glyph, &glyph);
FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_SUBPIXELS, &bbox); FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_SUBPIXELS, &bbox);
if (bbox.yMax > y_max) if (bbox.yMax > y_max)
@ -315,6 +315,8 @@ font_render(FontObject* self, PyObject* args)
PyObject* string; PyObject* string;
Py_ssize_t id; Py_ssize_t id;
int mask = 0; int mask = 0;
int temp;
int xx, x0, x1;
if (!PyArg_ParseTuple(args, "On|i:render", &string, &id, &mask)) if (!PyArg_ParseTuple(args, "On|i:render", &string, &id, &mask))
return NULL; return NULL;
@ -333,7 +335,6 @@ font_render(FontObject* self, PyObject* args)
if (mask) if (mask)
load_flags |= FT_LOAD_TARGET_MONO; load_flags |= FT_LOAD_TARGET_MONO;
int temp;
ascender = 0; ascender = 0;
for (i = 0; font_getchar(string, i, &ch); i++) { for (i = 0; font_getchar(string, i, &ch); i++) {
index = FT_Get_Char_Index(self->face, ch); index = FT_Get_Char_Index(self->face, ch);
@ -363,7 +364,6 @@ font_render(FontObject* self, PyObject* args)
glyph = self->face->glyph; glyph = self->face->glyph;
int xx, x0, x1;
source = (unsigned char*) glyph->bitmap.buffer; source = (unsigned char*) glyph->bitmap.buffer;
xx = x + glyph->bitmap_left; xx = x + glyph->bitmap_left;
x0 = 0; x0 = 0;