[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-layout.cc |   52 +++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

New commits:
commit f415755fdf011d3fa3b9aad04c38f2255dd7acf8
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon May 17 15:14:14 2010 -0400

    Minor

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 2965384..3ee031c 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -601,45 +601,47 @@ hb_ot_layout_position_finish (hb_font_t    *font HB_UNUSED,
 {
   unsigned int i, j;
   unsigned int len = hb_buffer_get_length (buffer);
-  hb_internal_glyph_position_t *positions = (hb_internal_glyph_position_t *) hb_buffer_get_glyph_positions (buffer);
+  hb_internal_glyph_position_t *pos = (hb_internal_glyph_position_t *) hb_buffer_get_glyph_positions (buffer);
 
   /* TODO: Vertical */
 
   /* Handle cursive connections */
   /* First handle all left-to-right connections */
   for (j = 0; j < len; j++) {
-    if (positions[j].cursive_chain > 0) {
-      positions[j].y_offset += positions[j - positions[j].cursive_chain].y_offset;
-      positions[j].cursive_chain = 0;
+    if (pos[j].cursive_chain > 0)
+    {
+      pos[j].y_offset += pos[j - pos[j].cursive_chain].y_offset;
+      pos[j].cursive_chain = 0;
     }
   }
   /* Then handle all right-to-left connections */
   for (i = len; i > 0; i--) {
     j = i - 1;
-    if (positions[j].cursive_chain < 0) {
-      positions[j].y_offset += positions[j - positions[j].cursive_chain].y_offset;
-      positions[j].cursive_chain = 0;
+    if (pos[j].cursive_chain < 0)
+    {
+      pos[j].y_offset += pos[j - pos[j].cursive_chain].y_offset;
+      pos[j].cursive_chain = 0;
     }
   }
 
   /* Handle attachments */
   for (i = 0; i < len; i++)
-    if (positions[i].back)
-      {
-	unsigned int back = i - positions[i].back;
-	positions[i].back = 0;
-	positions[i].x_offset += positions[back].x_offset;
-	positions[i].y_offset += positions[back].y_offset;
-
-	if (buffer->direction == HB_DIRECTION_RTL)
-	  for (j = back + 1; j < i + 1; j++) {
-	    positions[i].x_offset += positions[j].x_advance;
-	    positions[i].y_offset += positions[j].y_advance;
-	  }
-	else
-	  for (j = back; j < i; j++) {
-	    positions[i].x_offset -= positions[j].x_advance;
-	    positions[i].y_offset -= positions[j].y_advance;
-	  }
-      }
+    if (pos[i].back)
+    {
+      unsigned int back = i - pos[i].back;
+      pos[i].back = 0;
+      pos[i].x_offset += pos[back].x_offset;
+      pos[i].y_offset += pos[back].y_offset;
+
+      if (buffer->direction == HB_DIRECTION_RTL)
+	for (j = back + 1; j < i + 1; j++) {
+	  pos[i].x_offset += pos[j].x_advance;
+	  pos[i].y_offset += pos[j].y_advance;
+	}
+      else
+	for (j = back; j < i; j++) {
+	  pos[i].x_offset -= pos[j].x_advance;
+	  pos[i].y_offset -= pos[j].y_advance;
+	}
+    }
 }