diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-09-11 18:56:47 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-09-11 18:56:47 +0400 |
| commit | 5b7e70c988a3698b8adc5b638bf962ad2cc205d3 (patch) | |
| tree | 26a9fad43dc4f466d1615d062f159b7d2ce179d7 /src/thirdparty/ZenLib | |
| parent | 5b60ec55cb9482ec3fed34289dc8cdbc498dac0b (diff) | |
-Updated MediaInfoLib to the latest svn
-disabled a few MediaInfo warnings
-WebServer is using the default mpc-hc logo
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2530 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/thirdparty/ZenLib')
| -rw-r--r-- | src/thirdparty/ZenLib/Utils.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/thirdparty/ZenLib/Utils.h b/src/thirdparty/ZenLib/Utils.h index 2abcef139..5eebce2b4 100644 --- a/src/thirdparty/ZenLib/Utils.h +++ b/src/thirdparty/ZenLib/Utils.h @@ -254,14 +254,8 @@ int64s float64_int64s (float64 F, bool Rounded=true); inline float32 int64u_float32 (int64u v) {return static_cast<float32>(static_cast<int64s>(v>>1))*2.0f + static_cast<float32>(static_cast<int64s>(v & 1));}
inline float64 int64u_float64 (int64u v) {return static_cast<float64>(static_cast<int64s>(v>>1))*2.0f + static_cast<float32>(static_cast<int64s>(v & 1));}
#else
- #if defined(_MSC_VER)
- #pragma warning( disable : 4244 )
- #endif
- inline float32 int64u_float32 (int64u v) {return v;}
- inline float64 int64u_float64 (int64u v) {return v;}
- #if defined(_MSC_VER)
- #pragma warning( default : 4244 )
- #endif
+ inline float32 int64u_float32 (int64u v) {return (float32)v;}
+ inline float64 int64u_float64 (int64u v) {return (float64)v;}
#endif // defined(_MSC_VER) && _MSC_VER<=1200
//---------------------------------------------------------------------------
|