aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK/src/FDK_tools_rom.cpp
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2016-10-18 03:12:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-18 03:12:10 +0000
commit515fb25ef76da9b8a1ad842aaccd3ebb6790c5dc (patch)
tree0a1be934e56560c4585d2606ec53336a6a3793f4 /libFDK/src/FDK_tools_rom.cpp
parentca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef (diff)
parent4556cb9cb8b12574c41b749b20c1c149fed54a37 (diff)
downloadfdk-aac-515fb25ef76da9b8a1ad842aaccd3ebb6790c5dc.tar.gz
fdk-aac-515fb25ef76da9b8a1ad842aaccd3ebb6790c5dc.tar.bz2
fdk-aac-515fb25ef76da9b8a1ad842aaccd3ebb6790c5dc.zip
Merge "Add casts to avoid errors due to narrowing"
am: 4556cb9cb8 Change-Id: I4cb4a7dace03c7c09403588da05ea8df0f35077e
Diffstat (limited to 'libFDK/src/FDK_tools_rom.cpp')
-rw-r--r--libFDK/src/FDK_tools_rom.cpp4
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