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

[GX] Towards anisotropic interpolation 

Also hookup to ValueRecord and Anchors.
This commit is contained in:
Behdad Esfahbod 2016-03-01 19:29:36 +09:00
parent 6d9d3c55bb
commit ca28670316
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hb-font-private.hh
View File

@ -109,8 +109,9 @@ struct hb_font_t {
unsigned int y_ppem; unsigned int y_ppem;
/* Font variation coordinates. */ /* Font variation coordinates. */
int *coords; unsigned int num_coords;
unsigned int coord_count; int *x_coords;
int *y_coords;
hb_font_funcs_t *klass; hb_font_funcs_t *klass;
void *user_data; void *user_data;

9
src/hb-font.cc
View File

@ -1165,6 +1165,8 @@ hb_font_create_sub_font (hb_font_t *parent)
font->x_ppem = parent->x_ppem; font->x_ppem = parent->x_ppem;
font->y_ppem = parent->y_ppem; font->y_ppem = parent->y_ppem;
/* TODO: copy variation coordinates. */
return font; return font;
} }
@ -1194,8 +1196,9 @@ hb_font_get_empty (void)
0, /* x_ppem */ 0, /* x_ppem */
0, /* y_ppem */ 0, /* y_ppem */
NULL, /* coords */ 0, /* num_coords */
0, /* coord_count */ NULL, /* x_coords */
NULL, /* y_coords */
const_cast<hb_font_funcs_t *> (&_hb_font_funcs_nil), /* klass */ const_cast<hb_font_funcs_t *> (&_hb_font_funcs_nil), /* klass */
NULL, /* user_data */ NULL, /* user_data */
@ -1251,6 +1254,8 @@ hb_font_destroy (hb_font_t *font)
hb_face_destroy (font->face); hb_face_destroy (font->face);
hb_font_funcs_destroy (font->klass); hb_font_funcs_destroy (font->klass);
/* TODO: destroy variation coordinates. */
free (font); free (font);
} }

4
src/hb-ot-layout-common-private.hh
View File

@ -1315,10 +1315,10 @@ struct VariationDevice
{ {
inline hb_position_t get_x_delta (hb_font_t *font) const inline hb_position_t get_x_delta (hb_font_t *font) const
{ return font->em_scalef_x (get_delta (font->coords, font->coord_count)); } { return font->em_scalef_x (get_delta (font->x_coords, font->num_coords)); }
inline hb_position_t get_y_delta (hb_font_t *font) const inline hb_position_t get_y_delta (hb_font_t *font) const
{ return font->em_scalef_y (get_delta (font->coords, font->coord_count)); } { return font->em_scalef_y (get_delta (font->y_coords, font->num_coords)); }
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {

20
src/hb-ot-layout-gpos-table.hh
View File

@ -109,7 +109,6 @@ struct ValueFormat : USHORT
const Value *values, const Value *values,
hb_glyph_position_t &glyph_pos) const hb_glyph_position_t &glyph_pos) const
{ {
unsigned int x_ppem, y_ppem;
unsigned int format = *this; unsigned int format = *this;
hb_bool_t horizontal = HB_DIRECTION_IS_HORIZONTAL (direction); hb_bool_t horizontal = HB_DIRECTION_IS_HORIZONTAL (direction);
@ -129,27 +128,28 @@ struct ValueFormat : USHORT
if (!has_device ()) return; if (!has_device ()) return;
x_ppem = font->x_ppem; bool use_x_device = font->x_ppem || font->num_coords;
y_ppem = font->y_ppem; bool use_y_device = font->y_ppem || font->num_coords;
if (!x_ppem && !y_ppem) return;
if (!use_x_device && !use_y_device) return;
/* pixel -> fractional pixel */ /* pixel -> fractional pixel */
if (format & xPlaDevice) { if (format & xPlaDevice) {
if (x_ppem) glyph_pos.x_offset += (base + get_device (values)).get_x_delta (font); if (use_x_device) glyph_pos.x_offset += (base + get_device (values)).get_x_delta (font);
values++; values++;
} }
if (format & yPlaDevice) { if (format & yPlaDevice) {
if (y_ppem) glyph_pos.y_offset += (base + get_device (values)).get_y_delta (font); if (use_y_device) glyph_pos.y_offset += (base + get_device (values)).get_y_delta (font);
values++; values++;
} }
if (format & xAdvDevice) { if (format & xAdvDevice) {
if (horizontal && x_ppem) glyph_pos.x_advance += (base + get_device (values)).get_x_delta (font); if (horizontal && use_x_device) glyph_pos.x_advance += (base + get_device (values)).get_x_delta (font);
values++; values++;
} }
if (format & yAdvDevice) { if (format & yAdvDevice) {
/* y_advance values grow downward but font-space grows upward, hence negation */ /* y_advance values grow downward but font-space grows upward, hence negation */
if (!horizontal && y_ppem) glyph_pos.y_advance -= (base + get_device (values)).get_y_delta (font); if (!horizontal && use_y_device) glyph_pos.y_advance -= (base + get_device (values)).get_y_delta (font);
values++; values++;
} }
} }
@ -291,9 +291,9 @@ struct AnchorFormat3
*x = font->em_scale_x (xCoordinate); *x = font->em_scale_x (xCoordinate);
*y = font->em_scale_y (yCoordinate); *y = font->em_scale_y (yCoordinate);
if (font->x_ppem) if (font->x_ppem || font->num_coords)
*x += (this+xDeviceTable).get_x_delta (font); *x += (this+xDeviceTable).get_x_delta (font);
if (font->y_ppem) if (font->y_ppem || font->num_coords)
*y += (this+yDeviceTable).get_x_delta (font); *y += (this+yDeviceTable).get_x_delta (font);
} }