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
52 lines
1.5 KiB
C++
52 lines
1.5 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 "SkRect.h"
|
|
|
|
#ifdef SK_SCALAR_IS_FLOAT
|
|
static float make_zero() {
|
|
return sk_float_sin(0);
|
|
}
|
|
#endif
|
|
|
|
static void check_invalid(skiatest::Reporter* reporter,
|
|
SkScalar l, SkScalar t, SkScalar r, SkScalar b) {
|
|
SkRect rect;
|
|
rect.set(l, t, r, b);
|
|
REPORTER_ASSERT(reporter, !rect.hasValidCoordinates());
|
|
}
|
|
|
|
// Tests that hasValidCoordinates() will reject any rect with +/-inf values
|
|
// as one of its coordinates.
|
|
static void TestInfRect(skiatest::Reporter* reporter) {
|
|
#ifdef SK_SCALAR_IS_FLOAT
|
|
float invalid = 1 / make_zero(); // infinity
|
|
#else
|
|
SkFixed invalid = SK_FixedNaN;
|
|
#endif
|
|
SkScalar small = SkIntToScalar(10);
|
|
SkScalar big = SkIntToScalar(100);
|
|
|
|
SkRect rect = SkRect::MakeXYWH(small, small, big, big);
|
|
REPORTER_ASSERT(reporter, rect.hasValidCoordinates());
|
|
|
|
check_invalid(reporter, small, small, big, invalid);
|
|
check_invalid(reporter, small, small, invalid, big);
|
|
check_invalid(reporter, small, invalid, big, big);
|
|
check_invalid(reporter, invalid, small, big, big);
|
|
check_invalid(reporter, small, small, big, -invalid);
|
|
check_invalid(reporter, small, small, -invalid, big);
|
|
check_invalid(reporter, small, -invalid, big, big);
|
|
check_invalid(reporter, -invalid, small, big, big);
|
|
}
|
|
|
|
// need tests for SkStrSearch
|
|
|
|
#include "TestClassDef.h"
|
|
DEFINE_TESTCLASS("InfRect", InfRectTestClass, TestInfRect)
|