commit 1ad545d207db840d0e403569ce214431eead4217
author Derek Sollenberger <djsollen@google.com> Thu Aug 20 14:23:14 2015 -0400
committer Derek Sollenberger <djsollen@google.com> Thu Aug 20 14:27:10 2015 -0400
tree 4cc9b9c82734c57071a3d607a4c5d6734c0ebb87
parent e4a6f925621e9360238869ae28f7df1b4c2d97de

Fix path direction enum to match native SkPath values

Change-Id: I4010e400cef0baf6dd23d7f7e837a2bfb7154059

core/jni/android/graphics/Path.cpp

diff --git a/core/jni/android/graphics/Path.cpp b/core/jni/android/graphics/Path.cpp
index f7b5dc2..dbd7c89 100644
--- a/core/jni/android/graphics/Path.cpp
+++ b/core/jni/android/graphics/Path.cpp
@@ -519,6 +519,9 @@
 
 int register_android_graphics_Path(JNIEnv* env) {
     return RegisterMethodsOrDie(env, "android/graphics/Path", methods, NELEM(methods));
+
+    static_assert(0  == SkPath::kCW_Direction,  "direction_mismatch");
+    static_assert(1  == SkPath::kCCW_Direction, "direction_mismatch");
 }
 
 }

graphics/java/android/graphics/Path.java

diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java
index 0e9823d..91e704a 100644
--- a/graphics/java/android/graphics/Path.java
+++ b/graphics/java/android/graphics/Path.java
@@ -486,9 +486,9 @@
      */
     public enum Direction {
         /** clockwise */
-        CW  (1),    // must match enum in SkPath.h
+        CW  (0),    // must match enum in SkPath.h
         /** counter-clockwise */
-        CCW (2);    // must match enum in SkPath.h
+        CCW (1);    // must match enum in SkPath.h
 
         Direction(int ni) {
             nativeInt = ni;