sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make hb_feature_t EqualityComparable and fix font_feature_settings operator==

Browse source
This commit is contained in:
artemp 2014-10-13 11:22:28 +01:00
parent 5a91c68399
commit 4fe0c249a6
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mapnik/text/font_feature_settings.hpp
View file

@ -35,6 +35,15 @@
// harfbuzz
#include <harfbuzz/hb.h>
// EqualityComparable
inline bool operator==(hb_feature_t const& lhs, hb_feature_t const& rhs)
{
return (lhs.tag == rhs.tag
&& lhs.value == rhs.value
&& lhs.start == rhs.start
&& lhs.end == rhs.end);
}
namespace mapnik
{
@ -72,12 +81,9 @@ operator << ( std::basic_ostream<charT, traits> & s, mapnik::font_feature_settin
inline bool operator==(font_feature_settings const& lhs, font_feature_settings const& rhs)
{
// FIXME not working
//(lhs.features() == rhs.features());
return true;
return (lhs.features() == rhs.features());
}
constexpr unsigned int font_feature_range_global_start = 0u;
static const unsigned int font_feature_range_global_end = std::numeric_limits<unsigned int>::max();