From b11032afaefb2c84f9a4bbffe95c91f6374df802 Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Mon, 22 Oct 2018 15:52:37 -0700
Subject: [PATCH] fix build attempt ^2

---
 src/hb-ot-cff-common.hh        | 2 +-
 test/api/test-ot-extents-cff.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hb-ot-cff-common.hh b/src/hb-ot-cff-common.hh
index 8599de504..aa48d7afd 100644
--- a/src/hb-ot-cff-common.hh
+++ b/src/hb-ot-cff-common.hh
@@ -384,7 +384,7 @@ struct Remap : hb_vector_t<hb_codepoint_t>
   { return (id < len) && ((*this)[id] != CFF_UNDEF_CODE); }
 
   inline bool excludes (hb_codepoint_t id) const
-  { return !includes (i); }
+  { return !includes (id); }
 
   inline hb_codepoint_t operator[] (hb_codepoint_t i) const
   {
diff --git a/test/api/test-ot-extents-cff.c b/test/api/test-ot-extents-cff.c
index e2f8b5a7d..fe44a5a03 100644
--- a/test/api/test-ot-extents-cff.c
+++ b/test/api/test-ot-extents-cff.c
@@ -32,7 +32,7 @@
 static void
 test_extents_cff1 (void)
 {
-  hb_face_t *face = hb_subset_test_open_font ("fonts/SourceSansPro-Regular.abc.otf");
+  hb_face_t *face = hb_test_open_font_file ("fonts/SourceSansPro-Regular.abc.otf");
   g_assert (face);
   hb_font_t *font = hb_font_create (face);
   hb_face_destroy (face);