aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar caryclark <caryclark@google.com>2015-08-17 10:01:23 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-17 10:01:24 -0700
commit6a91ad22a41cd5f5677d9adbfec851f6464f3f0e (patch)
treeddfa3d8ee7564b5cdc106b0b8f4f4561f888d925
parentf433bb2bebd441cc0b2b152e8fbf79eac43baf5d (diff)
remove unused code
R=mtklein@google.com Review URL: https://codereview.chromium.org/1297013002
-rw-r--r--src/pathops/SkPathOpsLine.cpp28
-rw-r--r--src/pathops/SkPathOpsLine.h3
-rw-r--r--tests/PathOpsCubicLineIntersectionTest.cpp2
-rw-r--r--tests/PathOpsDLineTest.cpp16
4 files changed, 0 insertions, 49 deletions
diff --git a/src/pathops/SkPathOpsLine.cpp b/src/pathops/SkPathOpsLine.cpp
index 70f2e12472..cad54eb263 100644
--- a/src/pathops/SkPathOpsLine.cpp
+++ b/src/pathops/SkPathOpsLine.cpp
@@ -6,34 +6,6 @@
*/
#include "SkPathOpsLine.h"
-// may have this below somewhere else already:
-// copying here because I thought it was clever
-
-// Copyright 2001, softSurfer (www.softsurfer.com)
-// This code may be freely used and modified for any purpose
-// providing that this copyright notice is included with it.
-// SoftSurfer makes no warranty for this code, and cannot be held
-// liable for any real or imagined damage resulting from its use.
-// Users of this code must verify correctness for their application.
-
-// Assume that a class is already given for the object:
-// Point with coordinates {float x, y;}
-//===================================================================
-
-// (only used by testing)
-// isLeft(): tests if a point is Left|On|Right of an infinite line.
-// Input: three points P0, P1, and P2
-// Return: >0 for P2 left of the line through P0 and P1
-// =0 for P2 on the line
-// <0 for P2 right of the line
-// See: the January 2001 Algorithm on Area of Triangles
-// return (float) ((P1.x - P0.x)*(P2.y - P0.y) - (P2.x - P0.x)*(P1.y - P0.y));
-double SkDLine::isLeft(const SkDPoint& pt) const {
- SkDVector p0 = fPts[1] - fPts[0];
- SkDVector p2 = pt - fPts[0];
- return p0.cross(p2);
-}
-
SkDPoint SkDLine::ptAtT(double t) const {
if (0 == t) {
return fPts[0];
diff --git a/src/pathops/SkPathOpsLine.h b/src/pathops/SkPathOpsLine.h
index ce502019ae..882dadc1f8 100644
--- a/src/pathops/SkPathOpsLine.h
+++ b/src/pathops/SkPathOpsLine.h
@@ -25,9 +25,6 @@ struct SkDLine {
static double ExactPointH(const SkDPoint& xy, double left, double right, double y);
static double ExactPointV(const SkDPoint& xy, double top, double bottom, double x);
- // only used by testing
- double isLeft(const SkDPoint& pt) const;
-
double nearPoint(const SkDPoint& xy, bool* unequal) const;
bool nearRay(const SkDPoint& xy) const;
static double NearPointH(const SkDPoint& xy, double left, double right, double y);
diff --git a/tests/PathOpsCubicLineIntersectionTest.cpp b/tests/PathOpsCubicLineIntersectionTest.cpp
index a1f1d9f4f2..a2b870d000 100644
--- a/tests/PathOpsCubicLineIntersectionTest.cpp
+++ b/tests/PathOpsCubicLineIntersectionTest.cpp
@@ -157,8 +157,6 @@ static void testOne(skiatest::Reporter* reporter, int iIndex) {
double cubicT = i[0][0];
SkDPoint prev = cubic.ptAtT(cubicT * 2 - 1);
SkDPoint sect = cubic.ptAtT(cubicT);
- double left[3] = { line.isLeft(prev), line.isLeft(sect), line.isLeft(cubic[3]) };
- SkDebugf("cubic=(%1.9g, %1.9g, %1.9g)\n", left[0], left[1], left[2]);
SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", prev.fX, prev.fY, sect.fX, sect.fY);
SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", sect.fX, sect.fY, cubic[3].fX, cubic[3].fY);
SkDPoint prevL = line.ptAtT(i[1][0] - 0.0000007);
diff --git a/tests/PathOpsDLineTest.cpp b/tests/PathOpsDLineTest.cpp
index bfad134f77..1e16002113 100644
--- a/tests/PathOpsDLineTest.cpp
+++ b/tests/PathOpsDLineTest.cpp
@@ -17,15 +17,6 @@ static const SkDLine tests[] = {
{{{3, 2}, {1, 1}}},
};
-static const SkDPoint left[] = {
- {2, 1},
- {1, 0},
- {1, 1},
- {1, 2},
- {2, 0},
- {2, 1}
-};
-
static const size_t tests_count = SK_ARRAY_COUNT(tests);
DEF_TEST(PathOpsLineUtilities, reporter) {
@@ -36,13 +27,6 @@ DEF_TEST(PathOpsLineUtilities, reporter) {
SkPoint pts[2] = {line[0].asSkPoint(), line[1].asSkPoint()};
line2.set(pts);
REPORTER_ASSERT(reporter, line[0] == line2[0] && line[1] == line2[1]);
- const SkDPoint& pt = left[index];
- SkASSERT(ValidPoint(pt));
- double result = line.isLeft(pt);
- if ((result <= 0 && index >= 1) || (result < 0 && index == 0)) {
- SkDebugf("%s [%d] expected left\n", __FUNCTION__, index);
- REPORTER_ASSERT(reporter, 0);
- }
SkDPoint mid = line.ptAtT(.5);
REPORTER_ASSERT(reporter, approximately_equal((line[0].fX + line[1].fX) / 2, mid.fX));
REPORTER_ASSERT(reporter, approximately_equal((line[0].fY + line[1].fY) / 2, mid.fY));