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
66 lines
2.0 KiB
C++
66 lines
2.0 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 "SkParsePath.h"
|
|
|
|
static void test_to_from(skiatest::Reporter* reporter, const SkPath& path) {
|
|
SkString str, str2;
|
|
SkParsePath::ToSVGString(path, &str);
|
|
|
|
SkPath path2;
|
|
bool success = SkParsePath::FromSVGString(str.c_str(), &path2);
|
|
REPORTER_ASSERT(reporter, success);
|
|
|
|
SkParsePath::ToSVGString(path2, &str2);
|
|
REPORTER_ASSERT(reporter, str == str2);
|
|
#if 0 // closed paths are not equal, the iter explicitly gives the closing
|
|
// edge, even if it is not in the path.
|
|
REPORTER_ASSERT(reporter, path == path2);
|
|
if (path != path2) {
|
|
SkDebugf("str1=%s\nstr2=%s\n", str.c_str(), str2.c_str());
|
|
}
|
|
#endif
|
|
}
|
|
|
|
static void TestParsePath(skiatest::Reporter* reporter) {
|
|
static const struct {
|
|
const char* fStr;
|
|
SkRect fBounds;
|
|
} gRec[] = {
|
|
{ "", { 0, 0, 0, 0 } },
|
|
{ "M0,0L10,10", { 0, 0, SkIntToScalar(10), SkIntToScalar(10) } },
|
|
{ "M-5.5,-0.5 Q 0 0 6,6.50",
|
|
{ SkFloatToScalar(-5.5f), SkFloatToScalar(-0.5f),
|
|
SkFloatToScalar(6), SkFloatToScalar(6.5f) } }
|
|
};
|
|
|
|
for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) {
|
|
SkPath path;
|
|
bool success = SkParsePath::FromSVGString(gRec[i].fStr, &path);
|
|
REPORTER_ASSERT(reporter, success);
|
|
const SkRect& expectedBounds = gRec[i].fBounds;
|
|
const SkRect& pathBounds = path.getBounds();
|
|
REPORTER_ASSERT(reporter, expectedBounds == pathBounds);
|
|
|
|
test_to_from(reporter, path);
|
|
}
|
|
|
|
SkRect r;
|
|
r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5));
|
|
SkPath p;
|
|
p.addRect(r);
|
|
test_to_from(reporter, p);
|
|
p.addOval(r);
|
|
test_to_from(reporter, p);
|
|
p.addRoundRect(r, SkFloatToScalar(4), SkFloatToScalar(4.5));
|
|
test_to_from(reporter, p);
|
|
}
|
|
|
|
#include "TestClassDef.h"
|
|
DEFINE_TESTCLASS("ParsePath", ParsePathClass, TestParsePath)
|