Mercurial > octave
diff libinterp/corefcn/ft-text-renderer.cc @ 26617:98afb8bbd1f6 stable
maint: Strip trailing whitespace from source files.
* NEWS, GLCanvas.cc, dialog.cc, error.cc, ft-text-renderer.cc,
sysdep.cc, utils.cc, pt-jit.cc, oct-rl-hist.c, makeUniqueStrings.m,
randi.m, waitbar.m, clearvars.m, sqp.m, fplot.m, openfig.m,
__print_parse_opts__.m, octave-svgconvert.cc: Strip trailing whitespace.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 24 Jan 2019 19:18:51 +0000 |
| parents | ad70a85f702b |
| children | c9e5a09af7af 8a07083c8cfc |
line wrap: on
line diff
--- a/libinterp/corefcn/ft-text-renderer.cc Thu Jan 24 19:06:40 2019 +0000 +++ b/libinterp/corefcn/ft-text-renderer.cc Thu Jan 24 19:18:51 2019 +0000 @@ -536,7 +536,7 @@ // The X offset of the baseline for the current line. int line_xoffset; - + // Min and max y coordinates of all glyphs in a line. FT_Pos m_ymin; FT_Pos m_ymax; @@ -865,12 +865,12 @@ // First run text_to_pixels which will also build the string list m_strlist = std::list<text_renderer::string> (); - + octave::unwind_protect frame; frame.protect_var (m_do_strlist); frame.protect_var (m_strlist); m_do_strlist = true; - + text_to_pixels (txt, pxls, box, ha, va, rot, interp, false); lst = m_strlist; @@ -887,7 +887,7 @@ std::string str = e.string_value (); const uint8_t *c = reinterpret_cast<const uint8_t *> (str.c_str ()); uint32_t u32_c; - + size_t n = str.size (); size_t icurr = 0; size_t ibegin = 0; @@ -912,7 +912,7 @@ // the newline character fs.set_y (line_yoffset + yoffset); fs.set_color (color); - + std::string s = str.substr (ibegin, icurr - ibegin); if (! s.empty ()) { @@ -932,7 +932,7 @@ if (u32_c == 10) { previous = 0; - + if (m_do_strlist && mode == MODE_RENDER) { // Start a new string in m_strlist