commit 3f9855293350bd1949855a6002943d3cef97a32f
author Ben Wagner <bungeman@google.com> Mon Oct 09 10:47:47 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 09 22:01:34 2017 +0000
tree d63b652f300cc9257f75b4b7ef0c19a688df04b4
parent 63fd760a37905c45d26fc3d49cac261fad1b4808

Small pathops cleanup.

Newer clang compiler produces the diagnostic

../../tests/PathOpsDebug.cpp:1349:44:
error: comparison of unsigned enum expression >= 0 is always true
[-Werror,-Wtautological-unsigned-enum-zero-compare]
        if (!firstOp && c->operand() && op >= 0) {

The check seems to be defending against bad values of SkPathOp, but
this now seems unnecessary. This also adds 'rdiff' to kPathOpStr for
future debugging.

Change-Id: I08e5ba77c56e519ce4d9ae89491f7ccd5eb7f944
Reviewed-on: https://skia-review.googlesource.com/57104
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

src/pathops/SkPathOpsDebug.cpp

diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index b3ca852..f13b958 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -42,7 +42,7 @@
 #endif
 
 #if DEBUG_ACTIVE_OP
-const char* SkPathOpsDebug::kPathOpStr[] = {"diff", "sect", "union", "xor"};
+const char* SkPathOpsDebug::kPathOpStr[] = {"diff", "sect", "union", "xor", "rdiff"};
 #endif
 
 #if defined SK_DEBUG || !FORCE_RELEASE

tests/PathOpsDebug.cpp

diff --git a/tests/PathOpsDebug.cpp b/tests/PathOpsDebug.cpp
index 49f730a..8324f37 100644
--- a/tests/PathOpsDebug.cpp
+++ b/tests/PathOpsDebug.cpp
@@ -1346,7 +1346,7 @@
     bool firstOp = false;
     const SkOpContour* c = this;
     do {
-        if (!firstOp && c->operand() && op >= 0) {
+        if (!firstOp && c->operand()) {
 #if DEBUG_ACTIVE_OP
             SkDebugf("op %s\n", SkPathOpsDebug::kPathOpStr[op]);
 #endif