[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13083] branches/blender2.5/blender/intern : * silence more warnings

[Nathan Letwory]

Revision: 13083
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13083
Author:   jesterking
Date:     2008-01-01 12:14:25 +0100 (Tue, 01 Jan 2008)

Log Message:
-----------
* silence more warnings

Modified Paths:
--------------
    branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/blender2.5/blender/intern/string/STR_String.h

Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2008-01-01 10:45:48 UTC (rev 13082)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2008-01-01 11:14:25 UTC (rev 13083)
@@ -737,15 +737,15 @@
 						*/
 						
 						/* convert raw fixed point data to radians */
-						altRad = (fabs((float)ort.orAltitude)/(float)m_maxAltitude) * M_PI/2.0;
-						azmRad = ((float)ort.orAzimuth/(float)m_maxAzimuth) * M_PI*2.0;
+						altRad = (float)((fabs((float)ort.orAltitude)/(float)m_maxAltitude) * M_PI/2.0);
+						azmRad = (float)(((float)ort.orAzimuth/(float)m_maxAzimuth) * M_PI*2.0);
 
 						/* find length of the stylus' projected vector on the XY plane */
 						vecLen = cos(altRad);
 
 						/* from there calculate X and Y components based on azimuth */
 						m_tabletData->Xtilt = sin(azmRad) * vecLen;
-						m_tabletData->Ytilt = sin(M_PI/2.0 - azmRad) * vecLen;
+						m_tabletData->Ytilt = (float)(sin(M_PI/2.0 - azmRad) * vecLen);
 
 					} else {
 						m_tabletData->Xtilt = 0.0f;

Modified: branches/blender2.5/blender/intern/string/STR_String.h
===================================================================
--- branches/blender2.5/blender/intern/string/STR_String.h	2008-01-01 10:45:48 UTC (rev 13082)
+++ branches/blender2.5/blender/intern/string/STR_String.h	2008-01-01 11:14:25 UTC (rev 13083)
@@ -141,7 +141,7 @@
 	inline operator const char *() const								{ return pData; }
 	inline char *Ptr()													{ return pData; }
 	inline const char *ReadPtr() const									{ return pData; }
-	inline float	ToFloat() const										{ float x=atof(pData); return x; }
+	inline float	ToFloat() const										{ float x=(float)(atof(pData)); return x; }
 	inline int		ToInt() const										{ return atoi(pData); }
 
 	// Operators