Mercurial > octave
diff libinterp/corefcn/ft-text-renderer.cc @ 26858:0adb232f93b9
Implement axes and text "fontsmoothing" property (bug #55833).
* NEWS: Announce new property.
* base-text-renderer.h (base_text_renderer::set_anti_aliasing): New pure virtual
method
* ft-text-renderer.[h,cc] (text_renderer::m_antialias): New bool data member.
(ft_text_renderer::set_anti_aliasing): Implement
base_text_renderer::set_anti_aliasing.
(is_opaque): New function to determine if a pixel is opaque.
(ft_text_renderer::process_charater): Render glyph monochrome or antialiased
depending on m_antialias.
* text-renderer.[h,cc] (text_renderer::set_anti_aliasing): New method.
* graphics.in.h (axes::properties::fontsmoothing): Add "u" and corresponding
updater.
(text::properties::fontsmoothing,text::properties::update_fontsmoothing): New
property and corresponding updater.
* grpahics.cc (text::properties::update_font): Update the text_renderer
anti-aliasing.
* grpahics.cc (opengl_renderer::set_font): Update the text-renderer
anti-aliasing.
* genpropdoc: Document "fontsmoothnig" property.
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Tue, 05 Mar 2019 13:51:16 +0100 |
| parents | c9e5a09af7af |
| children | ab5bfee22d18 |
line wrap: on
line diff
--- a/libinterp/corefcn/ft-text-renderer.cc Wed Mar 06 09:51:21 2019 -0800 +++ b/libinterp/corefcn/ft-text-renderer.cc Tue Mar 05 13:51:16 2019 +0100 @@ -369,7 +369,7 @@ xoffset (0), line_yoffset (0), yoffset (0), mode (MODE_BBOX), color (dim_vector (1, 3), 0), m_do_strlist (false), m_strlist (), line_xoffset (0), m_ymin (0), m_ymax (0), m_deltax (0), - m_max_fontsize (0) + m_max_fontsize (0), m_antialias (true) { } // No copying! @@ -413,6 +413,8 @@ Matrix get_extent (const std::string& txt, double rotation, const caseless_str& interpreter); + void set_anti_aliasing (bool val) { m_antialias = val; }; + void set_font (const std::string& name, const std::string& weight, const std::string& angle, double size); @@ -537,6 +539,9 @@ // Used for computing the distance between lines. double m_max_fontsize; + + // Anti-aliasing. + bool m_antialias; }; @@ -703,7 +708,17 @@ break; } } - + bool is_opaque (const FT_GlyphSlot &glyph, const int x, const int y) + { + // Borrowed from https://stackoverflow.com/questions/14800827/ + // indexing-pixels-in-a-monochrome-freetype-glyph-buffer + int pitch = std::abs (glyph->bitmap.pitch); + unsigned char *row = &glyph->bitmap.buffer[pitch * y]; + char cvalue = row[x >> 3]; + + return ((cvalue & (128 >> (x & 7))) != 0); + } + FT_UInt ft_text_renderer::process_character (FT_ULong code, FT_UInt previous) { @@ -745,7 +760,9 @@ switch (mode) { case MODE_RENDER: - if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL)) + if (FT_Render_Glyph (face->glyph, (m_antialias + ? FT_RENDER_MODE_NORMAL + : FT_RENDER_MODE_MONO))) { glyph_index = 0; warn_glyph_render (code); @@ -777,7 +794,11 @@ for (int r = 0; static_cast<unsigned int> (r) < bitmap.rows; r++) for (int c = 0; static_cast<unsigned int> (c) < bitmap.width; c++) { - unsigned char pix = bitmap.buffer[r*bitmap.width+c]; + unsigned char pix + = (m_antialias + ? bitmap.buffer[r*bitmap.width+c] + : (is_opaque (face->glyph, c, r) ? 255 : 0)); + if (x0+c < 0 || x0+c >= pixels.dim2 () || y0-r < 0 || y0-r >= pixels.dim3 ()) {