Mercurial > octave
diff libinterp/corefcn/ft-text-renderer.cc @ 23696:08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
* octave-gui.cc, dynamic-ld.h, ft-text-renderer.cc, gl-render.cc,
gl-render.h, gl2ps-print.cc, input.cc, input.h, interpreter.cc,
load-path.cc, load-path.h, oct-stream.cc, sighandlers.cc, symtab.cc,
symtab.h, __ode15__.cc, gzip.cc, octave.cc, lex.ll, oct-parse.in.yy,
parse.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.h,
pt-classdef.h, pt-decl.h, pt-eval.cc, pt-eval.h, pt-exp.h,
pt-fcn-handle.cc, pt-idx.cc, pt-misc.h, pt-select.h, pt-stmt.h,
pt-tm-const.cc, pt-tm-const.h, pt.cc, aepbalance.cc, chol.cc,
gepbalance.cc, gsvd.cc, hess.cc, lo-mappers.h, lo-specfun.cc, lu.cc,
qr.cc, qrp.cc, schur.cc, sparse-chol.cc, sparse-lu.cc, sparse-qr.cc,
svd.cc, child-list.cc, dir-ops.cc, file-ops.cc, file-stat.cc,
file-stat.h, lo-sysdep.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc,
cmd-hist.cc, oct-glob.cc, oct-locbuf.cc, oct-mutex.cc, oct-mutex.h,
oct-shlib.cc, oct-shlib.h, pathsearch.cc, url-transfer.cc,
url-transfer.h: Remove octave:: namespace tag from symbols used
inside octave namespace.
* oct-conf-post.in.h (OCTAVE_USE_DEPRECATED_FUNCTIONS): Don't define.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 26 Jun 2017 09:05:37 -0400 |
parents | 80c42f4cca13 |
children | 980f39c3ab90 |
line wrap: on
line diff
--- a/libinterp/corefcn/ft-text-renderer.cc Mon Jun 26 09:02:21 2017 -0400 +++ b/libinterp/corefcn/ft-text-renderer.cc Mon Jun 26 09:05:37 2017 -0400 @@ -615,7 +615,7 @@ { bbox(1) -= lbox(3); bbox(3) += lbox(3); - bbox(2) = octave::math::max (bbox(2), lbox(2)); + bbox(2) = math::max (bbox(2), lbox(2)); } } break; @@ -817,7 +817,7 @@ // glyph. Then extend the line bounding box if necessary. xoffset += (face->glyph->advance.x >> 6); - bb(2) = octave::math::max (bb(2), xoffset); + bb(2) = math::max (bb(2), xoffset); } break; } @@ -1084,7 +1084,7 @@ { xoffset = saved_xoffset; txt_elt->accept (*this); - max_xoffset = octave::math::max (xoffset, max_xoffset); + max_xoffset = math::max (xoffset, max_xoffset); } xoffset = max_xoffset;