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.

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

fix handling of embedded bitmaps in FreeType font backend #2164

Merged
merged 1 commit into from Dec 5, 2017

Conversation

@lsalzman
Copy link
Contributor

lsalzman commented Dec 5, 2017

This fixes a small regression I accidentally made with #2120. The prior "(flags & FONT_EMBEDDED_BITMAP) == 0" statement needed to be !contains() rather than just contains().


This change is Reviewable

@pcwalton
Copy link
Collaborator

pcwalton commented Dec 5, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2017

📌 Commit 45c83c5 has been approved by pcwalton

@glennw
Copy link
Member

glennw commented Dec 5, 2017

@jrmuizel
Copy link
Contributor

jrmuizel commented Dec 5, 2017

Can we get a test?

@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2017

Testing commit 45c83c5 with merge 20b3e2d...

bors-servo added a commit that referenced this pull request Dec 5, 2017
fix handling of embedded bitmaps in FreeType font backend

This fixes a small regression I accidentally made with #2120. The prior "(flags & FONT_EMBEDDED_BITMAP) == 0" statement needed to be !contains() rather than just contains().

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/2164)
<!-- Reviewable:end -->
@lsalzman
Copy link
Contributor Author

lsalzman commented Dec 5, 2017

@jrmuizel We would need at least a appropriately licensed bitmap font we could include in the tree to test that sort of thing.

@bors-servo
Copy link
Contributor

bors-servo commented Dec 5, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: pcwalton
Pushing 20b3e2d to master...

@bors-servo bors-servo merged commit 45c83c5 into servo:master Dec 5, 2017
3 of 4 checks passed
3 of 4 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.