From 58674817a7a5003556a1d0b5b8fa522782a729fa Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 21 Jan 2014 23:39:22 +0000 Subject: Remove unnamed namespace usage from tests/ Skia preference is to use 'static' keyword rather than use unnamed namespace. BUG=None TEST=tests R=robertphillips@google.com, bsalomon@google.com Review URL: https://codereview.chromium.org/132403008 git-svn-id: http://skia.googlecode.com/svn/trunk@13138 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/GifTest.cpp | 103 +++++++++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 55 deletions(-) (limited to 'tests/GifTest.cpp') diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp index c2b8a88032..7d5d56cc13 100644 --- a/tests/GifTest.cpp +++ b/tests/GifTest.cpp @@ -21,43 +21,36 @@ __SK_FORCE_IMAGE_DECODER_LINKING; -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 gGIFData[] = { + 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 gGIFDataNoColormap[] = { + 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 gInterlacedGIF[] = { + 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); @@ -149,57 +142,57 @@ static void test_gif_data_short(skiatest::Reporter* r, */ DEF_TEST(Gif, reporter) { // test perfectly good images. - test_gif_data(reporter, static_cast(gifData), sizeof(gifData)); - test_interlaced_gif_data(reporter, static_cast(interlacedGif), - sizeof(interlacedGif)); + test_gif_data(reporter, static_cast(gGIFData), sizeof(gGIFData)); + test_interlaced_gif_data(reporter, static_cast(gInterlacedGIF), + sizeof(gInterlacedGIF)); - unsigned char badData[sizeof(gifData)]; + unsigned char badData[sizeof(gGIFData)]; /* If you set the environment variable skia_images_gif_suppressDecoderWarnings to 'false', you will see warnings on stderr. This is a feature. */ - memcpy(badData, gifData, sizeof(gifData)); + memcpy(badData, gGIFData, sizeof(gGIFData)); badData[6] = 0x01; // image too wide - test_gif_data(reporter, static_cast(badData), sizeof(gifData)); + test_gif_data(reporter, static_cast(badData), sizeof(gGIFData)); // "libgif warning [image too wide, expanding output to size]" - memcpy(badData, gifData, sizeof(gifData)); + memcpy(badData, gGIFData, sizeof(gGIFData)); badData[8] = 0x01; // image too tall - test_gif_data(reporter, static_cast(badData), sizeof(gifData)); + test_gif_data(reporter, static_cast(badData), sizeof(gGIFData)); // "libgif warning [image too tall, expanding output to size]" - memcpy(badData, gifData, sizeof(gifData)); + memcpy(badData, gGIFData, sizeof(gGIFData)); badData[62] = 0x01; // image shifted right - test_gif_data(reporter, static_cast(badData), sizeof(gifData)); + test_gif_data(reporter, static_cast(badData), sizeof(gGIFData)); // "libgif warning [shifting image left to fit]" - memcpy(badData, gifData, sizeof(gifData)); + memcpy(badData, gGIFData, sizeof(gGIFData)); badData[64] = 0x01; // image shifted down - test_gif_data(reporter, static_cast(badData), sizeof(gifData)); + test_gif_data(reporter, static_cast(badData), sizeof(gGIFData)); // "libgif warning [shifting image up to fit]" - memcpy(badData, gifData, sizeof(gifData)); + memcpy(badData, gGIFData, sizeof(gGIFData)); badData[62] = 0xff; // image shifted left badData[63] = 0xff; // 2's complement -1 short - test_gif_data(reporter, static_cast(badData), sizeof(gifData)); + test_gif_data(reporter, static_cast(badData), sizeof(gGIFData)); // "libgif warning [shifting image left to fit]" - memcpy(badData, gifData, sizeof(gifData)); + memcpy(badData, gGIFData, sizeof(gGIFData)); badData[64] = 0xff; // image shifted up badData[65] = 0xff; // 2's complement -1 short - test_gif_data(reporter, static_cast(badData), sizeof(gifData)); + test_gif_data(reporter, static_cast(badData), sizeof(gGIFData)); // "libgif warning [shifting image up to fit]" - test_gif_data_no_colormap(reporter, static_cast(gifDataNoColormap), - sizeof(gifDataNoColormap)); + test_gif_data_no_colormap(reporter, static_cast(gGIFDataNoColormap), + sizeof(gGIFDataNoColormap)); // "libgif warning [missing colormap]" // test short Gif. 80 is missing a few bytes. - test_gif_data_short(reporter, static_cast(gifData), 80); + test_gif_data_short(reporter, static_cast(gGIFData), 80); // "libgif warning [DGifGetLine]" - test_interlaced_gif_data(reporter, static_cast(interlacedGif), + test_interlaced_gif_data(reporter, static_cast(gInterlacedGIF), 100); // 100 is missing a few bytes // "libgif warning [interlace DGifGetLine]" } -- cgit v1.2.3