Release of synfigstudio 0.61.09 version. *****

[synfig.git] / ETL / tags / stable / ETL / _misc.h

diff --git a/ETL/tags/stable/ETL/_misc.h b/ETL/tags/stable/ETL/_misc.h
index 502179b..6c84265 100644 (file)
--- a/ETL/tags/stable/ETL/_misc.h
+++ b/ETL/tags/stable/ETL/_misc.h
@@ -4,6 +4,7 @@
 ** $Id$
 **
 ** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2007 Chris Moore
 **
 ** This package is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public License as
@@ -72,12 +73,20 @@ binary_find(I begin, I end, const T& value)
 }
 
 inline int round_to_int(const float x) {
-       /*!     \fixme Isn't there some x86 FPU instruction for quickly
+       /*!     \todo 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<int>(x+0.5f);
+       // return static_cast<int>(x+0.5f);                     // <-- (a) fast, but rounds -1.333 to 0!
+       // return static_cast<int>(rintf(x));           // <-- (b) slow, but correct
+    if (x>=0) return static_cast<int>(x + 0.5);        // <-- slower than (a), but correct, and faster than (b)
+    else      return static_cast<int>(x - 0.5);
+}
+inline int round_to_int(const double x) {
+       // return static_cast<int>(x+0.5);
+       // return static_cast<int>(rint(x));
+       if (x>=0) return static_cast<int>(x + 0.5);
+    else      return static_cast<int>(x - 0.5);
 }
-inline int round_to_int(const double x) { return static_cast<int>(x+0.5); }
 
 inline int ceil_to_int(const float x) { return static_cast<int>(ceil(x)); }
 inline int ceil_to_int(const double x) { return static_cast<int>(ceil(x)); }