From 3f18236a03880c0960f5990dc90685f6146951a6 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 13 May 2012 16:20:10 +0200 Subject: [PATCH] Fix more warnings --- src/hb-ot-layout-common-private.hh | 2 +- src/hb-ot-layout-gsub-table.hh | 2 +- src/hb-ot-shape-complex-indic.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh index 6ea28bc..2943a7f 100644 --- a/src/hb-ot-layout-common-private.hh +++ b/src/hb-ot-layout-common-private.hh @@ -403,7 +403,7 @@ struct CoverageFormat2 for (i = 0; i < count; i++) { const RangeRecord &range = rangeRecord[i]; if (range.value <= index && - index < range.value + (range.end - range.start) && + index < (unsigned int) range.value + (range.end - range.start) && range.intersects (glyphs)) return true; else if (index < range.value) diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh index 2b19fc8..452214a 100644 --- a/src/hb-ot-layout-gsub-table.hh +++ b/src/hb-ot-layout-gsub-table.hh @@ -1178,7 +1178,7 @@ GSUB::substitute_start (hb_buffer_t *buffer) } void -GSUB::substitute_finish (hb_buffer_t *buffer) +GSUB::substitute_finish (hb_buffer_t *buffer HB_UNUSED) { } diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index 6607778..8b6d4bb 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -188,7 +188,7 @@ _hb_ot_shape_complex_normalization_preference_indic (void) void _hb_ot_shape_complex_setup_masks_indic (hb_ot_map_t *map HB_UNUSED, hb_buffer_t *buffer, - hb_font_t *font) + hb_font_t *font HB_UNUSED) { HB_BUFFER_ALLOCATE_VAR (buffer, indic_category); HB_BUFFER_ALLOCATE_VAR (buffer, indic_position); @@ -513,7 +513,7 @@ static void initial_reordering_non_indic (const hb_ot_map_t *map HB_UNUSED, hb_buffer_t *buffer HB_UNUSED, hb_mask_t *mask_array HB_UNUSED, - unsigned int start, unsigned int end) + unsigned int start HB_UNUSED, unsigned int end HB_UNUSED) { /* Nothing to do right now. If we ever switch to using the output * buffer in the reordering process, we'd need to next_glyph() here. */ @@ -523,7 +523,7 @@ initial_reordering_non_indic (const hb_ot_map_t *map HB_UNUSED, static void initial_reordering (const hb_ot_map_t *map, - hb_face_t *face, + hb_face_t *face HB_UNUSED, hb_buffer_t *buffer, void *user_data HB_UNUSED) { @@ -824,7 +824,7 @@ final_reordering_syllable (hb_buffer_t *buffer, hb_mask_t *mask_array, static void final_reordering (const hb_ot_map_t *map, - hb_face_t *face, + hb_face_t *face HB_UNUSED, hb_buffer_t *buffer, void *user_data HB_UNUSED) { -- 2.7.4