From 959996d709dad7ce4a8087b2eef9dd4d6169493f Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sat, 24 Dec 2022 11:22:16 -0700
Subject: [PATCH] [paint-extents] Namespace

---
 src/hb-paint-extents.hh | 52 ++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/hb-paint-extents.hh b/src/hb-paint-extents.hh
index bc5762562..39028f1b4 100644
--- a/src/hb-paint-extents.hh
+++ b/src/hb-paint-extents.hh
@@ -324,58 +324,52 @@ add_point (hb_extents_t *extents,
 }
 
 static void
-move_to (hb_draw_funcs_t *dfuncs,
-         void *data,
-         hb_draw_state_t *st,
-         float to_x, float to_y,
-         void *)
+hb_draw_extents_move_to (hb_draw_funcs_t *dfuncs,
+			 void *data,
+			 hb_draw_state_t *st,
+			 float to_x, float to_y,
+			 void *)
 {
   hb_extents_t *extents = (hb_extents_t *)data;
+
   add_point (extents, to_x, to_y);
 }
 
 static void
-line_to (hb_draw_funcs_t *dfuncs,
-         void *data,
-         hb_draw_state_t *st,
-         float to_x, float to_y,
-         void *)
+hb_draw_extents_line_to (hb_draw_funcs_t *dfuncs,
+			 void *data,
+			 hb_draw_state_t *st,
+			 float to_x, float to_y,
+			 void *)
 {
   hb_extents_t *extents = (hb_extents_t *)data;
+
   add_point (extents, to_x, to_y);
 }
 
 static void
-cubic_to (hb_draw_funcs_t *dfuncs,
-          void *data,
-          hb_draw_state_t *st,
-          float control1_x, float control1_y,
-          float control2_x, float control2_y,
-          float to_x, float to_y,
-          void *)
+hb_draw_extents_cubic_to (hb_draw_funcs_t *dfuncs,
+			  void *data,
+			  hb_draw_state_t *st,
+			  float control1_x, float control1_y,
+			  float control2_x, float control2_y,
+			  float to_x, float to_y,
+			  void *)
 {
   hb_extents_t *extents = (hb_extents_t *)data;
+
   add_point (extents, control1_x, control1_y);
   add_point (extents, control2_x, control2_y);
   add_point (extents, to_x, to_y);
 }
 
-static void
-close_path (hb_draw_funcs_t *dfuncs,
-            void *data,
-            hb_draw_state_t *st,
-            void *)
-{
-}
-
 static hb_draw_funcs_t *
 hb_draw_extent_get_funcs ()
 {
   hb_draw_funcs_t *funcs = hb_draw_funcs_create ();
-  hb_draw_funcs_set_move_to_func (funcs, move_to, nullptr, nullptr);
-  hb_draw_funcs_set_line_to_func (funcs, line_to, nullptr, nullptr);
-  hb_draw_funcs_set_cubic_to_func (funcs, cubic_to, nullptr, nullptr);
-  hb_draw_funcs_set_close_path_func (funcs, close_path, nullptr, nullptr);
+  hb_draw_funcs_set_move_to_func (funcs, hb_draw_extents_move_to, nullptr, nullptr);
+  hb_draw_funcs_set_line_to_func (funcs, hb_draw_extents_line_to, nullptr, nullptr);
+  hb_draw_funcs_set_cubic_to_func (funcs, hb_draw_extents_cubic_to, nullptr, nullptr);
   return funcs;
 }