镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content

Consistent multiline spacing and tests, with extra space - #1574

Merged
wiredfool merged 4 commits into
python-pillow:masterfrom
hugovk:wiredfool-multiline_text-plus4
Dec 7, 2015
Merged

wiredfool merged 4 commits into
python-pillow:masterfrom
hugovk:wiredfool-multiline_text-plus4

Conversation

@hugovk

@hugovk hugovk commented Dec 6, 2015

Copy link
Copy Markdown
Member

This fixes the inconsistent multiline spacing reported in #1540.

It includes the fix from @wiredfool and I updated the tests. I checked the baseline-to-baseline heights in the new images and they're equal.

In PR #1573 I noticed the lines are a bit close together by default. So I set the spacing to four pixels by default instead of zero.


Here's the PR without extra spacing by default, and so either that or this should be merged, not both.

@hugovk

hugovk commented Dec 6, 2015

Copy link
Copy Markdown
Member Author

Coverage decreased because the changes in _imagingft.c to add getters for x_ppem, y_ppem and height aren't actually used in the fix, and were just for investigation. Shall we just remove them?

@wiredfool

Copy link
Copy Markdown
Member

I'd say keep the getters. It's not private information.

wiredfool added a commit that referenced this pull request Dec 7, 2015
Consistent multiline spacing and tests, with extra space
@wiredfool
wiredfool merged commit 2f75ee7 into python-pillow:master Dec 7, 2015
@hugovk
hugovk deleted the wiredfool-multiline_text-plus4 branch December 7, 2015 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants