-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
8328896: Fontmetrics for large Fonts has zero width #18703
Conversation
👋 Welcome back prr! A progress list of the required criteria for merging this PR into |
@prrace This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 164 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
if (obds.isEmpty()) { | ||
Rectangle bds = getGlyphOutline(glyphCode, pt.x, pt.y).getBounds(); | ||
result.setBounds(bds); | ||
} else { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
} else { | |
} else { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please update the copywrite year for updated files.
context->ptsz = (int)(ptsz * 64); | ||
if (TOO_LARGE(dmat[0], ptsz) || TOO_LARGE(dmat[1], ptsz) || | ||
TOO_LARGE(dmat[2], ptsz) || TOO_LARGE(dmat[3], ptsz)) | ||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
{ | |
TOO_LARGE(dmat[2], ptsz) || TOO_LARGE(dmat[3], ptsz)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, that was deliberate. We generally prefer the { on a new line if the conditional is multi-line.
Still looking for an actual "reviewer" review here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
/integrate |
Going to push as commit 25871af.
Your commit was automatically rebased without conflicts. |
The main problem here is that we do not curate what font point size we passed to freetype,
and would pass in one larger than freetype's maximum of FT_USHORT_MAX which is USHRT_MAX.
This isn't documented, SFAICS, and is checked a couple of calls deep from the specific API we use.
But generally anywhere near that size seems to cause freetype to choke as it uses signed 16.16
values, so 32767 is really the max.
But we have no need to go anywhere near that - 16384 seems like a plenty large enough pt size.
And we can request bigger sizes than that by making use of the transform.
At normal size ranges we use that just to account for rotation and decompose the glyph transform
into point size and that rotation.
But at large sizes - which are not usefully rendered anyway - there are no hints etc to be lost
from not specifying the target point size. So we can extend the range of sizes we allow.
If this is still too large to be held decomposed into a pt size in the range less than 16384 and a scale of up to 32766 then we substitute the null scaler, as we generally do when values are out of range, such
a for a NaN transform.
These extreme values aren't useful.
In looking at this I did find that getGlyphPixelBounds doesn't follow the maximum image size we use
for rendering. Which is not useful and could lead to inconsistent results. I fixed that.
Also whilst macOS didn't have these problems it could be cleaned up a bit for consistency in the reported sizes for some cases.
The test is mainly around making sure that "sensible" things are returned for not sensible input.
There's no 100% right answer to these extreme unrenderable sizes.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/18703/head:pull/18703
$ git checkout pull/18703
Update a local copy of the PR:
$ git checkout pull/18703
$ git pull https://git.openjdk.org/jdk.git pull/18703/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 18703
View PR using the GUI difftool:
$ git pr show -t 18703
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/18703.diff
Webrev
Link to Webrev Comment