[HarfBuzz] harfbuzz-ng: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-ot-shape-complex-indic.cc |    6 +++---
 src/test-would-substitute.cc     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8ba8042821e4581fe4e87419e58c823520441205
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 3 18:54:54 2012 -0700

    [Indic] Fix consonant position font lookup logic
    
    Oops.  I broken this badly and the test suite did not notice.  That
    worries me.  Have to investigate.

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index 7dde77d..ccc4a9d 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -340,9 +340,9 @@ consonant_position_from_face (const indic_shape_plan_t *indic_plan,
 			      hb_codepoint_t *glyphs, unsigned int glyphs_len,
 			      hb_face_t      *face)
 {
-  if (indic_plan->pref.would_substitute (glyphs, ARRAY_LENGTH (glyphs), face)) return POS_BELOW_C;
-  if (indic_plan->blwf.would_substitute (glyphs, ARRAY_LENGTH (glyphs), face)) return POS_BELOW_C;
-  if (indic_plan->pstf.would_substitute (glyphs, ARRAY_LENGTH (glyphs), face)) return POS_POST_C;
+  if (indic_plan->pref.would_substitute (glyphs, glyphs_len, face)) return POS_BELOW_C;
+  if (indic_plan->blwf.would_substitute (glyphs, glyphs_len, face)) return POS_BELOW_C;
+  if (indic_plan->pstf.would_substitute (glyphs, glyphs_len, face)) return POS_POST_C;
   return POS_BASE_C;
 }
 
commit abd0c05f1f7f0546593bb2f1c4d59db12cb32e46
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 3 18:45:05 2012 -0700

    Minor

diff --git a/src/test-would-substitute.cc b/src/test-would-substitute.cc
index 2a2c3ef..bf64a29 100644
--- a/src/test-would-substitute.cc
+++ b/src/test-would-substitute.cc
@@ -47,7 +47,7 @@ main (int argc, char **argv)
   hb_blob_t *blob = NULL;
 
   if (argc != 4 && argc != 5) {
-    fprintf (stderr, "usage: %s lookup-index first-glyph [second-glyph]\n", argv[0]);
+    fprintf (stderr, "usage: %s font-file lookup-index first-glyph [second-glyph]\n", argv[0]);
     exit (1);
   }