diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-11-05 14:02:16 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-11-05 14:02:16 -0500 |
| commit | 417b1af3087822bcf5f2a5f54aa329dfdc12942a (patch) | |
| tree | 24bf6fa2646752f03e83e55f550badf9cb8b4b2d /pango | |
| parent | 9aad0832bbe7b979a0f7161b1074c9213b1cbe35 (diff) | |
| download | pango-417b1af3087822bcf5f2a5f54aa329dfdc12942a.tar.gz | |
[HB] Update to HarfBuzz struct renames
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-ot-buffer.c | 24 | ||||
| -rw-r--r-- | pango/pango-ot-info.c | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pango/pango-ot-buffer.c b/pango/pango-ot-buffer.c index 89653603..da9ee8e9 100644 --- a/pango/pango-ot-buffer.c +++ b/pango/pango-ot-buffer.c @@ -243,8 +243,8 @@ apply_gpos_ltr (PangoGlyphString *glyphs, for (i = 0; i < glyphs->num_glyphs; i++) { - FT_Pos x_pos = positions[i].x_pos; - FT_Pos y_pos = positions[i].y_pos; + FT_Pos x_offset = positions[i].x_offset; + FT_Pos y_offset = positions[i].y_offset; int back = i; int j; int adjustment; @@ -264,15 +264,15 @@ apply_gpos_ltr (PangoGlyphString *glyphs, while (positions[back].back != 0) { back -= positions[back].back; - x_pos += positions[back].x_pos; - y_pos += positions[back].y_pos; + x_offset += positions[back].x_offset; + y_offset += positions[back].y_offset; } for (j = back; j < i; j++) glyphs->glyphs[i].geometry.x_offset -= glyphs->glyphs[j].geometry.width; - glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos); - glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos); + glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_offset); + glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_offset); } } @@ -288,8 +288,8 @@ apply_gpos_rtl (PangoGlyphString *glyphs, int i_rev = glyphs->num_glyphs - i - 1; int back_rev = i_rev; int back; - FT_Pos x_pos = positions[i_rev].x_pos; - FT_Pos y_pos = positions[i_rev].y_pos; + FT_Pos x_offset = positions[i_rev].x_offset; + FT_Pos y_offset = positions[i_rev].y_offset; int j; int adjustment; @@ -308,8 +308,8 @@ apply_gpos_rtl (PangoGlyphString *glyphs, while (positions[back_rev].back != 0) { back_rev -= positions[back_rev].back; - x_pos += positions[back_rev].x_pos; - y_pos += positions[back_rev].y_pos; + x_offset += positions[back_rev].x_offset; + y_offset += positions[back_rev].y_offset; } back = glyphs->num_glyphs - back_rev - 1; @@ -317,8 +317,8 @@ apply_gpos_rtl (PangoGlyphString *glyphs, for (j = i; j < back; j++) glyphs->glyphs[i].geometry.x_offset += glyphs->glyphs[j].geometry.width; - glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos); - glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos); + glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_offset); + glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_offset); } } diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c index 97d37a1d..df52ed41 100644 --- a/pango/pango-ot-info.c +++ b/pango/pango-ot-info.c @@ -619,7 +619,7 @@ _pango_ot_info_position (const PangoOTInfo *info, for (j = 0; j < len; j++) { if (positions[j].cursive_chain > 0) - positions[j].y_pos += positions[j - positions[j].cursive_chain].y_pos; + positions[j].y_offset += positions[j - positions[j].cursive_chain].y_offset; } /* Then handle all right-to-left connections */ @@ -628,7 +628,7 @@ _pango_ot_info_position (const PangoOTInfo *info, j = i - 1; if (positions[j].cursive_chain < 0) - positions[j].y_pos += positions[j - positions[j].cursive_chain].y_pos; + positions[j].y_offset += positions[j - positions[j].cursive_chain].y_offset; } } |