Skip to content

Commit d136089

Browse files
committed
graphite: Update to upstream commit 80c52493e
silnrsi/graphite@80c5249 Includes a fix for inaccurate slice range calculation for bases with diacritics. Also removes unnecessary ChangeLog, and updated unrelated vhacd commit to match currently used one.
1 parent b452005 commit d136089

File tree

3 files changed

+11
-244
lines changed

3 files changed

+11
-244
lines changed

Diff for: thirdparty/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,14 @@ Files extracted from upstream source:
176176
## graphite
177177

178178
- Upstream: https://github.com/silnrsi/graphite
179-
- Version: 1.3.14 (92f59dcc52f73ce747f1cdc831579ed2546884aa, 2020)
179+
- Version: 1.3.14 (80c52493ef42e6fe605a69dcddd2a691cd8a1380, 2021)
180180
- License: MPL-2.0
181181

182182
Files extracted from upstream source:
183183

184184
- the `include` folder
185-
- the `src` folder
186-
- `COPYING`, `ChangeLog`
185+
- the `src` folder (minus `CMakeLists.txt` and `files.mk`)
186+
- `COPYING`
187187

188188

189189
## harfbuzz
@@ -610,7 +610,7 @@ Files extracted from upstream source:
610610
## vhacd
611611

612612
- Upstream: https://github.com/kmammou/v-hacd
613-
- Version: git (b07958e18e01d504e3af80eeaeb9f033226533d7, 2019)
613+
- Version: git (1a49edf29c69039df15286181f2f27e17ceb9aef, 2020)
614614
- License: BSD-3-Clause
615615

616616
Files extracted from upstream source:

Diff for: thirdparty/graphite/ChangeLog

-238
This file was deleted.

Diff for: thirdparty/graphite/src/Pass.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -1056,12 +1056,17 @@ float Pass::resolveKern(Segment *seg, Slot *slotFix, GR_MAYBE_UNUSED Slot *start
10561056
ymin = min(by + bbb.bl.y, ymin);
10571057
for (nbor = slotFix->next(); nbor; nbor = nbor->next())
10581058
{
1059-
if (nbor->isChildOf(base))
1060-
continue;
10611059
if (!gc.check(nbor->gid()))
10621060
return 0.;
10631061
const Rect &bb = seg->theGlyphBBoxTemporary(nbor->gid());
10641062
SlotCollision *cNbor = seg->collisionInfo(nbor);
1063+
const float nby = nbor->origin().y + cNbor->shift().y;
1064+
if (nbor->isChildOf(base))
1065+
{
1066+
ymax = max(nby + bb.tr.y, ymax);
1067+
ymin = min(nby + bb.bl.y, ymin);
1068+
continue;
1069+
}
10651070
if ((bb.bl.y == 0.f && bb.tr.y == 0.f) || (cNbor->flags() & SlotCollision::COLL_ISSPACE))
10661071
{
10671072
if (m_kernColls == InWord)

0 commit comments

Comments
 (0)