[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-layout-gsub-table.hh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6cdfd14bb19d60ac3d6b20ff611408432254f273
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 30 17:22:17 2012 -0400

    Fix build on Mac

diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh
index 4ad61a9..bdc7b38 100644
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
@@ -585,7 +585,7 @@ struct Ligature
       {
 	if (!is_mark_ligature) {
 	  unsigned int new_lig_comp = components_so_far - last_num_components +
-				      MIN (MAX (get_lig_comp (c->buffer->cur()), 1), last_num_components);
+				      MIN (MAX (get_lig_comp (c->buffer->cur()), 1u), last_num_components);
 	  set_lig_props_for_mark (c->buffer->cur(), lig_id, new_lig_comp);
 	}
 	c->buffer->next_glyph ();
@@ -604,7 +604,7 @@ struct Ligature
       for (unsigned int i = c->buffer->idx; i < c->buffer->len; i++) {
 	if (last_lig_id == get_lig_id (c->buffer->info[i])) {
 	  unsigned int new_lig_comp = components_so_far - last_num_components +
-				      MIN (MAX (get_lig_comp (c->buffer->info[i]), 1), last_num_components);
+				      MIN (MAX (get_lig_comp (c->buffer->info[i]), 1u), last_num_components);
 	  set_lig_props_for_mark (c->buffer->info[i], lig_id, new_lig_comp);
 	} else
 	  break;