commit c9a8d136e5c20c2f8965b8f012bc1030c6f09665
author Chih-Hung Hsieh <chh@google.com> Fri Aug 17 13:37:59 2018 -0700
committer Chih-Hung Hsieh <chh@google.com> Fri Aug 17 13:37:59 2018 -0700
tree 0fcfbec219d1c5d0b4bed9f17e7d12b91260576a
parent a25cf40374816eb91ef982962374838ead7774b8

Fix some google-runtime-int warnings in frameworks/rs.

* Use (u)int16_t instead of (unsigned) short.

Bug: 112478838
Test: build with WITH_TIDY=1
Change-Id: I5bb64e093a6d97e114da2ee0d7a085d532f4b238

cpu_ref/rsCpuIntrinsicConvolve3x3.cpp

diff --git a/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp b/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
index c2b4bd9..a2cd8e5 100644
--- a/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
+++ b/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
@@ -35,7 +35,7 @@
 
 protected:
     float mFp[16];
-    short mIp[16];
+    int16_t mIp[16];
     ObjectBaseRef<const Allocation> mAlloc;
     ObjectBaseRef<const Element> mElement;
 
@@ -70,15 +70,15 @@
     memcpy (&mFp, data, dataLength);
     for(int ct=0; ct < 9; ct++) {
         if (mFp[ct] >= 0) {
-            mIp[ct] = (short)(mFp[ct] * 256.f + 0.5f);
+            mIp[ct] = (int16_t)(mFp[ct] * 256.f + 0.5f);
         } else {
-            mIp[ct] = (short)(mFp[ct] * 256.f - 0.5f);
+            mIp[ct] = (int16_t)(mFp[ct] * 256.f - 0.5f);
         }
     }
 }
 
 extern "C" void rsdIntrinsicConvolve3x3_K(void *dst, const void *y0, const void *y1,
-                                          const void *y2, const short *coef, uint32_t count);
+                                          const void *y2, const int16_t *coef, uint32_t count);
 
 
 static void ConvolveOneU4(const RsExpandKernelDriverInfo *info, uint32_t x, uchar4 *out,
@@ -480,7 +480,7 @@
     }
     for(int ct=0; ct < 9; ct++) {
         mFp[ct] = 1.f / 9.f;
-        mIp[ct] = (short)(mFp[ct] * 256.f + 0.5f);
+        mIp[ct] = (int16_t)(mFp[ct] * 256.f + 0.5f);
     }
 }