From 0a86820f2fe3b62f2a5ac2917a1ef342dbe53722 Mon Sep 17 00:00:00 2001 From: Stan Iliev Date: Fri, 16 Mar 2018 21:01:09 +0000 Subject: Revert "fix nextContour bug" This reverts commit 473f69276f1854db80e094cc4af091f7f8a5b00b. 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 > Commit-Queue: Mike Reed 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 Commit-Queue: Stan Iliev --- src/core/SkPathMeasure.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/SkPathMeasure.cpp b/src/core/SkPathMeasure.cpp index 4fb18934d9..cdcd164018 100644 --- a/src/core/SkPathMeasure.cpp +++ b/src/core/SkPathMeasure.cpp @@ -667,7 +667,7 @@ bool SkPathMeasure::getSegment(SkScalar startD, SkScalar stopD, SkPath* dst, } bool SkPathMeasure::isClosed() { - (void)this->getLength(); // make sure we measure the current contour + (void)this->getLength(); return fIsClosed; } @@ -675,8 +675,7 @@ bool SkPathMeasure::isClosed() { we're done with the path. */ bool SkPathMeasure::nextContour() { - (void)this->getLength(); // make sure we measure the current contour - fLength = -1; // now signal that we should build the next set of segments + fLength = -1; return this->getLength() > 0; } -- cgit v1.2.3