diff options
| author | Stefan Wildemann <gta04@metalstrolche.de> | 2020-01-24 20:33:49 +0100 |
|---|---|---|
| committer | Stefan Wildemann <gta04@metalstrolche.de> | 2020-01-24 20:33:49 +0100 |
| commit | 1492a2ffac583f16c10d91b014d71584298ab222 (patch) | |
| tree | cfbe06107c667e58a718b16a2b4eadae743f6488 | |
| parent | b911074c6b864283b8715bd939d2712736c7acd3 (diff) | |
| download | navit-android_holes_check.tar.gz | |
Explicit decisionsandroid_holes_check
| -rw-r--r-- | navit/graphics/android/graphics_android.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c index 56afec491..ccc929432 100644 --- a/navit/graphics/android/graphics_android.c +++ b/navit/graphics/android/graphics_android.c @@ -327,7 +327,7 @@ static inline int is_clockwise (struct point * p, int count) { /* copy over vertexes to the jni array. Allows to reverse the polygon */ static int add_vertex_to_java_array(struct point * p, int count, jint * j_p, int reverse) { int i; - if(reverse) { + if(reverse > 0) { for(i=0; i < count; i ++) { j_p[i*2]=p[(count -1) -i].x; j_p[i*2+1]=p[(count -1) -i].y; @@ -372,7 +372,7 @@ static void draw_polygon_with_holes (struct graphics_priv *gra, struct graphics_ j_p = g_malloc(sizeof(jint) * java_p_size); /* add outer polygon to java array. Ensure it's clockwise */ - add_vertex_to_java_array(p, count, j_p, !is_clockwise(p, count)); + add_vertex_to_java_array(p, count, j_p, (is_clockwise(p, count) > 0)? 0: 1); /* get java array for ccount */ java_ccount_size = hole_count; @@ -392,8 +392,8 @@ static void draw_polygon_with_holes (struct graphics_priv *gra, struct graphics_ /* remember this holes ccount */ j_ccount[i] = ccount[i] * 2; /* add inner polygon. ensure its counter clockwise */ - j_holes_used += add_vertex_to_java_array(holes[i], ccount[i], &(j_holes[j_holes_used]), is_clockwise(holes[i], - ccount[i])); + j_holes_used += add_vertex_to_java_array(holes[i], ccount[i], &(j_holes[j_holes_used]), (is_clockwise(holes[i], + ccount[i]) <= 0)? 0: 1); } /* attach the arrays with their storage to the JVM */ |