Fix const correctness in the API

diff --git a/src/hb-fallback-shape-private.hh b/src/hb-fallback-shape-private.hh
index 40e9541..d0beb16 100644 (file)
--- a/src/hb-fallback-shape-private.hh
+++ b/src/hb-fallback-shape-private.hh
@@ -40,7 +40,7 @@ hb_fallback_shape (hb_font_t          *font,
                   hb_buffer_t        *buffer,
                   const hb_feature_t *features,
                   unsigned int        num_features,
-                  const char         *shaper_options);
+                  const char * const *shaper_options);
 
 
 HB_END_DECLS

diff --git a/src/hb-fallback-shape.cc b/src/hb-fallback-shape.cc
index 0462400..2fd527f 100644 (file)
--- a/src/hb-fallback-shape.cc
+++ b/src/hb-fallback-shape.cc
@@ -33,7 +33,7 @@ hb_fallback_shape (hb_font_t          *font,
                   hb_buffer_t        *buffer,
                   const hb_feature_t *features,
                   unsigned int        num_features,
-                  const char         *shaper_options)
+                  const char * const *shaper_options)
 {
   buffer->guess_properties ();
 

diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index fc2fa41..4275afc 100644 (file)
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -433,7 +433,7 @@ hb_ot_shape (hb_font_t          *font,
             hb_buffer_t        *buffer,
             const hb_feature_t *features,
             unsigned int        num_features,
-            const char         *shaper_options)
+            const char * const *shaper_options)
 {
   hb_ot_shape_plan_t plan;
 

diff --git a/src/hb-ot-shape.h b/src/hb-ot-shape.h
index 0fa3f36..1897e84 100644 (file)
--- a/src/hb-ot-shape.h
+++ b/src/hb-ot-shape.h
@@ -39,7 +39,7 @@ hb_ot_shape (hb_font_t          *font,
             hb_buffer_t        *buffer,
             const hb_feature_t *features,
             unsigned int        num_features,
-            const char         *shaper_options);
+            const char * const *shaper_options);
 
 
 HB_END_DECLS

diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 9a4ebfe..d42be6c 100644 (file)
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -42,7 +42,7 @@ typedef hb_bool_t (*hb_shape_func_t) (hb_font_t          *font,
                                      hb_buffer_t        *buffer,
                                      const hb_feature_t *features,
                                      unsigned int        num_features,
-                                     const char         *shaper_options);
+                                     const char * const *shaper_options);
 
 #define HB_SHAPER_IMPLEMENT(name) {#name, hb_##name##_shape}
 static struct hb_shaper_pair_t {
@@ -110,12 +110,12 @@ hb_shape_list_shapers (void)
 }
 
 hb_bool_t
-hb_shape_full (hb_font_t           *font,
-              hb_buffer_t         *buffer,
-              const hb_feature_t  *features,
-              unsigned int         num_features,
-              const char          *shaper_options,
-              const char         **shaper_list)
+hb_shape_full (hb_font_t          *font,
+              hb_buffer_t        *buffer,
+              const hb_feature_t *features,
+              unsigned int        num_features,
+              const char * const *shaper_options,
+              const char * const *shaper_list)
 {
   if (likely (!shaper_list)) {
     for (unsigned int i = 0; i < ARRAY_LENGTH (shapers); i++)

diff --git a/src/hb-shape.h b/src/hb-shape.h
index 18b35ae..685b11d 100644 (file)
--- a/src/hb-shape.h
+++ b/src/hb-shape.h
@@ -49,12 +49,12 @@ hb_shape (hb_font_t           *font,
          unsigned int         num_features);
 
 hb_bool_t
-hb_shape_full (hb_font_t           *font,
-              hb_buffer_t         *buffer,
-              const hb_feature_t  *features,
-              unsigned int         num_features,
-              const char          *shaper_options,
-              const char         **shaper_list);
+hb_shape_full (hb_font_t          *font,
+              hb_buffer_t        *buffer,
+              const hb_feature_t *features,
+              unsigned int        num_features,
+              const char * const *shaper_options,
+              const char * const *shaper_list);
 
 const char **
 hb_shape_list_shapers (void);

diff --git a/src/hb-uniscribe-shape.cc b/src/hb-uniscribe-shape.cc
index e583ae1..601e01c 100644 (file)
--- a/src/hb-uniscribe-shape.cc
+++ b/src/hb-uniscribe-shape.cc
@@ -208,7 +208,7 @@ hb_uniscribe_shape (hb_font_t          *font,
                    hb_buffer_t        *buffer,
                    const hb_feature_t *features,
                    unsigned int        num_features,
-                   const char         *shaper_options)
+                   const char * const *shaper_options)
 {
   buffer->guess_properties ();
 

diff --git a/src/hb-uniscribe.h b/src/hb-uniscribe.h
index aa893bd..bbb4635 100644 (file)
--- a/src/hb-uniscribe.h
+++ b/src/hb-uniscribe.h
@@ -39,7 +39,7 @@ hb_uniscribe_shape (hb_font_t          *font,
                    hb_buffer_t        *buffer,
                    const hb_feature_t *features,
                    unsigned int        num_features,
-                   const char         *shaper_options);
+                   const char * const *shaper_options);
 
 
 HB_END_DECLS