From 8c960bf965dce870d57623ac0dd01c0f3f43a21f Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 18 Sep 2013 12:51:50 +0000 Subject: [PATCH] Fix Mac 10.6 DeviceLooperTest build error (this time with feeling) git-svn-id: http://skia.googlecode.com/svn/trunk@11338 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/DeviceLooperTest.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/tests/DeviceLooperTest.cpp b/tests/DeviceLooperTest.cpp index bb41f8115..23e9d1503 100644 --- a/tests/DeviceLooperTest.cpp +++ b/tests/DeviceLooperTest.cpp @@ -22,21 +22,22 @@ static bool equal(const SkRasterClip& a, const SkRasterClip& b) { } } +static const struct { + SkISize fDevSize; + SkIRect fRCBounds; + SkIRect fRect; +} gRec[] = { + { { 4000, 10 }, { 0, 0, 4000, 10 }, { 0, 0, 4000, 4000 } }, + { { 10, 4000 }, { 0, 0, 10, 4000 }, { 0, 0, 4000, 4000 } }, + // very large devce, small rect + { { 32000, 10 }, { 0, 0, 32000, 10 }, { 0, 0, 4000, 4000 } }, + { { 10, 32000 }, { 0, 0, 10, 32000 }, { 0, 0, 4000, 4000 } }, + // very large device, small clip + { { 32000, 10 }, { 0, 0, 4000, 10 }, { 0, 0, 32000, 32000 } }, + { { 10, 32000 }, { 0, 0, 10, 4000 }, { 0, 0, 32000, 32000 } }, +}; + static void test_simple(skiatest::Reporter* reporter) { - static const struct { - SkISize fDevSize; - SkIRect fRCBounds; - SkIRect fRect; - } gRec[] = { - { { 4000, 10 }, { 0, 0, 4000, 10 }, { 0, 0, 4000, 4000 } }, - { { 10, 4000 }, { 0, 0, 10, 4000 }, { 0, 0, 4000, 4000 } }, - // very large devce, small rect - { { 32000, 10 }, { 0, 0, 32000, 10 }, { 0, 0, 4000, 4000 } }, - { { 10, 32000 }, { 0, 0, 10, 32000 }, { 0, 0, 4000, 4000 } }, - // very large device, small clip - { { 32000, 10 }, { 0, 0, 4000, 10 }, { 0, 0, 32000, 32000 } }, - { { 10, 32000 }, { 0, 0, 10, 4000 }, { 0, 0, 32000, 32000 } }, - }; for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) { SkBitmap bitmap;