Mercurial > octave
diff libinterp/corefcn/ft-text-renderer.cc @ 28857:43ad651cf5a0
eliminate unnecessary uses of octave:: namespace qualifier
Affected files: graphics-init.cc, octave-qscintilla.cc,
octave-qobject.h, qt-application.h, workspace-view.cc, call-stack.cc,
dynamic-ld.cc, error.cc, error.h, event-manager.h, fcn-info.cc,
ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc,
graphics-toolkit.cc, input.cc, load-path.cc, oct-hist.cc,
oct-stream.cc, pager.cc, stack-frame.cc, symscope.cc, sysdep.cc,
__ode15__.cc, cdef-class.cc, ov-fcn-handle.cc, ov.cc, ov.h,
oct-parse.yy, pt-classdef.h, pt-eval.cc, Range.cc, Range.h, dir-ops.h,
file-stat.cc, lo-sysdep.cc, lo-utils.cc, oct-glob.cc, and
url-transfer.cc.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 05 Oct 2020 15:19:15 -0400 |
parents | 26cfccfee9a0 |
children | 7854d5752dd2 |
line wrap: on
line diff
--- a/libinterp/corefcn/ft-text-renderer.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/ft-text-renderer.cc Mon Oct 05 15:19:15 2020 -0400 @@ -980,9 +980,10 @@ m_strlist = std::list<text_renderer::string> (); - octave::unwind_protect_var<bool> restore_var1 (m_do_strlist); - octave::unwind_protect_var<std::list<text_renderer::string>> + unwind_protect_var<bool> restore_var1 (m_do_strlist); + unwind_protect_var<std::list<text_renderer::string>> restore_var2 (m_strlist); + m_do_strlist = true; text_to_pixels (txt, pxls, box, ha, va, rot, interp, false);