From 74a2dbbcedb4647bf14dac17eb4faf1d1d57cf99 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Sun, 6 Oct 2019 17:06:40 +0330
Subject: [PATCH] minor

---
 .gitignore                  |  1 -
 src/Makefile.sources        |  1 -
 src/hb-ot-font.cc           |  1 -
 src/hb-ot-hmtx-table.hh     |  1 -
 src/hb-ot-var-hvar-table.hh | 37 +++++++++++++++++--------------------
 5 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 86042ab43..000000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.plist
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 22980c93f..911ee2f54 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -139,7 +139,6 @@ HB_BASE_sources = \
 	hb-ot-var-gvar-table.hh \
 	hb-ot-var-hvar-table.hh \
 	hb-ot-var-mvar-table.hh \
-	hb-ot-var-gvar-table.hh \
 	hb-ot-var.cc \
 	hb-ot-vorg-table.hh \
 	hb-pool.hh \
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index d2bea8a01..303cd4c68 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -43,7 +43,6 @@
 #include "hb-ot-post-table.hh"
 #include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-ot-vorg-table.hh"
-#include "hb-ot-var-gvar-table.hh"
 #include "hb-ot-color-cbdt-table.hh"
 #include "hb-ot-color-sbix-table.hh"
 
diff --git a/src/hb-ot-hmtx-table.hh b/src/hb-ot-hmtx-table.hh
index 8e3368d00..9d179330c 100644
--- a/src/hb-ot-hmtx-table.hh
+++ b/src/hb-ot-hmtx-table.hh
@@ -165,7 +165,6 @@ struct hmtxvmtx
     void init (hb_face_t *face,
 	       unsigned int default_advance_ = 0)
     {
-      memset (this, 0, sizeof (*this));
       default_advance = default_advance_ ? default_advance_ : hb_face_get_upem (face);
 
       num_advances = T::is_horizontal ? face->table.hhea->numberOfLongMetrics : face->table.vhea->numberOfLongMetrics;
diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh
index c1935f7d0..cdf66ee89 100644
--- a/src/hb-ot-var-hvar-table.hh
+++ b/src/hb-ot-var-hvar-table.hh
@@ -65,7 +65,7 @@ struct DeltaSetIndexMap
       unsigned int v = output_map[i];
       unsigned int outer = v >> 16;
       unsigned int inner = v & 0xFFFF;
-      unsigned int u = (outer << inner_bit_count)|inner;
+      unsigned int u = (outer << inner_bit_count) | inner;
       for (unsigned int w = width; w > 0;)
       {
 	p[--w] = u;
@@ -155,14 +155,14 @@ struct index_map_subset_plan_t
       hb_codepoint_t	old_gid;
       if (!plan->old_gid_for_new_gid (gid - 1, &old_gid))
       {
-      	if (last_gid == (hb_codepoint_t)-1)
+	if (last_gid == (hb_codepoint_t) -1)
 	  continue;
 	else
 	  break;
       }
 
-      unsigned int	v = index_map.map (old_gid);
-      if (last_gid == (hb_codepoint_t)-1)
+      unsigned int v = index_map.map (old_gid);
+      if (last_gid == (hb_codepoint_t) -1)
       {
 	last_val = v;
 	last_gid = gid;
@@ -226,8 +226,8 @@ struct index_map_subset_plan_t
   }
 
   unsigned int get_inner_bit_count () const { return inner_bit_count; }
-  unsigned int get_width () const { return ((outer_bit_count + inner_bit_count + 7) / 8); }
-  unsigned int get_map_count () const { return map_count; }
+  unsigned int get_width ()           const { return ((outer_bit_count + inner_bit_count + 7) / 8); }
+  unsigned int get_map_count ()       const { return map_count; }
 
   unsigned int get_size () const
   { return (map_count? (DeltaSetIndexMap::min_size + get_width () * map_count): 0); }
@@ -236,13 +236,11 @@ struct index_map_subset_plan_t
   hb_array_t<const unsigned int> get_output_map () const { return output_map.as_array (); }
 
   protected:
-  unsigned int	map_count;
-  hb_vector_t<unsigned int>
-  		max_inners;
-  unsigned int	outer_bit_count;
-  unsigned int	inner_bit_count;
-  hb_vector_t<unsigned int>
-		output_map;
+  unsigned int map_count;
+  hb_vector_t<unsigned int> max_inners;
+  unsigned int outer_bit_count;
+  unsigned int inner_bit_count;
+  hb_vector_t<unsigned int> output_map;
 };
 
 struct hvarvvar_subset_plan_t
@@ -318,15 +316,14 @@ struct hvarvvar_subset_plan_t
     index_map_plans.fini_deep ();
   }
 
-  hb_inc_bimap_t		outer_map;
-  hb_vector_t<hb_inc_bimap_t>	inner_maps;
-  hb_vector_t<index_map_subset_plan_t>
-  				index_map_plans;
-  const VariationStore		*var_store;
+  hb_inc_bimap_t outer_map;
+  hb_vector_t<hb_inc_bimap_t> inner_maps;
+  hb_vector_t<index_map_subset_plan_t> index_map_plans;
+  const VariationStore *var_store;
 
   protected:
-  hb_vector_t<hb_set_t *>	inner_sets;
-  hb_set_t			*adv_set;
+  hb_vector_t<hb_set_t *> inner_sets;
+  hb_set_t *adv_set;
 };
 
 /*