fix #61931: Gonville shows nothing in the master symbols palette

musescore · May 27, 2015 · d33f638 · d33f638
1 parent 8c0d58e
commit d33f638
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -5487,16 +5487,19 @@ QString ScoreFont::toString(SymId id) const
 void ScoreFont::computeMetrics(Sym* sym, int code)
       {
       FT_UInt index = FT_Get_Char_Index(face, code);
-      sym->setIndex(index);
-      sym->setCode(code);
-
-      FT_Load_Glyph(face, index, FT_LOAD_DEFAULT);
-      FT_BBox bb;
-      FT_Outline_Get_BBox(&face->glyph->outline, &bb);
-      QRectF bbox;
-      bbox.setCoords(bb.xMin/640.0, -bb.yMax/640.0, bb.xMax/640.0, -bb.yMin/640.0);
-      sym->setBbox(bbox);
-      sym->setAdvance(face->glyph->linearHoriAdvance / 655360.0);
+      if (index != 0) {
+            if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT) == 0) {
+                  FT_BBox bb;
+                  if (FT_Outline_Get_BBox(&face->glyph->outline, &bb) == 0) {
+                        QRectF bbox;
+                        bbox.setCoords(bb.xMin/640.0, -bb.yMax/640.0, bb.xMax/640.0, -bb.yMin/640.0);
+                        sym->setIndex(index);
+                        sym->setCode(code);
+                        sym->setBbox(bbox);
+                        sym->setAdvance(face->glyph->linearHoriAdvance / 655360.0);
+                        }
+                  }
+            }
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/sym.h b/libmscore/sym.h
@@ -1799,12 +1799,12 @@ enum class SymId {
       ornamentPrecompAppoggTrill,
       ornamentPrecompAppoggTrillSuffix,
       ornamentPrecompCadence,
-      ornamentPrecompCadenceUpperPrefix ,
+      ornamentPrecompCadenceUpperPrefix,
       ornamentPrecompCadenceUpperPrefixTurn,
-      ornamentPrecompCadenceWithTurn ,
+      ornamentPrecompCadenceWithTurn,
       ornamentPrecompDescendingSlide,
       ornamentPrecompDoubleCadenceLowerPrefix,
-      ornamentPrecompDoubleCadenceUpperPrefix ,
+      ornamentPrecompDoubleCadenceUpperPrefix,
       ornamentPrecompDoubleCadenceUpperPrefixTurn,
       ornamentPrecompInvertedMordentUpperPrefix,
       ornamentPrecompMordentRelease,

diff --git a/mscore/symboldialog.cpp b/mscore/symboldialog.cpp
@@ -49,6 +49,8 @@ void SymbolDialog::createSymbols()
       {
       int currentIndex = fontList->currentIndex();
       const ScoreFont* f = &ScoreFont::scoreFonts()[currentIndex];
+      // init the font if not done yet
+      ScoreFont::fontFactory(f->name());
       sp->clear();
       for (int i = 0; i < int(SymId::lastSym); ++i) {
             if (f->isValid(SymId(i))) {