AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@8608 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-04-11 07:01:45 +00:00
parent 44f00b1429
commit 391ca66276
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/PathOpsExtendedTest.cpp
View File

@ -160,7 +160,7 @@ static void showPath(const SkPath& path, const char* str, const SkMatrix& scale)
SkPath scaled;
SkMatrix inverse;
bool success = scale.invert(&inverse);
if (!success) {
if (!success) {
SkASSERT(0);
}
path.transform(inverse, &scaled);
@ -328,7 +328,7 @@ static void showPathOpPath(const SkPath& one, const SkPath& two, const SkPath& a
static int comparePaths(skiatest::Reporter* reporter, const SkPath& one, const SkPath& scaledOne,
const SkPath& two, const SkPath& scaledTwo, SkBitmap& bitmap,
const SkPath& a, const SkPath& b, const SkPathOp shapeOp,
const SkPath& a, const SkPath& b, const SkPathOp shapeOp,
const SkMatrix& scale) {
int errors2x2;
int errors = pathsDrawTheSame(bitmap, scaledOne, scaledTwo, errors2x2);

1
tests/PathOpsOpRectThreadedTest.cpp
View File

@ -87,4 +87,3 @@ finish:
#include "TestClassDef.h"
DEFINE_TESTCLASS("PathOpsRectsThreaded", OpRectsThreadedTestClass, \
TestPathOpsRectsThreaded)

2
tests/PathOpsThreadedCommon.cpp
View File

@ -25,5 +25,3 @@ void PathOpsThreadedTestRunner::render() {
gDebugMaxWindValue = SK_MaxS32;
#endif
}

14
tests/PathTest.cpp
View File

@ -33,20 +33,20 @@ static SkSurface* new_surface(int w, int h) {
static void test_bad_cubic_crbug229478() {
const SkPoint pts[] = {
{ 4595.91064f, -11596.9873f },
{ 4597.2168f, -11595.9414f },
{ 4598.52344f, -11594.8955f },
{ 4599.83008f, -11593.8496f },
{ 4595.91064f, -11596.9873f },
{ 4597.2168f, -11595.9414f },
{ 4598.52344f, -11594.8955f },
{ 4599.83008f, -11593.8496f },
};
SkPath path;
path.moveTo(pts[0]);
path.cubicTo(pts[1], pts[2], pts[3]);
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(20);
SkPath dst;
// Before the fix, this would infinite-recurse, and run out of stack
// because we would keep trying to subdivide a degenerate cubic segment.

2
tests/skia_test.cpp
View File

@ -73,7 +73,7 @@ public:
}
virtual bool allowExtendedTest() const {
return fAllowExtendedTest;
return fAllowExtendedTest;
}
protected: