summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-19 20:17:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-19 20:17:20 +0000
commit4d383c60d9423729b12bbdbc684b5df35c20c1f6 (patch)
tree9e2126b71830db8e7ada5001fda4e65ca34b9c81
parent163b25f287a9dabb4af39139108b16e0c5e495b2 (diff)
parentc8e0a59162609d377ad6ac9193b174a1afaee5b0 (diff)
downloadmako-4d383c60d9423729b12bbdbc684b5df35c20c1f6.tar.gz
Merge "Fix clang -Wc++11-narrowing warnings."
-rw-r--r--camera/QCameraHWI_Parm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/QCameraHWI_Parm.cpp b/camera/QCameraHWI_Parm.cpp
index 40e8907..72baa33 100644
--- a/camera/QCameraHWI_Parm.cpp
+++ b/camera/QCameraHWI_Parm.cpp
@@ -699,7 +699,7 @@ void QCameraHardwareInterface::loadTables()
rat_t getRational(int num, int denom)
{
- rat_t temp = {num, denom};
+ rat_t temp = {(uint32_t)num, (uint32_t)denom};
return temp;
}