Remove unnamed namespace usage from tests.

tests/WritePixelsTest.cpp

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkMathPriv.h"
 #include "SkRegion.h"
 #if SK_SUPPORT_GPU
 #include "SkGpuDevice.h"
 #include "GrContextFactory.h"
 #else
 class GrContext;
 class GrContextFactory;
 #endif
 
 static const int DEV_W = 100, DEV_H = 100;
 static const SkIRect DEV_RECT = SkIRect::MakeWH(DEV_W, DEV_H);
 static const SkRect DEV_RECT_S = SkRect::MakeWH(DEV_W * SK_Scalar1,
                                                 DEV_H * SK_Scalar1);
 static const U8CPU DEV_PAD = 0xee;
 
-namespace {
-SkPMColor getCanvasColor(int x, int y) {
+static SkPMColor getCanvasColor(int x, int y) {
     SkASSERT(x >= 0 && x < DEV_W);
     SkASSERT(y >= 0 && y < DEV_H);
 
     U8CPU r = x;
     U8CPU g = y;
     U8CPU b = 0xc;
 
     U8CPU a = 0x0;
     switch ((x+y) % 5) {
         case 0:
             a = 0xff;
             break;
         case 1:
             a = 0x80;
             break;
         case 2:
             a = 0xCC;
             break;
         case 3:
             a = 0x00;
             break;
         case 4:
             a = 0x01;
             break;
     }
     return SkPremultiplyARGBInline(a, r, g, b);
 }
 
-bool config8888IsPremul(SkCanvas::Config8888 config8888) {
+static bool config8888IsPremul(SkCanvas::Config8888 config8888) {
     switch (config8888) {
         case SkCanvas::kNative_Premul_Config8888:
         case SkCanvas::kBGRA_Premul_Config8888:
         case SkCanvas::kRGBA_Premul_Config8888:
             return true;
         case SkCanvas::kNative_Unpremul_Config8888:
         case SkCanvas::kBGRA_Unpremul_Config8888:
         case SkCanvas::kRGBA_Unpremul_Config8888:
             return false;
         default:
             SkASSERT(0);
             return false;
     }
 }
 
 // assumes any premu/.unpremul has been applied
-uint32_t packConfig8888(SkCanvas::Config8888 config8888,
-                        U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
+static uint32_t packConfig8888(SkCanvas::Config8888 config8888,
+                               U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
     uint32_t r32;
     uint8_t* result = reinterpret_cast<uint8_t*>(&r32);
     switch (config8888) {
         case SkCanvas::kNative_Premul_Config8888:
         case SkCanvas::kNative_Unpremul_Config8888:
             r32 = SkPackARGB32NoCheck(a, r, g, b);
             break;
         case SkCanvas::kBGRA_Premul_Config8888:
         case SkCanvas::kBGRA_Unpremul_Config8888:
             result[0] = b;
             result[1] = g;
             result[2] = r;
             result[3] = a;
             break;
         case SkCanvas::kRGBA_Premul_Config8888:
         case SkCanvas::kRGBA_Unpremul_Config8888:
             result[0] = r;
             result[1] = g;
             result[2] = b;
             result[3] = a;
             break;
         default:
             SkASSERT(0);
             return 0;
     }
     return r32;
 }
 
-uint32_t getBitmapColor(int x, int y, int w, SkCanvas::Config8888 config8888) {
+static uint32_t getBitmapColor(int x, int y, int w, SkCanvas::Config8888 config8888) {
     int n = y * w + x;
     U8CPU b = n & 0xff;
     U8CPU g = (n >> 8) & 0xff;
     U8CPU r = (n >> 16) & 0xff;
     U8CPU a = 0;
     switch ((x+y) % 5) {
         case 4:
             a = 0xff;
             break;
         case 3:
@@ skipping 10 matching lines @@
             break;
     }
     if (config8888IsPremul(config8888)) {
         r = SkMulDiv255Ceiling(r, a);
         g = SkMulDiv255Ceiling(g, a);
         b = SkMulDiv255Ceiling(b, a);
     }
     return packConfig8888(config8888, a, r, g , b);
 }
 
-void fillCanvas(SkCanvas* canvas) {
+static void fillCanvas(SkCanvas* canvas) {
     static SkBitmap bmp;
     if (bmp.isNull()) {
         bmp.setConfig(SkBitmap::kARGB_8888_Config, DEV_W, DEV_H);
         SkDEBUGCODE(bool alloc = ) bmp.allocPixels();
         SkASSERT(alloc);
         SkAutoLockPixels alp(bmp);
         intptr_t pixels = reinterpret_cast<intptr_t>(bmp.getPixels());
         for (int y = 0; y < DEV_H; ++y) {
             for (int x = 0; x < DEV_W; ++x) {
                 SkPMColor* pixel = reinterpret_cast<SkPMColor*>(pixels + y * bmp.rowBytes() + x * bmp.bytesPerPixel());
                 *pixel = getCanvasColor(x, y);
             }
         }
     }
     canvas->save();
     canvas->setMatrix(SkMatrix::I());
     canvas->clipRect(DEV_RECT_S, SkRegion::kReplace_Op);
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     canvas->drawBitmap(bmp, 0, 0, &paint);
     canvas->restore();
 }
 
-SkPMColor convertConfig8888ToPMColor(SkCanvas::Config8888 config8888,
-                                     uint32_t color,
-                                     bool* premul) {
+static SkPMColor convertConfig8888ToPMColor(SkCanvas::Config8888 config8888,
+                                            uint32_t color,
+                                            bool* premul) {
     const uint8_t* c = reinterpret_cast<uint8_t*>(&color);
     U8CPU a,r,g,b;
     *premul = false;
     switch (config8888) {
         case SkCanvas::kNative_Premul_Config8888:
             return color;
         case SkCanvas::kNative_Unpremul_Config8888:
             *premul = true;
             a = SkGetPackedA32(color);
             r = SkGetPackedR32(color);
@@ skipping 21 matching lines @@
             return 0;
     }
     if (*premul) {
         r = SkMulDiv255Ceiling(r, a);
         g = SkMulDiv255Ceiling(g, a);
         b = SkMulDiv255Ceiling(b, a);
     }
     return SkPackARGB32(a, r, g, b);
 }
 
-bool checkPixel(SkPMColor a, SkPMColor b, bool didPremulConversion) {
+static bool checkPixel(SkPMColor a, SkPMColor b, bool didPremulConversion) {
     if (!didPremulConversion) {
         return a == b;
     }
     int32_t aA = static_cast<int32_t>(SkGetPackedA32(a));
     int32_t aR = static_cast<int32_t>(SkGetPackedR32(a));
     int32_t aG = static_cast<int32_t>(SkGetPackedG32(a));
     int32_t aB = SkGetPackedB32(a);
 
     int32_t bA = static_cast<int32_t>(SkGetPackedA32(b));
     int32_t bR = static_cast<int32_t>(SkGetPackedR32(b));
     int32_t bG = static_cast<int32_t>(SkGetPackedG32(b));
     int32_t bB = static_cast<int32_t>(SkGetPackedB32(b));
 
     return aA == bA &&
            SkAbs32(aR - bR) <= 1 &&
            SkAbs32(aG - bG) <= 1 &&
            SkAbs32(aB - bB) <= 1;
 }
 
-bool checkWrite(skiatest::Reporter* reporter,
-                SkCanvas* canvas,
-                const SkBitmap& bitmap,
-                int writeX, int writeY,
-                SkCanvas::Config8888 config8888) {
+static bool checkWrite(skiatest::Reporter* reporter,
+                       SkCanvas* canvas,
+                       const SkBitmap& bitmap,
+                       int writeX, int writeY,
+                       SkCanvas::Config8888 config8888) {
     SkBaseDevice* dev = canvas->getDevice();
     if (!dev) {
         return false;
     }
     SkBitmap devBmp = dev->accessBitmap(false);
     if (devBmp.width() != DEV_W ||
         devBmp.height() != DEV_H ||
         devBmp.config() != SkBitmap::kARGB_8888_Config ||
         devBmp.isNull()) {
         return false;
@@ skipping 58 matching lines @@
 
 static const CanvasConfig gCanvasConfigs[] = {
     {kRaster_DevType, true},
     {kRaster_DevType, false},
 #if SK_SUPPORT_GPU && defined(SK_SCALAR_IS_FLOAT)
     {kGpu_BottomLeft_DevType, true}, // row bytes has no meaning on gpu devices
     {kGpu_TopLeft_DevType, true}, // row bytes has no meaning on gpu devices
 #endif
 };
 
-SkBaseDevice* createDevice(const CanvasConfig& c, GrContext* grCtx) {
+static SkBaseDevice* createDevice(const CanvasConfig& c, GrContext* grCtx) {
     switch (c.fDevType) {
         case kRaster_DevType: {
             SkBitmap bmp;
             size_t rowBytes = c.fTightRowBytes ? 0 : 4 * DEV_W + 100;
             bmp.setConfig(SkBitmap::kARGB_8888_Config, DEV_W, DEV_H, rowBytes);
             if (!bmp.allocPixels()) {
                 sk_throw();
                 return NULL;
             }
             // if rowBytes isn't tight then set the padding to a known value
@@ skipping 14 matching lines @@
             desc.fOrigin = kGpu_TopLeft_DevType == c.fDevType ?
                 kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
             GrAutoScratchTexture ast(grCtx, desc, GrContext::kExact_ScratchTexMatch);
             SkAutoTUnref<GrTexture> tex(ast.detach());
             return new SkGpuDevice(grCtx, tex);
 #endif
     }
     return NULL;
 }
 
-bool setupBitmap(SkBitmap* bitmap,
-              SkCanvas::Config8888 config8888,
-              int w, int h,
-              bool tightRowBytes) {
+static bool setupBitmap(SkBitmap* bitmap,
+                        SkCanvas::Config8888 config8888,
+                        int w, int h,
+                        bool tightRowBytes) {
     size_t rowBytes = tightRowBytes ? 0 : 4 * w + 60;
     bitmap->setConfig(SkBitmap::kARGB_8888_Config, w, h, rowBytes);
     if (!bitmap->allocPixels()) {
         return false;
     }
     SkAutoLockPixels alp(*bitmap);
     intptr_t pixels = reinterpret_cast<intptr_t>(bitmap->getPixels());
     for (int y = 0; y < h; ++y) {
         for (int x = 0; x < w; ++x) {
             uint32_t* pixel = reinterpret_cast<uint32_t*>(pixels + y * bitmap->rowBytes() + x * 4);
             *pixel = getBitmapColor(x, y, w, config8888);
         }
     }
     return true;
 }
 
-void WritePixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
+static void WritePixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
     SkCanvas canvas;
 
     const SkIRect testRects[] = {
         // entire thing
         DEV_RECT,
         // larger on all sides
         SkIRect::MakeLTRB(-10, -10, DEV_W + 10, DEV_H + 10),
         // fully contained
         SkIRect::MakeLTRB(DEV_W / 4, DEV_H / 4, 3 * DEV_W / 4, 3 * DEV_H / 4),
         // outside top left
@@ skipping 90 matching lines @@
                         SkIRect writeRect = SkIRect::MakeXYWH(rect.fLeft, rect.fTop,
                                                               bmp.width(), bmp.height());
                         bool intersects = SkIRect::Intersects(canvasRect, writeRect) ;
                         REPORTER_ASSERT(reporter, intersects == (idBefore != idAfter));
                     }
                 }
             }
         }
     }
 }
-}
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("WritePixels", WritePixelsTestClass, WritePixelsTest)