[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-color-cpal-table.hh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fedd8e6c176dea85194693399e50243eb1c117c4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Nov 30 16:50:30 2018 -0500

    One more.........
    
    I wonder if there's something better to do about these :(.
    
    In file included from hb-ot-color.cc:31:
    hb-ot-color-cpal-table.hh: In member function 'unsigned int OT::CPAL::get_size() const':
    hb-ot-color-cpal-table.hh:118: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second:

diff --git a/src/hb-ot-color-cpal-table.hh b/src/hb-ot-color-cpal-table.hh
index 095f96f2..85bdc7ef 100644
--- a/src/hb-ot-color-cpal-table.hh
+++ b/src/hb-ot-color-cpal-table.hh
@@ -115,7 +115,7 @@ struct CPAL
   inline bool has_data (void) const { return numPalettes; }
 
   inline unsigned int get_size (void) const
-  { return min_size + numPalettes * sizeof (colorRecordIndicesZ[0]); }
+  { return min_size + numPalettes * sizeof (colorRecordIndicesZ[0u]); }
 
   inline unsigned int get_palette_count () const { return numPalettes; }
   inline unsigned int get_color_count () const { return numColors; }