[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-open-file-private.hh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 29e7879bcf3fe955a0be3bb41e929e68f39ad01e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 3 12:38:21 2018 +0430

    Disable .dfont code for now
    
    The get_table imple was wrong, as table offsets in a dfont are
    relative to the resource.  We were treating them as relative to
    the big blob itself.  To be fixed.
    
    Part of https://github.com/harfbuzz/harfbuzz/pull/1085

diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index f69d5f46..226c48f6 100644
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -505,7 +505,7 @@ struct OpenTypeFontFile
     case Typ1Tag:
     case TrueTypeTag:	return 1;
     case TTCTag:	return u.ttcHeader.get_face_count ();
-    case DFontTag:	return u.rfHeader.get_face_count ();
+//    case DFontTag:	return u.rfHeader.get_face_count ();
     default:		return 0;
     }
   }
@@ -520,7 +520,7 @@ struct OpenTypeFontFile
     case Typ1Tag:
     case TrueTypeTag:	return u.fontFace;
     case TTCTag:	return u.ttcHeader.get_face (i);
-    case DFontTag:	return u.rfHeader.get_face (i);
+//    case DFontTag:	return u.rfHeader.get_face (i);
     default:		return Null(OpenTypeFontFace);
     }
   }
@@ -547,7 +547,7 @@ struct OpenTypeFontFile
     case Typ1Tag:
     case TrueTypeTag:	return_trace (u.fontFace.sanitize (c));
     case TTCTag:	return_trace (u.ttcHeader.sanitize (c));
-    case DFontTag:	return_trace (u.rfHeader.sanitize (c));
+//    case DFontTag:	return_trace (u.rfHeader.sanitize (c));
     default:		return_trace (true);
     }
   }