From 737436d3f8aacfd0bd586cd54d7034bae3afc4e1 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 18 Jun 2019 13:07:44 -0700
Subject: [PATCH] Streamline HB_NO_CFF

---
 src/hb-ot-cff1-table.cc     | 7 +++++--
 src/hb-ot-cff2-table.cc     | 7 +++++--
 src/hb-subset-cff-common.cc | 7 +++++++
 src/hb-subset-cff1.cc       | 7 +++++--
 src/hb-subset-cff2.cc       | 7 +++++--
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/hb-ot-cff1-table.cc b/src/hb-ot-cff1-table.cc
index e6dd6a7b8..3238ad73a 100644
--- a/src/hb-ot-cff1-table.cc
+++ b/src/hb-ot-cff1-table.cc
@@ -24,11 +24,13 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
-#include "hb-ot-cff1-table.hh"
-#include "hb-cff1-interp-cs.hh"
+#include "hb.hh"
 
 #ifndef HB_NO_CFF
 
+#include "hb-ot-cff1-table.hh"
+#include "hb-cff1-interp-cs.hh"
+
 using namespace CFF;
 
 /* SID to code */
@@ -391,4 +393,5 @@ bool OT::cff1::accelerator_t::get_seac_components (hb_codepoint_t glyph, hb_code
   return false;
 }
 
+
 #endif
diff --git a/src/hb-ot-cff2-table.cc b/src/hb-ot-cff2-table.cc
index f1fa6ec30..9c9e37bd0 100644
--- a/src/hb-ot-cff2-table.cc
+++ b/src/hb-ot-cff2-table.cc
@@ -24,11 +24,13 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
-#include "hb-ot-cff2-table.hh"
-#include "hb-cff2-interp-cs.hh"
+#include "hb.hh"
 
 #ifndef HB_NO_OT_FONT_CFF
 
+#include "hb-ot-cff2-table.hh"
+#include "hb-cff2-interp-cs.hh"
+
 using namespace CFF;
 
 struct extents_param_t
@@ -142,4 +144,5 @@ bool OT::cff2::accelerator_t::get_extents (hb_font_t *font,
   return true;
 }
 
+
 #endif
diff --git a/src/hb-subset-cff-common.cc b/src/hb-subset-cff-common.cc
index 2aa55b985..54f6dc2a7 100644
--- a/src/hb-subset-cff-common.cc
+++ b/src/hb-subset-cff-common.cc
@@ -24,6 +24,10 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
+#include "hb.hh"
+
+#ifndef HB_NO_SUBSET_CFF
+
 #include "hb-ot-cff-common.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-subset-cff-common.hh"
@@ -223,3 +227,6 @@ hb_serialize_cff_fdselect (hb_serialize_context_t *c,
     return_trace (false);
   }
 }
+
+
+#endif
diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
index 688f3f377..ab46808d2 100644
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
@@ -24,6 +24,10 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
+#include "hb.hh"
+
+#ifndef HB_NO_SUBSET_CFF
+
 #include "hb-open-type.hh"
 #include "hb-ot-cff1-table.hh"
 #include "hb-set.h"
@@ -32,8 +36,6 @@
 #include "hb-subset-cff-common.hh"
 #include "hb-cff1-interp-cs.hh"
 
-#ifndef HB_NO_SUBSET_CFF
-
 using namespace CFF;
 
 struct remap_sid_t : remap_t
@@ -1121,4 +1123,5 @@ hb_subset_cff1 (hb_subset_plan_t *plan,
   return result;
 }
 
+
 #endif
diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc
index 78b8c05d4..afb23ae3c 100644
--- a/src/hb-subset-cff2.cc
+++ b/src/hb-subset-cff2.cc
@@ -24,6 +24,10 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
+#include "hb.hh"
+
+#ifndef HB_NO_SUBSET_CFF
+
 #include "hb-open-type.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-set.h"
@@ -32,8 +36,6 @@
 #include "hb-subset-cff-common.hh"
 #include "hb-cff2-interp-cs.hh"
 
-#ifndef HB_NO_SUBSET_CFF
-
 using namespace CFF;
 
 struct cff2_sub_table_offsets_t : cff_sub_table_offsets_t
@@ -629,4 +631,5 @@ hb_subset_cff2 (hb_subset_plan_t *plan,
   return result;
 }
 
+
 #endif