
Originally Posted by
rombust
Font/FontEngine/font_engine_freetype.cpp:150
Change "get_font_glyph_standard" to "return get_font_glyph_standard"
For Font/FontEngine/font_engine_freetype.cpp:583
Pass "description"into calculate_font_metrics(); at Font/FontEngine/font_engine_freetype.cpp:126
Line 261 ... void FontEngine_Freetype::calculate_font_metrics(const FontDescription &desc)
Remember to also change the definition in font_engine_freetype.h
(By inspection, not tested)
Please test it
for me it does not work
it gives more errors:
Code:
X11/font_config.cpp: In member function 'std::string clan::FontConfig::match_font(const clan::FontDescription&) const':
X11/font_config.cpp:77:32: error: cannot convert 'clan::FontWeight' to 'int' in initialization
int weight = desc.get_weight();
^
X11/font_config.cpp:82:67: error: call of overloaded 'abs(float)' is ambiguous
FC_PIXEL_SIZE, FcTypeDouble, (double) std::abs(desc.get_height()),
^
X11/font_config.cpp:82:67: note: candidates are:
In file included from /usr/include/c++/4.9/cstdlib:72:0,
from /usr/include/c++/4.9/ext/string_conversions.h:41,
from /usr/include/c++/4.9/bits/basic_string.h:2850,
from /usr/include/c++/4.9/string:52,
from /usr/include/c++/4.9/stdexcept:39,
from ../../Sources/API/Core/System/exception.h:33,
from ../../Sources/Display/precomp.h:40,
from X11/font_config.cpp:29:
/usr/include/stdlib.h:775:12: note: int abs(int)
extern int abs (int __x) __THROW __attribute__ ((__const__)) __wur;
^
In file included from /usr/include/c++/4.9/ext/string_conversions.h:41:0,
from /usr/include/c++/4.9/bits/basic_string.h:2850,
from /usr/include/c++/4.9/string:52,
from /usr/include/c++/4.9/stdexcept:39,
from ../../Sources/API/Core/System/exception.h:33,
from ../../Sources/Display/precomp.h:40,
from X11/font_config.cpp:29:
/usr/include/c++/4.9/cstdlib:166:3: note: long int std::abs(long int)
abs(long __i) { return __builtin_labs(__i); }
^
/usr/include/c++/4.9/cstdlib:174:3: note: long long int std::abs(long long int)
abs(long long __x) { return __builtin_llabs (__x); }
^
X11/font_config.cpp:84:33: error: 'const class clan::FontDescription' has no member named 'get_italic'
FC_SLANT, FcTypeInteger, desc.get_italic() ? FC_SLANT_ITALIC : FC_SLANT_ROMAN,
^
X11/font_config.cpp:85:35: error: 'const class clan::FontDescription' has no member named 'get_fixed_pitch'
FC_SPACING, FcTypeInteger, desc.get_fixed_pitch() ? FC_MONO : FC_PROPORTIONAL,
^
Why do you submitted your changes not just in the repo ?
Bookmarks