Mercurial > octave

comparison libinterp/corefcn/ft-text-renderer.cc @ 21782:2aef506f3fec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use namespace for lo-mappers.h functions * lo-mappers.h, lo-mappers.cc (acos, arg, asin, atan, ceil, conj, copysign, exp2, finite, fix, floor, imag, is_NA, is_NaN_or_NA, isinf, isinteger, isnan, log2, max, min, mod, negative_sign, nint, nint_big, positive_sign, rc_acos, rc_acosh, rc_asin, rc_atanh, rc_log, rc_log10, rc_log2, rc_sqrt, real, rem, round, roundb, signbit, signum, trunc, x_nint): Define in octave::math namespace. Deprecate old names. Change all uses. * oct-inttypes.h: Put round and isnan functions in octave::math namespace and rename from xround and xisnan. Change all uses.
author John W. Eaton <jwe@octave.org>
date Wed, 25 May 2016 16:51:16 -0400
parents b571fc85953f
children aab79a1885cc
comparison
equal deleted inserted replaced
21781:da4554d2342d 21782:2aef506f3fec
603 bbox = it->extract (0, 0, 0, 3); 603 bbox = it->extract (0, 0, 0, 3);
604 else 604 else
605 { 605 {
606 bbox(1) -= (*it)(3); 606 bbox(1) -= (*it)(3);
607 bbox(3) += (*it)(3); 607 bbox(3) += (*it)(3);
608 bbox(2) = xmax (bbox(2), (*it)(2)); 608 bbox(2) = octave::math::max (bbox(2), (*it)(2));
609 } 609 }
610 } 610 }
611 break; 611 break;
612 } 612 }
613 } 613 }
804 804
805 // Extend current X offset box by the width of the current 805 // Extend current X offset box by the width of the current
806 // glyph. Then extend the line bounding box if necessary. 806 // glyph. Then extend the line bounding box if necessary.
807 807
808 xoffset += (face->glyph->advance.x >> 6); 808 xoffset += (face->glyph->advance.x >> 6);
809 bb(2) = xmax (bb(2), xoffset); 809 bb(2) = octave::math::max (bb(2), xoffset);
810 } 810 }
811 break; 811 break;
812 } 812 }
813 } 813 }
814 } 814 }
1071 1071
1072 for (text_element_combined::iterator it = e.begin (); it != e.end (); ++it) 1072 for (text_element_combined::iterator it = e.begin (); it != e.end (); ++it)
1073 { 1073 {
1074 xoffset = saved_xoffset; 1074 xoffset = saved_xoffset;
1075 (*it)->accept (*this); 1075 (*it)->accept (*this);
1076 max_xoffset = xmax (xoffset, max_xoffset); 1076 max_xoffset = octave::math::max (xoffset, max_xoffset);
1077 } 1077 }
1078 1078
1079 xoffset = max_xoffset; 1079 xoffset = max_xoffset;
1080 } 1080 }
1081 1081