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

[colr] Hook up color-line variation

This commit is contained in:
Behdad Esfahbod 2022-12-17 10:58:52 -07:00
parent a935e4b0c2
commit b9314400ec
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-ot-color-colr-table.cc
View File

@ -32,9 +32,9 @@ hb_color_line_get_color_stops (hb_color_line_t *cl,
hb_color_stop_t *color_stops) hb_color_stop_t *color_stops)
{ {
if (cl->is_variable) if (cl->is_variable)
return reinterpret_cast<const OT::ColorLine<OT::Variable> *>(cl->base)->get_color_stops (start, count, color_stops); return reinterpret_cast<const OT::ColorLine<OT::Variable> *>(cl->base)->get_color_stops (start, count, color_stops, cl->c->instancer);
else else
return reinterpret_cast<const OT::ColorLine<OT::NoVariable> *>(cl->base)->get_color_stops (start, count, color_stops); return reinterpret_cast<const OT::ColorLine<OT::NoVariable> *>(cl->base)->get_color_stops (start, count, color_stops, cl->c->instancer);
} }
hb_paint_extend_t hb_paint_extend_t

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

@ -45,7 +45,12 @@
#endif #endif
namespace OT {
struct hb_paint_context_t;
}
struct hb_color_line_t { struct hb_color_line_t {
struct OT::hb_paint_context_t *c;
const void *base; const void *base;
bool is_variable; bool is_variable;
}; };
@ -230,9 +235,10 @@ struct Variable
value.paint_glyph (c, varIdxBase); value.paint_glyph (c, varIdxBase);
} }
void get_color_stop (hb_color_stop_t *c) const void get_color_stop (hb_color_stop_t *c,
const VarStoreInstancer &instancer) const
{ {
value.get_color_stop (c); value.get_color_stop (c, varIdxBase, instancer);
} }
hb_paint_extend_t get_extend () const hb_paint_extend_t get_extend () const
@ -281,9 +287,10 @@ struct NoVariable
value.paint_glyph (c, varIdxBase); value.paint_glyph (c, varIdxBase);
} }
void get_color_stop (hb_color_stop_t *c) const void get_color_stop (hb_color_stop_t *c,
const VarStoreInstancer &instancer) const
{ {
value.get_color_stop (c); value.get_color_stop (c, VarIdx::NO_VARIATION, instancer);
} }
hb_paint_extend_t get_extend () const hb_paint_extend_t get_extend () const
@ -318,11 +325,13 @@ struct ColorStop
return_trace (c->check_struct (this)); return_trace (c->check_struct (this));
} }
void get_color_stop (hb_color_stop_t *out) const void get_color_stop (hb_color_stop_t *out,
uint32_t varIdx,
const VarStoreInstancer &instancer) const
{ {
out->offset = stopOffset.to_float(); out->offset = stopOffset.to_float(instancer (varIdx, 0));
out->color_index = paletteIndex; out->color_index = paletteIndex;
out->alpha = alpha.to_float(); out->alpha = alpha.to_float(instancer (varIdx, 1));
} }
F2DOT14 stopOffset; F2DOT14 stopOffset;
@ -380,7 +389,8 @@ struct ColorLine
unsigned int unsigned int
get_color_stops (unsigned int start, get_color_stops (unsigned int start,
unsigned int *count, unsigned int *count,
hb_color_stop_t *color_stops) const hb_color_stop_t *color_stops,
const VarStoreInstancer &instancer) const
{ {
unsigned int len = stops.len; unsigned int len = stops.len;
@ -388,7 +398,8 @@ struct ColorLine
{ {
unsigned int i; unsigned int i;
for (i = 0; i < *count && start + i < len; i++) for (i = 0; i < *count && start + i < len; i++)
stops[start + i].get_color_stop (&color_stops[i]); stops[start + i].get_color_stop (&color_stops[i],
instancer);
*count = i; *count = i;
} }
@ -571,7 +582,7 @@ struct PaintLinearGradient
void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const
{ {
hb_color_line_t cl = { &(this+colorLine), Var<HBUINT8>::is_variable }; hb_color_line_t cl = { c, &(this+colorLine), Var<HBUINT8>::is_variable };
c->funcs->linear_gradient (c->data, &cl, c->funcs->linear_gradient (c->data, &cl,
x0 + c->instancer (varIdxBase, 0), x0 + c->instancer (varIdxBase, 0),
@ -618,7 +629,7 @@ struct PaintRadialGradient
void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const
{ {
hb_color_line_t cl = { &(this+colorLine), Var<HBUINT8>::is_variable }; hb_color_line_t cl = { c, &(this+colorLine), Var<HBUINT8>::is_variable };
c->funcs->radial_gradient (c->data, &cl, c->funcs->radial_gradient (c->data, &cl,
x0 + c->instancer (varIdxBase, 0), x0 + c->instancer (varIdxBase, 0),
@ -665,7 +676,7 @@ struct PaintSweepGradient
void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const
{ {
hb_color_line_t cl = { &(this+colorLine), Var<HBUINT8>::is_variable }; hb_color_line_t cl = { c, &(this+colorLine), Var<HBUINT8>::is_variable };
c->funcs->sweep_gradient (c->data, &cl, c->funcs->sweep_gradient (c->data, &cl,
centerX + c->instancer (varIdxBase, 0), centerX + c->instancer (varIdxBase, 0),