Remove unnamed namespace usage from tests/

tests/GifTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This tests out GIF decoder (SkImageDecoder_libgif.cpp)
 // It is not used on these platforms:
 #if (!defined(SK_BUILD_FOR_WIN32)) &&           \
     (!defined(SK_BUILD_FOR_IOS)) &&             \
     (!defined(SK_BUILD_FOR_MAC))
 
 #include "Test.h"
 #include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
 #include "SkImage.h"
 #include "SkImageDecoder.h"
 #include "SkStream.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 

[robertphillips, 2014/01/14 13:19:37]

Maybe make these gGIFData, gGIFDataNoColormap and gInterlacedGIF?

[tfarina, 2014/01/21 23:37:43]

Done.

-namespace {
-    unsigned char gifData[] = {
-        0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x03, 0x00,
-        0x03, 0x00, 0xe3, 0x08, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00,
-        0xff, 0x80, 0x80, 0x80, 0x00, 0xff, 0x00, 0x00,
-        0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x2c, 0x00, 0x00,
-        0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x04,
-        0x07, 0x50, 0x1c, 0x43, 0x40, 0x41, 0x23, 0x44,
-        0x00, 0x3b};
-    unsigned char gifDataNoColormap[] = {
-        0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x01, 0x00,
-        0x01, 0x00, 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04,
-        0x01, 0x0a, 0x00, 0x01, 0x00, 0x2c, 0x00, 0x00,
-        0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x02,
-        0x02, 0x4c, 0x01, 0x00, 0x3b};
-    unsigned char interlacedGif[] = {
-        0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x09, 0x00,
-        0x09, 0x00, 0xe3, 0x08, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00,
-        0xff, 0x80, 0x80, 0x80, 0x00, 0xff, 0x00, 0x00,
-        0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x2c, 0x00, 0x00,
-        0x00, 0x00, 0x09, 0x00, 0x09, 0x00, 0x40, 0x04,
-        0x1b, 0x50, 0x1c, 0x23, 0xe9, 0x44, 0x23, 0x60,
-        0x9d, 0x09, 0x28, 0x1e, 0xf8, 0x6d, 0x64, 0x56,
-        0x9d, 0x53, 0xa8, 0x7e, 0xa8, 0x65, 0x94, 0x5c,
-        0xb0, 0x8a, 0x45, 0x04, 0x00, 0x3b};
-};  // namespace
+static unsigned char gifData[] = {
+  0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x03, 0x00, 0x03, 0x00, 0xe3, 0x08,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00,
+  0xff, 0x80, 0x80, 0x80, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x04,
+  0x07, 0x50, 0x1c, 0x43, 0x40, 0x41, 0x23, 0x44, 0x00, 0x3b
+};
+
+static unsigned char gifDataNoColormap[] = {
+  0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+  0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, 0x01, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x4c, 0x01, 0x00, 0x3b
+};
+
+static unsigned char interlacedGif[] = {
+  0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x09, 0x00, 0x09, 0x00, 0xe3, 0x08, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0x80,
+  0x80, 0x80, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2c, 0x00, 0x00, 0x00,
+  0x00, 0x09, 0x00, 0x09, 0x00, 0x40, 0x04, 0x1b, 0x50, 0x1c, 0x23, 0xe9, 0x44,
+  0x23, 0x60, 0x9d, 0x09, 0x28, 0x1e, 0xf8, 0x6d, 0x64, 0x56, 0x9d, 0x53, 0xa8,
+  0x7e, 0xa8, 0x65, 0x94, 0x5c, 0xb0, 0x8a, 0x45, 0x04, 0x00, 0x3b
+};
 
 static void test_gif_data_no_colormap(skiatest::Reporter* r,
-                                  void* data, size_t size) {
+                                      void* data,
+                                      size_t size) {
     SkBitmap bm;
     bool imageDecodeSuccess = SkImageDecoder::DecodeMemory(
         data, size, &bm);
     REPORTER_ASSERT(r, imageDecodeSuccess);
     REPORTER_ASSERT(r, bm.width() == 1);
     REPORTER_ASSERT(r, bm.height() == 1);
     REPORTER_ASSERT(r, !(bm.empty()));
     if (!(bm.empty())) {
         REPORTER_ASSERT(r, bm.getColor(0, 0) == 0x00000000);
     }
@@ skipping 127 matching lines @@
     // test short Gif.  80 is missing a few bytes.
     test_gif_data_short(reporter, static_cast<void *>(gifData), 80);
     // "libgif warning [DGifGetLine]"
 
     test_interlaced_gif_data(reporter, static_cast<void *>(interlacedGif),
                              100);  // 100 is missing a few bytes
     // "libgif warning [interlace DGifGetLine]"
 }
 
 #endif  // !(SK_BUILD_FOR_WIN32||SK_BUILD_FOR_IOS||SK_BUILD_FOR_MAC)