diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-07-30 10:38:43 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-07-31 18:29:39 +0200 |
| commit | 74317ed5f794816bc9b33e087c5412833fbba420 (patch) | |
| tree | b192e0a424d3434d3cbc8cc0db17029b9d640554 /include/vcl/font | |
| parent | aa2e694e8d9e22de94dbf21f81883f9af0e34ce9 (diff) | |
Font features: Use Graphite instead of HarfBuzz if available
When searching for font features, use Graphtie if it is available
instead of HarfBuzz, because HarfBuzz will only give a subset of
OpenType features in a Graphite font, but will ignore additional
features specific to Graphite.
Change-Id: I00c8790ee4d1e1ab906928f649d2a3e54163557f
Reviewed-on: https://gerrit.libreoffice.org/58306
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/vcl/font')
| -rw-r--r-- | include/vcl/font/Feature.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/font/FeatureParser.hxx | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx index 9b0d29db3190..aca557e4e53a 100644 --- a/include/vcl/font/Feature.hxx +++ b/include/vcl/font/Feature.hxx @@ -35,6 +35,12 @@ enum class FeatureParameterType ENUM }; +enum class FeatureType +{ + OpenType, + Graphite +}; + struct VCL_DLLPUBLIC FeatureParameter { private: @@ -89,7 +95,11 @@ struct VCL_DLLPUBLIC FeatureID struct VCL_DLLPUBLIC Feature { + Feature(); + Feature(FeatureID const& rID, FeatureType eType); + FeatureID m_aID; + FeatureType m_eType; FeatureDefinition m_aDefinition; }; diff --git a/include/vcl/font/FeatureParser.hxx b/include/vcl/font/FeatureParser.hxx index 351caf19c7b7..3adc5fc0b0d0 100644 --- a/include/vcl/font/FeatureParser.hxx +++ b/include/vcl/font/FeatureParser.hxx @@ -44,7 +44,7 @@ public: return m_aFeatures; } - std::unordered_map<sal_uInt32, sal_uInt32> getFeaturesMap(); + std::unordered_map<sal_uInt32, sal_uInt32> getFeaturesMap() const; }; } // end font namespace |