[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-cff1-table.hh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4d809696ef4db046d11072e5433ea5ff36bd7b26
Author: Michiharu Ariza <ariza at adobe.com>
Date:   Fri Dec 7 20:49:39 2018 -0800

    fix for issue #1447 (#1462)
    
    Added case for OpCode_BaseFontName. This opcode in spec but practically unused.
    Added a comment for default case which can't be hit

diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh
index 10ce8ff4..7a2c75e1 100644
--- a/src/hb-ot-cff1-table.hh
+++ b/src/hb-ot-cff1-table.hh
@@ -656,7 +656,7 @@ struct NameDictValues
   static inline enum NameDictValIndex name_op_to_index (OpCode op)
   {
     switch (op) {
-      default:
+      default: // can't happen - just make some compiler happy
       case OpCode_version:
 	return version;
       case OpCode_Notice:
@@ -673,7 +673,9 @@ struct NameDictValues
 	return postscript;
       case OpCode_FontName:
 	return fontName;
-      }
+      case OpCode_BaseFontName:
+	return baseFontName;
+    }
   }
 
   unsigned int  values[ValCount];