diff options
| author | Martin Storsjo <martin@martin.st> | 2016-10-18 03:25:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 03:25:40 +0000 |
| commit | 6085e575cac53918238e026aa18fb0268da6a60e (patch) | |
| tree | 4c13bc73d974452bb67327ee90f8cf2f60151b19 /libFDK/src/FDK_tools_rom.cpp | |
| parent | 43585d3f18fa88b5ff8f8a33cdacad4db4da92b2 (diff) | |
| parent | 8124c22bb7be48fdc496b2148c1315b911f309e8 (diff) | |
| download | fdk-aac-6085e575cac53918238e026aa18fb0268da6a60e.tar.gz fdk-aac-6085e575cac53918238e026aa18fb0268da6a60e.tar.bz2 fdk-aac-6085e575cac53918238e026aa18fb0268da6a60e.zip | |
Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8 am: 515fb25ef7
am: 8124c22bb7
Change-Id: I49295c5d3cba3a7f97c9d9494df59f460c2c195a
Diffstat (limited to 'libFDK/src/FDK_tools_rom.cpp')
| -rw-r--r-- | libFDK/src/FDK_tools_rom.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libFDK/src/FDK_tools_rom.cpp b/libFDK/src/FDK_tools_rom.cpp index 29e37f2..f9121d1 100644 --- a/libFDK/src/FDK_tools_rom.cpp +++ b/libFDK/src/FDK_tools_rom.cpp @@ -1260,9 +1260,9 @@ const FIXP_WTP * FDKgetWindowSlope(int length, int shape) #define QTCFL(x) FL2FXCONST_SGL(x) #define QTC(x) FX_DBL2FXCONST_SGL(x) #else -#define QFC(x) (x) +#define QFC(x) ((FIXP_DBL)(x)) #define QTCFL(x) FL2FXCONST_DBL(x) -#define QTC(x) (x) +#define QTC(x) ((FIXP_DBL)(x)) #endif /* ARCH_PREFER_MULT_32x16 */ #ifndef LOW_POWER_SBR_ONLY |