283dba5785
This reverts commit e58831cd95
.
Reason for revert: looks like breaking a few build bots
Original change's description:
> Add format-specifier warnings to SkDebugf.
>
> This CL fixes up many existing format-specifier violations in Skia.
> Note that GCC has a warning for formatting nothing, so existing calls to
> `SkDebugf("")` have been removed, or replaced with `SkDebugf("%s", "")`.
> These were apparently meant to be used as a place to set a breakpoint.
>
> Some of our clients also use SkDebug with bad format specifiers, so this
> check is currently only enabled when SKIA_IMPLEMENTATION is true.
>
> Change-Id: I8177a1298a624c6936adc24e0d8f481362a356d0
> Bug: skia:12143
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/420902
> Auto-Submit: John Stiles <johnstiles@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Change-Id: I07848c1bf8992925c9498e916744d0840355a077
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:12143
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/421917
Reviewed-by: Tyler Denniston <tdenniston@google.com>
Commit-Queue: Tyler Denniston <tdenniston@google.com>
155 lines
5.5 KiB
C++
155 lines
5.5 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "src/core/SkGeometry.h"
|
|
#include "src/pathops/SkIntersections.h"
|
|
#include "src/pathops/SkPathOpsConic.h"
|
|
#include "src/pathops/SkPathOpsLine.h"
|
|
#include "src/pathops/SkReduceOrder.h"
|
|
#include "tests/PathOpsExtendedTest.h"
|
|
#include "tests/PathOpsTestCommon.h"
|
|
#include "tests/Test.h"
|
|
|
|
#include <utility>
|
|
|
|
static struct lineConic {
|
|
ConicPts conic;
|
|
SkDLine line;
|
|
int result;
|
|
SkDPoint expected[2];
|
|
} lineConicTests[] = {
|
|
{
|
|
{{{{30.6499996,25.6499996}, {30.6499996,20.6499996}, {25.6499996,20.6499996}}}, 0.707107008f},
|
|
{{{25.6499996,20.6499996}, {45.6500015,20.6499996}}},
|
|
1,
|
|
{{25.6499996,20.6499996}, {0,0}}
|
|
},
|
|
};
|
|
|
|
static size_t lineConicTests_count = SK_ARRAY_COUNT(lineConicTests);
|
|
|
|
static int doIntersect(SkIntersections& intersections, const SkDConic& conic, const SkDLine& line,
|
|
bool& flipped) {
|
|
int result;
|
|
flipped = false;
|
|
if (line[0].fX == line[1].fX) {
|
|
double top = line[0].fY;
|
|
double bottom = line[1].fY;
|
|
flipped = top > bottom;
|
|
if (flipped) {
|
|
using std::swap;
|
|
swap(top, bottom);
|
|
}
|
|
result = intersections.vertical(conic, top, bottom, line[0].fX, flipped);
|
|
} else if (line[0].fY == line[1].fY) {
|
|
double left = line[0].fX;
|
|
double right = line[1].fX;
|
|
flipped = left > right;
|
|
if (flipped) {
|
|
using std::swap;
|
|
swap(left, right);
|
|
}
|
|
result = intersections.horizontal(conic, left, right, line[0].fY, flipped);
|
|
} else {
|
|
intersections.intersect(conic, line);
|
|
result = intersections.used();
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static struct oneLineConic {
|
|
ConicPts conic;
|
|
SkDLine line;
|
|
} oneOffs[] = {
|
|
{{{{{30.6499996,25.6499996}, {30.6499996,20.6499996}, {25.6499996,20.6499996}}}, 0.707107008f},
|
|
{{{25.6499996,20.6499996}, {45.6500015,20.6499996}}}}
|
|
};
|
|
|
|
static size_t oneOffs_count = SK_ARRAY_COUNT(oneOffs);
|
|
|
|
static void testOneOffs(skiatest::Reporter* reporter) {
|
|
bool flipped = false;
|
|
for (size_t index = 0; index < oneOffs_count; ++index) {
|
|
const ConicPts& c = oneOffs[index].conic;
|
|
SkDConic conic;
|
|
conic.debugSet(c.fPts.fPts, c.fWeight);
|
|
SkASSERT(ValidConic(conic));
|
|
const SkDLine& line = oneOffs[index].line;
|
|
SkASSERT(ValidLine(line));
|
|
SkIntersections intersections;
|
|
int result = doIntersect(intersections, conic, line, flipped);
|
|
for (int inner = 0; inner < result; ++inner) {
|
|
double conicT = intersections[0][inner];
|
|
SkDPoint conicXY = conic.ptAtT(conicT);
|
|
double lineT = intersections[1][inner];
|
|
SkDPoint lineXY = line.ptAtT(lineT);
|
|
if (!conicXY.approximatelyEqual(lineXY)) {
|
|
conicXY.approximatelyEqual(lineXY);
|
|
SkDebugf("");
|
|
}
|
|
REPORTER_ASSERT(reporter, conicXY.approximatelyEqual(lineXY));
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_TEST(PathOpsConicLineIntersectionOneOff, reporter) {
|
|
testOneOffs(reporter);
|
|
}
|
|
|
|
DEF_TEST(PathOpsConicLineIntersection, reporter) {
|
|
for (size_t index = 0; index < lineConicTests_count; ++index) {
|
|
int iIndex = static_cast<int>(index);
|
|
const ConicPts& c = lineConicTests[index].conic;
|
|
SkDConic conic;
|
|
conic.debugSet(c.fPts.fPts, c.fWeight);
|
|
SkASSERT(ValidConic(conic));
|
|
const SkDLine& line = lineConicTests[index].line;
|
|
SkASSERT(ValidLine(line));
|
|
SkReduceOrder reducer;
|
|
SkPoint pts[3] = { conic.fPts.fPts[0].asSkPoint(), conic.fPts.fPts[1].asSkPoint(),
|
|
conic.fPts.fPts[2].asSkPoint() };
|
|
SkPoint reduced[3];
|
|
SkConic floatConic;
|
|
floatConic.set(pts, conic.fWeight);
|
|
SkPath::Verb order1 = SkReduceOrder::Conic(floatConic, reduced);
|
|
if (order1 != SkPath::kConic_Verb) {
|
|
SkDebugf("%s [%d] conic verb=%d\n", __FUNCTION__, iIndex, order1);
|
|
REPORTER_ASSERT(reporter, 0);
|
|
}
|
|
int order2 = reducer.reduce(line);
|
|
if (order2 < 2) {
|
|
SkDebugf("%s [%d] line order=%d\n", __FUNCTION__, iIndex, order2);
|
|
REPORTER_ASSERT(reporter, 0);
|
|
}
|
|
SkIntersections intersections;
|
|
bool flipped = false;
|
|
int result = doIntersect(intersections, conic, line, flipped);
|
|
REPORTER_ASSERT(reporter, result == lineConicTests[index].result);
|
|
if (intersections.used() <= 0) {
|
|
continue;
|
|
}
|
|
for (int pt = 0; pt < result; ++pt) {
|
|
double tt1 = intersections[0][pt];
|
|
REPORTER_ASSERT(reporter, tt1 >= 0 && tt1 <= 1);
|
|
SkDPoint t1 = conic.ptAtT(tt1);
|
|
double tt2 = intersections[1][pt];
|
|
REPORTER_ASSERT(reporter, tt2 >= 0 && tt2 <= 1);
|
|
SkDPoint t2 = line.ptAtT(tt2);
|
|
if (!t1.approximatelyEqual(t2)) {
|
|
SkDebugf("%s [%d,%d] x!= t1=%1.9g (%1.9g,%1.9g) t2=%1.9g (%1.9g,%1.9g)\n",
|
|
__FUNCTION__, iIndex, pt, tt1, t1.fX, t1.fY, tt2, t2.fX, t2.fY);
|
|
REPORTER_ASSERT(reporter, 0);
|
|
}
|
|
if (!t1.approximatelyEqual(lineConicTests[index].expected[0])
|
|
&& (lineConicTests[index].result == 1
|
|
|| !t1.approximatelyEqual(lineConicTests[index].expected[1]))) {
|
|
SkDebugf("%s t1=(%1.9g,%1.9g)\n", __FUNCTION__, t1.fX, t1.fY);
|
|
REPORTER_ASSERT(reporter, 0);
|
|
}
|
|
}
|
|
}
|
|
}
|