X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_misc.h;h=1fdcef90e55e1b391161d5b047928db233390a6e;hb=ac681f880251765bcd7ac3b244863895b3b8eef3;hp=33d02b3fa206a177eda292a1e7fe258b39efa19d;hpb=cee5940bae97612105db8b7e1ffcf513f9d9150c;p=synfig.git

diff --git a/ETL/trunk/ETL/_misc.h b/ETL/trunk/ETL/_misc.h
index 33d02b3..1fdcef9 100644
--- a/ETL/trunk/ETL/_misc.h
+++ b/ETL/trunk/ETL/_misc.h
@@ -1,7 +1,7 @@
 /*! ========================================================================
 ** Extended Template and Library
 ** Misc
-** $Id: _misc.h,v 1.1.1.1 2005/01/04 01:31:47 darco Exp $
+** $Id$
 **
 ** Copyright (c) 2002 Robert B. Quattlebaum Jr.
 **
@@ -71,11 +71,21 @@ binary_find(I begin, I end, const T& value)
 #endif
 }
 
-/*!	\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... */
-inline int round_to_int(const float x) { return static_cast<int>(x+0.5f); }
-inline int round_to_int(const double x) { return static_cast<int>(x+0.5); }
+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<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 (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<int>(x+0.5);
+	// return static_cast<int>(rint(x));
+	if (x>=0) return (int) (x + 0.5);
+    else      return (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)); }