From: dooglus Date: Thu, 11 Oct 2007 01:52:48 +0000 (+0000) Subject: Use static_cast rather than the old C style cast. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d04d23af11d3781a9a7d9632ed11e3c4790b692f;p=synfig.git Use static_cast rather than the old C style cast. git-svn-id: http://svn.voria.com/code@900 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/ETL/trunk/ETL/_misc.h b/ETL/trunk/ETL/_misc.h index 1fdcef9..08cc858 100644 --- a/ETL/trunk/ETL/_misc.h +++ b/ETL/trunk/ETL/_misc.h @@ -75,16 +75,16 @@ inline int round_to_int(const float x) { /*! \fixme Isn't there some x86 FPU instruction for quickly ** converting a float to a rounded integer? It's worth ** looking into at some point... */ - // return static_cast(x+0.5f); // <-- (a) fast, but rounds -1.333 to 0! - // return static_cast(rintf(x)); // <-- (b) slow, but correct - if (x>=0) return (int) (x + 0.5); // <-- slower than (a), but correct, and faster than (b) - else return (int) (x - 0.5); + // return static_cast(x+0.5f); // <-- (a) fast, but rounds -1.333 to 0! + // return static_cast(rintf(x)); // <-- (b) slow, but correct + if (x>=0) return static_cast(x + 0.5); // <-- slower than (a), but correct, and faster than (b) + else return static_cast(x - 0.5); } inline int round_to_int(const double x) { // return static_cast(x+0.5); // return static_cast(rint(x)); - if (x>=0) return (int) (x + 0.5); - else return (int) (x - 0.5); + if (x>=0) return static_cast(x + 0.5); + else return static_cast(x - 0.5); } inline int ceil_to_int(const float x) { return static_cast(ceil(x)); }