140ab3659e
This reverts commit0a86820f2f
. Reason for revert: fix has landed in CTS Original change's description: > Revert "fix nextContour bug" > > This reverts commit473f69276f
. > > Reason for revert: a CTS test PathMeasureTest.android.graphics.cts.PathMeasureTest.testNextContour is failing > > Original change's description: > > fix nextContour bug > > > > Calling nextContour() needs to ensure that we've already measured the "current" one. > > > > Bug: skia: > > Change-Id: I501c26d0b068028d67103888f06ec89125a5407a > > Reviewed-on: https://skia-review.googlesource.com/114692 > > Reviewed-by: Cary Clark <caryclark@google.com> > > Commit-Queue: Mike Reed <reed@google.com> > > TBR=caryclark@google.com,reed@google.com > > Change-Id: I7f1e08651dfe73c02158b209dc28af2b174e246f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/114823 > Reviewed-by: Stan Iliev <stani@google.com> > Commit-Queue: Stan Iliev <stani@google.com> TBR=caryclark@google.com,reed@google.com,stani@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia: Change-Id: I0fd61473ef0df62722cf6c6b86f1277f580e4ab1 Reviewed-on: https://skia-review.googlesource.com/115340 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
230 lines
7.5 KiB
C++
230 lines
7.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 "SkPathMeasure.h"
|
|
#include "Test.h"
|
|
|
|
static void test_small_segment3() {
|
|
SkPath path;
|
|
const SkPoint pts[] = {
|
|
{ 0, 0 },
|
|
{ 100000000000.0f, 100000000000.0f }, { 0, 0 }, { 10, 10 },
|
|
{ 10, 10 }, { 0, 0 }, { 10, 10 }
|
|
};
|
|
|
|
path.moveTo(pts[0]);
|
|
for (size_t i = 1; i < SK_ARRAY_COUNT(pts); i += 3) {
|
|
path.cubicTo(pts[i], pts[i + 1], pts[i + 2]);
|
|
}
|
|
|
|
SkPathMeasure meas(path, false);
|
|
meas.getLength();
|
|
}
|
|
|
|
static void test_small_segment2() {
|
|
SkPath path;
|
|
const SkPoint pts[] = {
|
|
{ 0, 0 },
|
|
{ 100000000000.0f, 100000000000.0f }, { 0, 0 },
|
|
{ 10, 10 }, { 0, 0 },
|
|
};
|
|
|
|
path.moveTo(pts[0]);
|
|
for (size_t i = 1; i < SK_ARRAY_COUNT(pts); i += 2) {
|
|
path.quadTo(pts[i], pts[i + 1]);
|
|
}
|
|
SkPathMeasure meas(path, false);
|
|
meas.getLength();
|
|
}
|
|
|
|
static void test_small_segment() {
|
|
SkPath path;
|
|
const SkPoint pts[] = {
|
|
{ 100000, 100000},
|
|
// big jump between these points, makes a big segment
|
|
{ 1.0005f, 0.9999f },
|
|
// tiny (non-zero) jump between these points
|
|
{ SK_Scalar1, SK_Scalar1 },
|
|
};
|
|
|
|
path.moveTo(pts[0]);
|
|
for (size_t i = 1; i < SK_ARRAY_COUNT(pts); ++i) {
|
|
path.lineTo(pts[i]);
|
|
}
|
|
SkPathMeasure meas(path, false);
|
|
|
|
/* this would assert (before a fix) because we added a segment with
|
|
the same length as the prev segment, due to the follow (bad) pattern
|
|
|
|
d = distance(pts[0], pts[1]);
|
|
distance += d;
|
|
seg->fDistance = distance;
|
|
|
|
SkASSERT(d > 0); // TRUE
|
|
SkASSERT(seg->fDistance > prevSeg->fDistance); // FALSE
|
|
|
|
This 2nd assert failes because (distance += d) didn't affect distance
|
|
because distance >>> d.
|
|
*/
|
|
meas.getLength();
|
|
}
|
|
|
|
DEF_TEST(PathMeasure, reporter) {
|
|
SkPath path;
|
|
|
|
path.moveTo(0, 0);
|
|
path.lineTo(SK_Scalar1, 0);
|
|
path.lineTo(SK_Scalar1, SK_Scalar1);
|
|
path.lineTo(0, SK_Scalar1);
|
|
|
|
SkPathMeasure meas(path, true);
|
|
SkScalar length = meas.getLength();
|
|
SkASSERT(length == SK_Scalar1*4);
|
|
|
|
path.reset();
|
|
path.moveTo(0, 0);
|
|
path.lineTo(SK_Scalar1*3, SK_Scalar1*4);
|
|
meas.setPath(&path, false);
|
|
length = meas.getLength();
|
|
REPORTER_ASSERT(reporter, length == SK_Scalar1*5);
|
|
|
|
path.reset();
|
|
path.addCircle(0, 0, SK_Scalar1);
|
|
meas.setPath(&path, true);
|
|
length = meas.getLength();
|
|
// SkDebugf("circle arc-length = %g\n", length);
|
|
|
|
// Test the behavior following a close not followed by a move.
|
|
path.reset();
|
|
path.lineTo(SK_Scalar1, 0);
|
|
path.lineTo(SK_Scalar1, SK_Scalar1);
|
|
path.lineTo(0, SK_Scalar1);
|
|
path.close();
|
|
path.lineTo(-SK_Scalar1, 0);
|
|
meas.setPath(&path, false);
|
|
length = meas.getLength();
|
|
REPORTER_ASSERT(reporter, length == SK_Scalar1 * 4);
|
|
meas.nextContour();
|
|
length = meas.getLength();
|
|
REPORTER_ASSERT(reporter, length == SK_Scalar1);
|
|
SkPoint position;
|
|
SkVector tangent;
|
|
REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fX,
|
|
-SK_ScalarHalf,
|
|
0.0001f));
|
|
REPORTER_ASSERT(reporter, position.fY == 0);
|
|
REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1);
|
|
REPORTER_ASSERT(reporter, tangent.fY == 0);
|
|
|
|
// Test degenerate paths
|
|
path.reset();
|
|
path.moveTo(0, 0);
|
|
path.lineTo(0, 0);
|
|
path.lineTo(SK_Scalar1, 0);
|
|
path.quadTo(SK_Scalar1, 0, SK_Scalar1, 0);
|
|
path.quadTo(SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1 * 2);
|
|
path.cubicTo(SK_Scalar1, SK_Scalar1 * 2,
|
|
SK_Scalar1, SK_Scalar1 * 2,
|
|
SK_Scalar1, SK_Scalar1 * 2);
|
|
path.cubicTo(SK_Scalar1*2, SK_Scalar1 * 2,
|
|
SK_Scalar1*3, SK_Scalar1 * 2,
|
|
SK_Scalar1*4, SK_Scalar1 * 2);
|
|
meas.setPath(&path, false);
|
|
length = meas.getLength();
|
|
REPORTER_ASSERT(reporter, length == SK_Scalar1 * 6);
|
|
REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fX,
|
|
SK_ScalarHalf,
|
|
0.0001f));
|
|
REPORTER_ASSERT(reporter, position.fY == 0);
|
|
REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
|
|
REPORTER_ASSERT(reporter, tangent.fY == 0);
|
|
REPORTER_ASSERT(reporter, meas.getPosTan(2.5f, &position, &tangent));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fX, SK_Scalar1, 0.0001f));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fY, 1.5f));
|
|
REPORTER_ASSERT(reporter, tangent.fX == 0);
|
|
REPORTER_ASSERT(reporter, tangent.fY == SK_Scalar1);
|
|
REPORTER_ASSERT(reporter, meas.getPosTan(4.5f, &position, &tangent));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fX,
|
|
2.5f,
|
|
0.0001f));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fY,
|
|
2.0f,
|
|
0.0001f));
|
|
REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
|
|
REPORTER_ASSERT(reporter, tangent.fY == 0);
|
|
|
|
path.reset();
|
|
path.moveTo(0, 0);
|
|
path.lineTo(SK_Scalar1, 0);
|
|
path.moveTo(SK_Scalar1, SK_Scalar1);
|
|
path.moveTo(SK_Scalar1 * 2, SK_Scalar1 * 2);
|
|
path.lineTo(SK_Scalar1, SK_Scalar1 * 2);
|
|
meas.setPath(&path, false);
|
|
length = meas.getLength();
|
|
REPORTER_ASSERT(reporter, length == SK_Scalar1);
|
|
REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fX,
|
|
SK_ScalarHalf,
|
|
0.0001f));
|
|
REPORTER_ASSERT(reporter, position.fY == 0);
|
|
REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1);
|
|
REPORTER_ASSERT(reporter, tangent.fY == 0);
|
|
meas.nextContour();
|
|
length = meas.getLength();
|
|
REPORTER_ASSERT(reporter, length == SK_Scalar1);
|
|
REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fX,
|
|
1.5f,
|
|
0.0001f));
|
|
REPORTER_ASSERT(reporter,
|
|
SkScalarNearlyEqual(position.fY,
|
|
2.0f,
|
|
0.0001f));
|
|
REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1);
|
|
REPORTER_ASSERT(reporter, tangent.fY == 0);
|
|
|
|
test_small_segment();
|
|
test_small_segment2();
|
|
test_small_segment3();
|
|
}
|
|
|
|
DEF_TEST(PathMeasureConic, reporter) {
|
|
SkPoint stdP, hiP, pts[] = {{0,0}, {100,0}, {100,0}};
|
|
SkPath p;
|
|
p.moveTo(0, 0);
|
|
p.conicTo(pts[1], pts[2], 1);
|
|
SkPathMeasure stdm(p, false);
|
|
REPORTER_ASSERT(reporter, stdm.getPosTan(20, &stdP, nullptr));
|
|
p.reset();
|
|
p.moveTo(0, 0);
|
|
p.conicTo(pts[1], pts[2], 10);
|
|
stdm.setPath(&p, false);
|
|
REPORTER_ASSERT(reporter, stdm.getPosTan(20, &hiP, nullptr));
|
|
REPORTER_ASSERT(reporter, 19.5f < stdP.fX && stdP.fX < 20.5f);
|
|
REPORTER_ASSERT(reporter, 19.5f < hiP.fX && hiP.fX < 20.5f);
|
|
}
|
|
|
|
// Regression test for b/26425223
|
|
DEF_TEST(PathMeasure_nextctr, reporter) {
|
|
SkPath path;
|
|
path.moveTo(0, 0); path.lineTo(100, 0);
|
|
|
|
SkPathMeasure meas(path, false);
|
|
// only expect 1 contour, even if we didn't explicitly call getLength() ourselves
|
|
REPORTER_ASSERT(reporter, !meas.nextContour());
|
|
}
|