Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vertical alignment of ttf draw.text() plus fallback alpha 255 where only rgb specified #331

Merged
merged 2 commits into from
Sep 24, 2013
Merged

vertical alignment of ttf draw.text() plus fallback alpha 255 where only rgb specified #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25b39de
ImageColor defaults to alpha = 255 in only rgb specified for RGBA mode
paddywwoof Sep 19, 2013
02855a8
hopefully this uses a reasonable y offset
paddywwoof Sep 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions PIL/ImageColor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ def getcolor(color, mode):
if mode == "RGB":
return color
if mode == "RGBA":
if len(color) == 3:
color = (color + (255,))
r, g, b, a = color
return r, g, b, a
if Image.getmodebase(mode) == "L":
Expand Down
5 changes: 4 additions & 1 deletion PIL/ImageFont.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ def getmetrics(self):
def getsize(self, text):
return self.font.getsize(text)[0]

def getoffset(self, text):
return self.font.getsize(text)[1]

def getmask(self, text, mode=""):
return self.getmask2(text, mode)[0]

Expand All @@ -183,7 +186,7 @@ def __init__(self, font, orientation=None):
self.orientation = orientation # any 'transpose' argument, or None

def getsize(self, text):
w, h = self.font.getsize(text)
w, h = self.font.getsize(text)[0]
if self.orientation in (Image.ROTATE_90, Image.ROTATE_270):
return h, w
return w, h
Expand Down
15 changes: 11 additions & 4 deletions _imagingft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ font_getsize(FontObject* self, PyObject* args)
int i, x, y_max, y_min;
FT_ULong ch;
FT_Face face;
int xoffset;
int xoffset, yoffset;
FT_Bool kerning = FT_HAS_KERNING(self->face);
FT_UInt last_index = 0;

Expand All @@ -203,7 +203,7 @@ font_getsize(FontObject* self, PyObject* args)
}

face = NULL;
xoffset = 0;
xoffset = yoffset = 0;
y_max = y_min = 0;

for (x = i = 0; font_getchar(string, i, &ch); i++) {
Expand Down Expand Up @@ -231,7 +231,11 @@ font_getsize(FontObject* self, PyObject* args)
y_max = bbox.yMax;
if (bbox.yMin < y_min)
y_min = bbox.yMin;


/* find max distance of baseline from top */
if (face->glyph->metrics.horiBearingY > yoffset)
yoffset = face->glyph->metrics.horiBearingY;

last_index = index;
}

Expand All @@ -248,12 +252,15 @@ font_getsize(FontObject* self, PyObject* args)
face->glyph->metrics.horiBearingX;
if (offset < 0)
x -= offset;
/* difference between the font ascender and the distance of
* the baseline from the top */
yoffset = PIXEL(self->face->size->metrics.ascender - yoffset);
}

return Py_BuildValue(
"(ii)(ii)",
PIXEL(x), PIXEL(y_max - y_min),
PIXEL(xoffset), 0
PIXEL(xoffset), yoffset
);
}

Expand Down