From 6c3b9cdcb047afe963c7bcf34834ba2ecccacc33 Mon Sep 17 00:00:00 2001 From: caryclark Date: Mon, 26 Sep 2016 05:36:58 -0700 Subject: fix tiger b The tiger tests have uncovered numerous bugs. This CL fixes the last of them. If a pair of curves do not intersect, but have one or both ends very close to the opposite curve, consider that an intersection. TBR=reed@google.com BUG=skia:5131 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2356363003 Review-Url: https://codereview.chromium.org/2356363003 --- tests/PathOpsConicQuadIntersectionTest.cpp | 69 ++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 tests/PathOpsConicQuadIntersectionTest.cpp (limited to 'tests/PathOpsConicQuadIntersectionTest.cpp') diff --git a/tests/PathOpsConicQuadIntersectionTest.cpp b/tests/PathOpsConicQuadIntersectionTest.cpp new file mode 100644 index 0000000000..5996cf804c --- /dev/null +++ b/tests/PathOpsConicQuadIntersectionTest.cpp @@ -0,0 +1,69 @@ +/* + * Copyright 2015 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ +#include "PathOpsTestCommon.h" +#include "SkIntersections.h" +#include "SkPathOpsConic.h" +#include "SkPathOpsQuad.h" +#include "SkReduceOrder.h" +#include "Test.h" + +static struct conicQuad { + SkDConic conic; + SkDQuad quad; +} conicQuadTests[] = { + {{{{{494.348663,224.583771}, {494.365143,224.633194}, {494.376404,224.684067}}}, 0.998645842f}, + {{{494.30481,224.474213}, {494.334961,224.538284}, {494.355774,224.605927}}}}, + + {{{{{494.348663,224.583771}, {494.365143,224.633194}, {494.376404,224.684067}}}, 0.998645842f}, + {{{494.355774f, 224.605927f}, {494.363708f, 224.631714f}, {494.370148f, 224.657471f}}}}, +}; + +static const int conicQuadTests_count = (int) SK_ARRAY_COUNT(conicQuadTests); + +static void conicQuadIntersection(skiatest::Reporter* reporter, int index) { + const SkDConic& conic = conicQuadTests[index].conic; + SkASSERT(ValidConic(conic)); + const SkDQuad& quad = conicQuadTests[index].quad; + SkASSERT(ValidQuad(quad)); + SkReduceOrder reduce1; + SkReduceOrder reduce2; + int order1 = reduce2.reduce(conic.fPts); + int order2 = reduce1.reduce(quad); + if (order2 != 3) { + SkDebugf("[%d] conic order=%d\n", index, order1); + REPORTER_ASSERT(reporter, 0); + } + if (order1 != 3) { + SkDebugf("[%d] quad order=%d\n", index, order2); + REPORTER_ASSERT(reporter, 0); + } + SkIntersections i; + int roots = i.intersect(conic, quad); + for (int pt = 0; pt < roots; ++pt) { + double tt1 = i[0][pt]; + SkDPoint xy1 = conic.ptAtT(tt1); + double tt2 = i[1][pt]; + SkDPoint xy2 = quad.ptAtT(tt2); + if (!xy1.approximatelyEqual(xy2)) { + SkDebugf("%s [%d,%d] x!= t1=%g (%g,%g) t2=%g (%g,%g)\n", + __FUNCTION__, index, pt, tt1, xy1.fX, xy1.fY, tt2, xy2.fX, xy2.fY); + } + REPORTER_ASSERT(reporter, xy1.approximatelyEqual(xy2)); + } + reporter->bumpTestCount(); +} + +DEF_TEST(PathOpsConicQuadIntersection, reporter) { + for (int index = 0; index < conicQuadTests_count; ++index) { + conicQuadIntersection(reporter, index); + reporter->bumpTestCount(); + } +} + +DEF_TEST(PathOpsConicQuadIntersectionOneOff, reporter) { + conicQuadIntersection(reporter, 1); +} -- cgit v1.2.3