am 9e7e1243: am 17795736: am 4cc3c4d3: Merge "cpu_ref: fix c++11 narrowing violations"
* commit '9e7e124326cf4c0a20709f313d290fcfecc4f3de':
cpu_ref: fix c++11 narrowing violations
diff --git a/cpu_ref/rsCpuIntrinsic3DLUT.cpp b/cpu_ref/rsCpuIntrinsic3DLUT.cpp
index 4362973..bfa3f73 100644
--- a/cpu_ref/rsCpuIntrinsic3DLUT.cpp
+++ b/cpu_ref/rsCpuIntrinsic3DLUT.cpp
@@ -70,9 +70,9 @@
const uchar *bp = (const uchar *)cp->mLUT->mHal.drvState.lod[0].mallocPtr;
int4 dims = {
- cp->mLUT->mHal.drvState.lod[0].dimX - 1,
- cp->mLUT->mHal.drvState.lod[0].dimY - 1,
- cp->mLUT->mHal.drvState.lod[0].dimZ - 1,
+ static_cast<int>(cp->mLUT->mHal.drvState.lod[0].dimX - 1),
+ static_cast<int>(cp->mLUT->mHal.drvState.lod[0].dimY - 1),
+ static_cast<int>(cp->mLUT->mHal.drvState.lod[0].dimZ - 1),
-1
};
const float4 m = (float4)(1.f / 255.f) * convert_float4(dims);
@@ -88,8 +88,8 @@
int32_t len = (x2 - x1 - 1) >> 1;
if(len > 0) {
const short neon_constants[] = {
- coordMul.x, coordMul.y, coordMul.z, 0,
- 0, 0, 0, 0xffff,
+ static_cast<short>(coordMul.x), static_cast<short>(coordMul.y),
+ static_cast<short>(coordMul.z), 0, 0, 0, 0, static_cast<short>(0xffff),
};
diff --git a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
index 4e38459..22f0962 100644
--- a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
+++ b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
@@ -92,7 +92,8 @@
p.z = 255;
}
- return (uchar4){p.x, p.y, p.z, p.w};
+ return (uchar4){static_cast<uchar>(p.x), static_cast<uchar>(p.y),
+ static_cast<uchar>(p.z), static_cast<uchar>(p.w)};
}