ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
71 lines
1.7 KiB
C++
71 lines
1.7 KiB
C++
|
|
/*
|
|
* 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 "SkRegion.h"
|
|
#include "SkRandom.h"
|
|
|
|
static void rand_rect(SkIRect* rect, SkRandom& rand) {
|
|
int bits = 6;
|
|
int shift = 32 - bits;
|
|
rect->set(rand.nextU() >> shift, rand.nextU() >> shift,
|
|
rand.nextU() >> shift, rand.nextU() >> shift);
|
|
rect->sort();
|
|
}
|
|
|
|
static bool test_rects(const SkIRect rect[], int count) {
|
|
SkRegion rgn0, rgn1;
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
rgn0.op(rect[i], SkRegion::kUnion_Op);
|
|
}
|
|
rgn1.setRects(rect, count);
|
|
|
|
if (rgn0 != rgn1) {
|
|
SkDebugf("\n");
|
|
for (int i = 0; i < count; i++) {
|
|
SkDebugf(" { %d, %d, %d, %d },\n",
|
|
rect[i].fLeft, rect[i].fTop,
|
|
rect[i].fRight, rect[i].fBottom);
|
|
}
|
|
SkDebugf("\n");
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static void TestRegion(skiatest::Reporter* reporter) {
|
|
const SkIRect r2[] = {
|
|
{ 0, 0, 1, 1 },
|
|
{ 2, 2, 3, 3 },
|
|
};
|
|
REPORTER_ASSERT(reporter, test_rects(r2, SK_ARRAY_COUNT(r2)));
|
|
|
|
const SkIRect rects[] = {
|
|
{ 0, 0, 1, 2 },
|
|
{ 2, 1, 3, 3 },
|
|
{ 4, 0, 5, 1 },
|
|
{ 6, 0, 7, 4 },
|
|
};
|
|
REPORTER_ASSERT(reporter, test_rects(rects, SK_ARRAY_COUNT(rects)));
|
|
|
|
SkRandom rand;
|
|
for (int i = 0; i < 1000; i++) {
|
|
SkRegion rgn0, rgn1;
|
|
|
|
const int N = 8;
|
|
SkIRect rect[N];
|
|
for (int j = 0; j < N; j++) {
|
|
rand_rect(&rect[j], rand);
|
|
}
|
|
REPORTER_ASSERT(reporter, test_rects(rect, N));
|
|
}
|
|
}
|
|
|
|
#include "TestClassDef.h"
|
|
DEFINE_TESTCLASS("Region", RegionTestClass, TestRegion)
|