[HB] Fix pedantic warnings

diff --git a/src/hb-blob.h b/src/hb-blob.h
index 193da1d..1dd26f4 100644 (file)
--- a/src/hb-blob.h
+++ b/src/hb-blob.h
@@ -36,7 +36,7 @@ typedef enum {
   HB_MEMORY_MODE_READONLY,
   HB_MEMORY_MODE_WRITEABLE,
   HB_MEMORY_MODE_READONLY_NEVER_DUPLICATE,
-  HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITEABLE,
+  HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITEABLE
 } hb_memory_mode_t;
 
 typedef struct _hb_blob_t hb_blob_t;

diff --git a/src/hb-buffer-private.h b/src/hb-buffer-private.h
index 0456125..45cdc4d 100644 (file)
--- a/src/hb-buffer-private.h
+++ b/src/hb-buffer-private.h
@@ -50,15 +50,15 @@ typedef struct _hb_internal_glyph_position_t {
   hb_position_t  y_pos;
   hb_position_t  x_advance;
   hb_position_t  y_advance;
-  unsigned short new_advance :1;       /* if set, the advance width values are
-                                        * absolute, i.e., they won't be
-                                        * added to the original glyph's value
-                                        * but rather replace them */
-  unsigned short back : 15;            /* number of glyphs to go back
-                                        * for drawing current glyph */
-  short          cursive_chain : 16;   /* character to which this connects,
-                                        * may be positive or negative; used
-                                        * only internally */
+  uint32_t       new_advance :1;       /* if set, the advance width values are
+                                          absolute, i.e., they won't be
+                                          added to the original glyph's value
+                                          but rather replace them */
+  uint32_t       back : 15;            /* number of glyphs to go back
+                                          for drawing current glyph */
+  int32_t        cursive_chain : 16;   /* character to which this connects,
+                                          may be positive or negative; used
+                                          only internally */
 } hb_internal_glyph_position_t;
 
 ASSERT_STATIC (sizeof (hb_glyph_info_t) == sizeof (hb_internal_glyph_info_t));

diff --git a/src/hb-buffer.h b/src/hb-buffer.h
index f27739f..93671d0 100644 (file)
--- a/src/hb-buffer.h
+++ b/src/hb-buffer.h
@@ -56,13 +56,13 @@ typedef struct _hb_glyph_position_t {
   hb_position_t  x_advance;
   hb_position_t  y_advance;
   /* XXX these should all be replaced by "uint32_t internal" */
-  unsigned short new_advance :1;       /* if set, the advance width values are
+  uint32_t       new_advance :1;       /* if set, the advance width values are
                                           absolute, i.e., they won't be
                                           added to the original glyph's value
                                           but rather replace them */
-  unsigned short back : 15;            /* number of glyphs to go back
+  uint32_t       back : 15;            /* number of glyphs to go back
                                           for drawing current glyph */
-  short          cursive_chain : 16;   /* character to which this connects,
+  int32_t        cursive_chain : 16;   /* character to which this connects,
                                           may be positive or negative; used
                                           only internally */
 } hb_glyph_position_t;