xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: dont increment these pointers conditionally

Browse Source
This commit is contained in:
Hannes Janetzek 2013-01-12 18:02:25 +01:00
parent dabfe680a9
commit 41810529af
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jni/TriangleJni.c
View File

@ -61,12 +61,10 @@ jint Java_org_quake_triangle_TriangleJNI_triangulate(JNIEnv *env, jclass c,
float y = *i_points++; float y = *i_points++;
float *j_points = i_points; float *j_points = i_points;
for (j = i + 1; j < num_points; j++) for (j = i + 1; j < num_points; j++, j_points += 2)
{ {
if (*j_points++ == x && *j_points++ == y) if ((*j_points == x) && (*(j_points+1) == y))
{ {
snprintf(buf, 128, "\ninavlid polygon: duplicate points at %d, %d:\n", i, j);
mylog(buf);
invalid = 1; invalid = 1;
break; break;
} }
@ -75,6 +73,9 @@ jint Java_org_quake_triangle_TriangleJNI_triangulate(JNIEnv *env, jclass c,
if (invalid) if (invalid)
{ {
snprintf(buf, 128, "\ninavlid polygon: duplicate points at %d, %d:\n", i-1, j);
mylog(buf);
for (i = 0; i < num_points; i++) { for (i = 0; i < num_points; i++) {
snprintf(buf, 128, "%d point: %f, %f\n", i, points[i*2], points[i*2+1]); snprintf(buf, 128, "%d point: %f, %f\n", i, points[i*2], points[i*2+1]);
mylog(buf); mylog(buf);