Minor adjustment in glyph discovery module...

Tehreer · May 7, 2017 · b96f4a9 · b96f4a9
1 parent a984752
commit b96f4a9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/Source/SFGlyphDiscovery.c b/Source/SFGlyphDiscovery.c
@@ -22,34 +22,32 @@
 #include "SFFont.h"
 #include "SFGDEF.h"
 #include "SFOpenType.h"
+#include "SFPattern.h"
 
 #include "SFGlyphDiscovery.h"
 #include "SFTextProcessor.h"
 
-static SFGlyphTraits _SFGlyphClassToGlyphTraits(SFUInt16 glyphClass)
+SF_PRIVATE SFGlyphTraits _SFGetGlyphTraits(SFTextProcessorRef processor, SFGlyphID glyph)
 {
-    switch (glyphClass) {
-        case SFGlyphClassValueBase:
-            return SFGlyphTraitBase;
+    SFData glyphClassDef = processor->_glyphClassDef;
 
-        case SFGlyphClassValueLigature:
-            return SFGlyphTraitLigature;
+    if (glyphClassDef) {
+        SFUInt16 glyphClass = SFOpenTypeSearchGlyphClass(glyphClassDef, glyph);
 
-        case SFGlyphClassValueMark:
-            return SFGlyphTraitMark;
+        /* Convert glyph class to traits options. */
+        switch (glyphClass) {
+            case SFGlyphClassValueBase:
+                return SFGlyphTraitBase;
 
-        case SFGlyphClassValueComponent:
-            return SFGlyphTraitComponent;
-    }
+            case SFGlyphClassValueLigature:
+                return SFGlyphTraitLigature;
 
-    return SFGlyphTraitNone;
-}
+            case SFGlyphClassValueMark:
+                return SFGlyphTraitMark;
 
-SF_PRIVATE SFGlyphTraits _SFGetGlyphTraits(SFTextProcessorRef processor, SFGlyphID glyph)
-{
-    if (processor->_glyphClassDef) {
-        SFUInt16 glyphClass = SFOpenTypeSearchGlyphClass(processor->_glyphClassDef, glyph);
-        return _SFGlyphClassToGlyphTraits(glyphClass);
+            case SFGlyphClassValueComponent:
+                return SFGlyphTraitComponent;
+        }
     }
 
     return SFGlyphTraitNone;

diff --git a/Source/SFGlyphDiscovery.h b/Source/SFGlyphDiscovery.h
@@ -17,14 +17,8 @@
 #ifndef _SF_INTERNAL_GLYPH_DISCOVERY_H
 #define _SF_INTERNAL_GLYPH_DISCOVERY_H
 
-/*
- * NOTE:
- *      This file is part of SFTextProcessor class whose purpose is to discover character glyphs.
- */
-
 #include <SFConfig.h>
 
-#include "SFAlbum.h"
 #include "SFBase.h"
 #include "SFTextProcessor.h"