diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 23:21:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 23:21:47 +0400 |
| commit | 61596d5bb365a96b4b19adf0ef72ec1ea47212aa (patch) | |
| tree | 062ea3ff60bd643e88abef0d544e413f3dcfd8d5 /intern/audaspace | |
| parent | 2b7ca2304a9b17568fac57a0bceba72b9c9ab580 (diff) | |
patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes
made some small edits
- removed changes to AVI reading since the data types are apart of the format spec.
- absf -> abs for a double value in render code.
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/intern/AUD_ConverterFunctions.cpp | 8 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_JOSResampleReader.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/audaspace/intern/AUD_ConverterFunctions.cpp b/intern/audaspace/intern/AUD_ConverterFunctions.cpp index 53a644e3b90..c20f19a7e67 100644 --- a/intern/audaspace/intern/AUD_ConverterFunctions.cpp +++ b/intern/audaspace/intern/AUD_ConverterFunctions.cpp @@ -31,11 +31,11 @@ #include "AUD_Buffer.h" #define AUD_U8_0 0x80 -#define AUD_S16_MAX 0x7FFF -#define AUD_S16_MIN 0x8000 +#define AUD_S16_MAX ((int16_t)0x7FFF) +#define AUD_S16_MIN ((int16_t)0x8000) #define AUD_S16_FLT 32767.0f -#define AUD_S32_MAX 0x7FFFFFFF -#define AUD_S32_MIN 0x80000000 +#define AUD_S32_MAX ((int32_t)0x7FFFFFFF) +#define AUD_S32_MIN ((int32_t)0x80000000) #define AUD_S32_FLT 2147483647.0f #define AUD_FLT_MAX 1.0f #define AUD_FLT_MIN -1.0f diff --git a/intern/audaspace/intern/AUD_JOSResampleReader.cpp b/intern/audaspace/intern/AUD_JOSResampleReader.cpp index 2fb8b86ce49..0f7a038c88e 100644 --- a/intern/audaspace/intern/AUD_JOSResampleReader.cpp +++ b/intern/audaspace/intern/AUD_JOSResampleReader.cpp @@ -200,7 +200,7 @@ void AUD_JOSResampleReader::updateBuffer(int size, double factor, int samplesize left\ }\ \ - P = -P;\ + P = 0 - P;\ \ end = (int_to_fp(m_len) - P) / P_increment - 1;\ if(m_cache_valid - m_n - 2 < end)\ |