Skip to content

Y
ygopro
Commit df229044 authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

fix CGUITTFont (#2983)

parent 1c9bf733
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
gframe/CGUITTFont.cpp
View file @ df229044
...@@ -322,7 +322,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia ...@@ -322,7 +322,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
tt_face = face->face; tt_face = face->face;
// Store font metrics. // Store font metrics.
FT_Set_Pixel_Sizes(tt_face, size, 0); FT_Set_Pixel_Sizes(tt_face, 0, size);
font_metrics = tt_face->size->metrics; font_metrics = tt_face->size->metrics;
// Allocate our glyphs. // Allocate our glyphs.
......
gframe/CGUITTFont.h
View file @ df229044
...@@ -351,7 +351,7 @@ private: ...@@ -351,7 +351,7 @@ private:
load_flags = FT_LOAD_DEFAULT | FT_LOAD_RENDER; load_flags = FT_LOAD_DEFAULT | FT_LOAD_RENDER;
if (!useHinting()) load_flags |= FT_LOAD_NO_HINTING; if (!useHinting()) load_flags |= FT_LOAD_NO_HINTING;
if (!useAutoHinting()) load_flags |= FT_LOAD_NO_AUTOHINT; if (!useAutoHinting()) load_flags |= FT_LOAD_NO_AUTOHINT;
if (useMonochrome()) load_flags |= FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO | FT_RENDER_MODE_MONO; if (useMonochrome()) load_flags |= FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO;
else load_flags |= FT_LOAD_TARGET_NORMAL; else load_flags |= FT_LOAD_TARGET_NORMAL;
} }
u32 getWidthFromCharacter(wchar_t c) const; u32 getWidthFromCharacter(wchar_t c) const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment