Remove unnamed namespace usage from tests.

tests/ReadPixelsTest.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"
 #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);
 
-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 = 0xff;
     switch ((x+y) % 5) {
         case 0:
             a = 0xff;
             break;
         case 1:
             a = 0x80;
             break;
         case 2:
             a = 0xCC;
             break;
         case 4:
             a = 0x01;
             break;
         case 3:
             a = 0x00;
             break;
     }
     return SkPremultiplyARGBInline(a, r, g, b);
 }
 
-SkPMColor getBitmapColor(int x, int y, int w) {
+static SkPMColor getBitmapColor(int x, int y, int w) {
     int n = y * w + x;
 
     U8CPU b = n & 0xff;
     U8CPU g = (n >> 8) & 0xff;
     U8CPU r = (n >> 16) & 0xff;
     return SkPackARGB32(0xff, r, g , b);
 }
 
-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);
 }
 
-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();
 }
 
-void fillBitmap(SkBitmap* bitmap) {
+static void fillBitmap(SkBitmap* bitmap) {
     SkASSERT(bitmap->lockPixelsAreWritable());
     SkAutoLockPixels alp(*bitmap);
     int w = bitmap->width();
     int h = bitmap->height();
     intptr_t pixels = reinterpret_cast<intptr_t>(bitmap->getPixels());
     for (int y = 0; y < h; ++y) {
         for (int x = 0; x < w; ++x) {
             SkPMColor* pixel = reinterpret_cast<SkPMColor*>(pixels + y * bitmap->rowBytes() + x * bitmap->bytesPerPixel());
             *pixel = getBitmapColor(x, y, w);
         }
     }
 }
 
-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;
 }
 
 // checks the bitmap contains correct pixels after the readPixels
 // if the bitmap was prefilled with pixels it checks that these weren't
 // overwritten in the area outside the readPixels.
-bool checkRead(skiatest::Reporter* reporter,
-               const SkBitmap& bitmap,
-               int x, int y,
-               bool checkCanvasPixels,
-               bool checkBitmapPixels,
-               SkCanvas::Config8888 config8888) {
+static bool checkRead(skiatest::Reporter* reporter,
+                      const SkBitmap& bitmap,
+                      int x, int y,
+                      bool checkCanvasPixels,
+                      bool checkBitmapPixels,
+                      SkCanvas::Config8888 config8888) {
     SkASSERT(SkBitmap::kARGB_8888_Config == bitmap.config());
     SkASSERT(!bitmap.isNull());
     SkASSERT(checkCanvasPixels || checkBitmapPixels);
 
     int bw = bitmap.width();
     int bh = bitmap.height();
 
     SkIRect srcRect = SkIRect::MakeXYWH(x, y, bw, bh);
     SkIRect clippedSrcRect = DEV_RECT;
     if (!clippedSrcRect.intersect(srcRect)) {
@@ skipping 33 matching lines @@
 enum BitmapInit {
     kFirstBitmapInit = 0,
 
     kNoPixels_BitmapInit = kFirstBitmapInit,
     kTight_BitmapInit,
     kRowBytes_BitmapInit,
 
     kBitmapInitCnt
 };
 
-BitmapInit nextBMI(BitmapInit bmi) {
+static BitmapInit nextBMI(BitmapInit bmi) {
     int x = bmi;
     return static_cast<BitmapInit>(++x);
 }
 
-
-void init_bitmap(SkBitmap* bitmap, const SkIRect& rect, BitmapInit init) {
+static void init_bitmap(SkBitmap* bitmap, const SkIRect& rect, BitmapInit init) {
     int w = rect.width();
     int h = rect.height();
     int rowBytes = 0;
     bool alloc = true;
     switch (init) {
         case kNoPixels_BitmapInit:
             alloc = false;
         case kTight_BitmapInit:
             break;
         case kRowBytes_BitmapInit:
             rowBytes = w * sizeof(SkPMColor) + 16 * sizeof(SkPMColor);
             break;
         default:
             SkASSERT(0);
             break;
     }
     bitmap->setConfig(SkBitmap::kARGB_8888_Config, w, h, rowBytes);
     if (alloc) {
         bitmap->allocPixels();
     }
 }
 
-void ReadPixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
+static void ReadPixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
     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
         SkIRect::MakeLTRB(-10, -10, -1, -1),
         // touching top left corner
@@ skipping 134 matching lines @@
                                   clippedRect.fTop, true, false,
                                   SkCanvas::kNative_Premul_Config8888);
                     } else {
                         REPORTER_ASSERT(reporter, !success);
                     }
                 }
             }
         }
     }
 }
-}
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("ReadPixels", ReadPixelsTestClass, ReadPixelsTest)