From 267dc7534fced890ba9a6cc71aa2823f01d59cb4 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 11 Jun 2013 01:23:04 +0000
Subject: [PATCH] bugfix for float rounding segfault

---
 .../shared_lib/include/graphics/math_util.h   | 90 ++++++++++++-------
 .../shared_lib/graphics/math_util_test.cpp    | 14 +--
 2 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h
index bcce54fc3..a3bcb6119 100644
--- a/source/shared_lib/include/graphics/math_util.h
+++ b/source/shared_lib/include/graphics/math_util.h
@@ -283,36 +283,34 @@ inline T radToDeg(T rad){
 //  Inline implementation
 // ====================================================================================================================
 // ====================================================================================================================
-#if _xs_BigEndian_
-	#define _xs_iexp_				0
-	#define _xs_iman_				1
-#else
-	#define _xs_iexp_				1       //intel is little endian
-	#define _xs_iman_				0
-#endif //BigEndian_
-
-//#define finline                     __forceinline
-#define finline                     inline
-
-#ifndef _xs_DEFAULT_CONVERSION
-#define _xs_DEFAULT_CONVERSION      0
-#endif
-
-//typedef long                    int32;
-typedef double                  real64;
-const real64 _xs_doublemagic			= real64 (6755399441055744.0); 	    //2^52 * 1.5,  uses limited precisicion to floor
-
-finline int32 xs_CRoundToInt(real64 val, real64 dmr = _xs_doublemagic) {
-#if _xs_DEFAULT_CONVERSION==0
-    val		= val + dmr;
-	return ((int32*)&val)[_xs_iman_];
-    //return 0;
-#else
-    return int32(floor(val+.5));
-#endif
-}
-
-
+//#if _xs_BigEndian_
+//	#define _xs_iexp_				0
+//	#define _xs_iman_				1
+//#else
+//	#define _xs_iexp_				1       //intel is little endian
+//	#define _xs_iman_				0
+//#endif //BigEndian_
+//
+////#define finline                     __forceinline
+//#define finline                     inline
+//
+//#ifndef _xs_DEFAULT_CONVERSION
+//#define _xs_DEFAULT_CONVERSION      0
+//#endif
+//
+////typedef long                    int32;
+//typedef double                  real64;
+//const real64 _xs_doublemagic			= real64 (6755399441055744.0); 	    //2^52 * 1.5,  uses limited precisicion to floor
+//
+//finline int32 xs_CRoundToInt(real64 val, real64 dmr = _xs_doublemagic) {
+//#if _xs_DEFAULT_CONVERSION==0
+//    val		= val + dmr;
+//	return ((int32*)&val)[_xs_iman_];
+//    //return 0;
+//#else
+//    return int32(floor(val+.5));
+//#endif
+//}
 
 template<typename T>
 inline T truncateDecimal(const T &value, int precision=6) {
@@ -330,9 +328,35 @@ inline T truncateDecimal(const T &value, int precision=6) {
 	return result;
 */
 
-	T precNum = std::pow((T)10, (T)precision);
-	T result = xs_CRoundToInt(value * precNum);
-	result /= precNum;
+	T precNum = 0;
+	if(precision == 0) {
+		precNum = 1;
+	}
+	else if(precision == 1) {
+		precNum = 10;
+	}
+	else if(precision == 2) {
+		precNum = 100;
+	}
+	else if(precision == 3) {
+		precNum = 1000;
+	}
+	else if(precision == 4) {
+		precNum = 10000;
+	}
+	else if(precision == 5) {
+		precNum = 100000;
+	}
+	else if(precision == 6) {
+		precNum = 1000000;
+	}
+	else  {
+		precNum = std::pow((T)10,(T)precision);
+	}
+
+	int64 resultInt = (T)value * (T)precNum;
+
+	T result = (long double)resultInt / precNum;
 	return result;
 }
 
diff --git a/source/tests/shared_lib/graphics/math_util_test.cpp b/source/tests/shared_lib/graphics/math_util_test.cpp
index f22dd6eeb..12b905cb5 100644
--- a/source/tests/shared_lib/graphics/math_util_test.cpp
+++ b/source/tests/shared_lib/graphics/math_util_test.cpp
@@ -40,10 +40,10 @@ public:
 		CPPUNIT_ASSERT_EQUAL( 1.123456f, value1 );
 
 		value1 = truncateDecimal<float>(1.123456f, 5);
-		CPPUNIT_ASSERT_EQUAL( 1.12346f, value1 );
+		CPPUNIT_ASSERT_EQUAL( 1.12345f, value1 );
 
 		value1 = truncateDecimal<float>(1.123456f, 4);
-		CPPUNIT_ASSERT_EQUAL( 1.1235f, value1 );
+		CPPUNIT_ASSERT_EQUAL( 1.1234f, value1 );
 
 		value1 = truncateDecimal<float>(1.123456f, 3);
 		CPPUNIT_ASSERT_EQUAL( 1.123f, value1 );
@@ -54,11 +54,11 @@ public:
 		value1 = truncateDecimal<float>(1.123456f, 1);
 		CPPUNIT_ASSERT_EQUAL( 1.1f, value1 );
 
-		int32 value2 = xs_CRoundToInt(1.123456f);
-		CPPUNIT_ASSERT_EQUAL( (int32)1, value2 );
-
-		value2 = xs_CRoundToInt(1.523456f);
-		CPPUNIT_ASSERT_EQUAL( (int32)2, value2 );
+//		int32 value2 = xs_CRoundToInt(1.123456f);
+//		CPPUNIT_ASSERT_EQUAL( (int32)1, value2 );
+//
+//		value2 = xs_CRoundToInt(1.523456f);
+//		CPPUNIT_ASSERT_EQUAL( (int32)2, value2 );
 	}
 };