X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_misc.h;h=1fdcef90e55e1b391161d5b047928db233390a6e;hb=ac681f880251765bcd7ac3b244863895b3b8eef3;hp=502179b99c6e1bcc2c58a4486c2e4b6859672b6b;hpb=1e936bd2a125b85f46566726ecaeb7b82d30c50c;p=synfig.git diff --git a/ETL/trunk/ETL/_misc.h b/ETL/trunk/ETL/_misc.h index 502179b..1fdcef9 100644 --- a/ETL/trunk/ETL/_misc.h +++ b/ETL/trunk/ETL/_misc.h @@ -75,9 +75,17 @@ 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); + // 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); +} +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); } -inline int round_to_int(const double x) { return static_cast(x+0.5); } inline int ceil_to_int(const float x) { return static_cast(ceil(x)); } inline int ceil_to_int(const double x) { return static_cast(ceil(x)); }