Merge "Fix google-build-using-namespace warnings in cpu_ref." am: 6c7e0c1308 am: 248e44fd4d am: 2d7db226f8

am: 70af4c884f

Change-Id: I1ba365aa50baa7bb39a7875b6ce584aabd43b78a

1 files changed, 14 insertions, 8 deletions

diff --git a/cpu_ref/rsCpuIntrinsicBlur.cpp b/cpu_ref/rsCpuIntrinsicBlur.cpp
index 66833844..0ee4ef65 100644
--- a/cpu_ref/rsCpuIntrinsicBlur.cpp
+++ b/cpu_ref/rsCpuIntrinsicBlur.cpp
@@ -17,13 +17,9 @@
 #include "rsCpuIntrinsic.h"
 #include "rsCpuIntrinsicInlines.h"
 
-using namespace android;
-using namespace android::renderscript;
-
 namespace android {
 namespace renderscript {
 
-
 class RsdCpuScriptIntrinsicBlur : public RsdCpuScriptIntrinsic {
 public:
     void populateScript(Script *) override;
@@ -57,9 +53,6 @@ protected:
     void ComputeGaussianWeights();
 };
 
-}
-}
-
 
 void RsdCpuScriptIntrinsicBlur::ComputeGaussianWeights() {
     memset(mFp, 0, sizeof(mFp));
@@ -152,6 +145,9 @@ static void OneVU1(const RsExpandKernelDriverInfo *info, float *out, int32_t x,
     out[0] = blurredPixel;
 }
 
+} // namespace renderscript
+} // namespace android
+
 
 extern "C" void rsdIntrinsicBlurU1_K(uchar *out, uchar const *in, size_t w, size_t h,
                  size_t p, size_t x, size_t y, size_t count, size_t r, uint16_t const *tab);
@@ -164,6 +160,8 @@ extern void rsdIntrinsicBlurHFU4_K(void *dst, const void *pin, const void *gptr,
 extern void rsdIntrinsicBlurHFU1_K(void *dst, const void *pin, const void *gptr, int rct, int x1, int ct);
 #endif
 
+using android::renderscript::gArchUseSIMD;
+
 static void OneVFU4(float4 *out,
                     const uchar *ptrIn, int iStride, const float* gPtr, int ct,
                     int x1, int x2) {
@@ -251,6 +249,9 @@ static void OneVFU1(float *out,
     }
 }
 
+using android::renderscript::rsMin;
+using android::renderscript::rsMax;
+
 static void OneHU4(const RsExpandKernelDriverInfo *info, uchar4 *out, int32_t x,
                    const float4 *ptrIn, const float* gPtr, int iradius) {
 
@@ -282,6 +283,9 @@ static void OneHU1(const RsExpandKernelDriverInfo *info, uchar *out, int32_t x,
 }
 
 
+namespace android {
+namespace renderscript {
+
 void RsdCpuScriptIntrinsicBlur::kernelU4(const RsExpandKernelDriverInfo *info,
                                          uint32_t xstart, uint32_t xend,
                                          uint32_t outstep) {
@@ -480,8 +484,10 @@ void RsdCpuScriptIntrinsicBlur::invokeFreeChildren() {
     mAlloc.clear();
 }
 
-
 RsdCpuScriptImpl * rsdIntrinsic_Blur(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e) {
 
     return new RsdCpuScriptIntrinsicBlur(ctx, s, e);
 }
+
+} // namespace renderscript
+} // namespace android