walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

COLRv1: Apply variations correctly 

The variations are for xMin, yMin, xMAx, yMax.
Apply them before converting to extents..
This commit is contained in:
Matthias Clasen 2022-12-16 12:19:39 -05:00 committed by Behdad Esfahbod
parent 193e0e3e8e
commit d4496e6405
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hb-ot-color-colr-table.hh
View File

@ -935,21 +935,25 @@ struct ClipBox
switch (u.format) { switch (u.format) {
case 1: case 1:
case 2: case 2:
extents->x_bearing = u.format1.xMin; {
extents->y_bearing = u.format1.yMax; int xmin = u.format1.xMin;
extents->width = u.format1.xMax - u.format1.xMin; int ymin = u.format1.yMin;
extents->height = u.format1.yMin - u.format1.yMax; int xmax = u.format1.xMax;
int ymax = u.format1.yMax;
if (u.format == 2 && instancer && u.format2.varIdxBase != HB_OT_LAYOUT_NO_VARIATIONS_INDEX) if (u.format == 2 && instancer && u.format2.varIdxBase != HB_OT_LAYOUT_NO_VARIATIONS_INDEX)
{ {
uint32_t varIdx = u.format2.varIdxBase; uint32_t varIdx = u.format2.varIdxBase;
extents->x_bearing += _hb_roundf (instancer (varIdx+0)); xmin += _hb_roundf (instancer (varIdx+0));
extents->y_bearing += _hb_roundf (instancer (varIdx+1)); ymin += _hb_roundf (instancer (varIdx+1));
extents->width += _hb_roundf (instancer (varIdx+2)); xmax += _hb_roundf (instancer (varIdx+2));
extents->height += _hb_roundf (instancer (varIdx+3)); ymax += _hb_roundf (instancer (varIdx+3));
} }
extents->x_bearing = xmin;
extents->y_bearing = ymax;
extents->width = xmax - xmin;
extents->height = ymin - ymax;
return true; return true;
}
default: default:
return false; return false;
} }