[pango/harfbuzz-ng-external] [HB] Update to HarfBuzz struct renames

[Behdad Esfahbod <behdad src gnome org>]

commit 417b1af3087822bcf5f2a5f54aa329dfdc12942a
Author: Behdad Esfahbod <behdad behdad org>
Date:   Thu Nov 5 14:02:16 2009 -0500

    [HB] Update to HarfBuzz struct renames

 pango/pango-ot-buffer.c |   24 ++++++++++++------------
 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 8965360..da9ee8e 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 97d37a1..df52ed4 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;
       }
     }