X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_misc.h;h=6c842653a53380aecdaad852fa53b18da868a202;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=20905839e8be99288a6f59ece8f498fd38ca998c;hpb=b3016b249333ac0ab0008d8c6c4d9029b2ff30c9;p=synfig.git

diff --git a/ETL/trunk/ETL/_misc.h b/ETL/trunk/ETL/_misc.h
index 2090583..6c84265 100644
--- a/ETL/trunk/ETL/_misc.h
+++ b/ETL/trunk/ETL/_misc.h
@@ -1,9 +1,10 @@
 /*! ========================================================================
 ** 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.
+** 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
@@ -42,28 +43,28 @@ binary_find(I begin, I end, const T& value)
 {
 #if 1
 	I iter(begin+(end-begin)/2);
-	
+
 	while(end-begin>1 && !(*iter==value))
 	{
 		((*iter<value)?begin:end) = iter;
-		
+
 		iter = begin+(end-begin)/2;
 	}
 	return iter;
 #else
 	size_t len_(end-begin);
 	size_t half_(len_/2);
-	
+
 	I iter(begin);
 	iter+=half_;
-	
+
 	while(len_>1 && !(*iter==value))
 	{
 		((*iter<value)?begin:end) = iter;
-		
+
 		len_=half_;
 		half_/=2;
-		
+
 		iter=begin;
 		iter+=half_;
 	}
@@ -71,17 +72,27 @@ 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) {
+	/*!	\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);			// <-- (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 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)); }
 
-inline int floor_to_int(const float x) { return static_cast<int>(floor(x)); }
-inline int floor_to_int(const double x) { return static_cast<int>(floor(x)); }
+inline int floor_to_int(const float x) { return static_cast<int>(x); }
+inline int floor_to_int(const double x) { return static_cast<int>(x); }
 
 _ETL_END_NAMESPACE