diff options
Diffstat (limited to 'libSBRdec')
| -rw-r--r-- | libSBRdec/src/env_calc.cpp | 2 | ||||
| -rw-r--r-- | libSBRdec/src/env_extr.cpp | 3 | ||||
| -rw-r--r-- | libSBRdec/src/sbr_rom.cpp | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libSBRdec/src/env_calc.cpp b/libSBRdec/src/env_calc.cpp index fa5330a..73bd7ba 100644 --- a/libSBRdec/src/env_calc.cpp +++ b/libSBRdec/src/env_calc.cpp @@ -2031,7 +2031,7 @@ static void adjustTimeSlotHQ( FIXP_SGL direct_ratio = /*FL2FXCONST_SGL(1.0f) */ (FIXP_SGL)MAXVAL_SGL - smooth_ratio; int index = *ptrPhaseIndex; UCHAR harmIndex = *ptrHarmIndex; - register int freqInvFlag = (lowSubband & 1); + int freqInvFlag = (lowSubband & 1); FIXP_DBL sineLevel; int shift; diff --git a/libSBRdec/src/env_extr.cpp b/libSBRdec/src/env_extr.cpp index dacd951..4d53a13 100644 --- a/libSBRdec/src/env_extr.cpp +++ b/libSBRdec/src/env_extr.cpp @@ -904,6 +904,9 @@ static const FRAME_INFO v_frame_info4_8 = { 0, 4, {0, 2, 4, 6, 8}, {1, 1, 1, 1}, break; default: FDK_ASSERT(0); + /* in case assertion checks are disabled, force a definite memory fault at first access */ + pTable = NULL; + break; } /* look number of envelopes in table */ diff --git a/libSBRdec/src/sbr_rom.cpp b/libSBRdec/src/sbr_rom.cpp index c48ce35..4f2cc48 100644 --- a/libSBRdec/src/sbr_rom.cpp +++ b/libSBRdec/src/sbr_rom.cpp @@ -1185,7 +1185,7 @@ const FIXP_DBL Alphas[NO_ICC_LEVELS] = { #define FL2FXCONST_PS FL2FXCONST_SGL #else #define FIXP_PS FIXP_DBL -#define FXP_CAST +#define FXP_CAST(x) ((FIXP_DBL)(x)) #define FL2FXCONST_PS FL2FXCONST_DBL #endif |