added glcompfont

diff --git a/lib/glcomp/glcompbutton.c b/lib/glcomp/glcompbutton.c
index 4ed6c45e22032894981c55690f516c1c0166c096..76e4d344b0af5c8815f53896fbe782cb2d6e4c95 100644 (file)
--- a/lib/glcomp/glcompbutton.c
+++ b/lib/glcomp/glcompbutton.c
@@ -17,7 +17,7 @@
 #include "glcompbutton.h"
 #include "glcomplabel.h"
 #include "glcompimage.h"
-#include "glCompFont.h"
+#include "glcompfont.h"
 #include "glutils.h"
 #include "glcompset.h"
 #include <string.h>

diff --git a/lib/pathplan/shortest.c b/lib/pathplan/shortest.c
index 425567febfbbfdc2b5bed78e67ccc5854f0afb2e..1da98f7eafce63ba18c76dae54c02f714915e869 100644 (file)
--- a/lib/pathplan/shortest.c
+++ b/lib/pathplan/shortest.c
@@ -295,21 +295,25 @@ static void triangulate(pointnlink_t ** pnlps, int pnln)
 {
     int pnli, pnlip1, pnlip2;
 
-    if (pnln > 3) {
-       for (pnli = 0; pnli < pnln; pnli++) {
-           pnlip1 = (pnli + 1) % pnln;
-           pnlip2 = (pnli + 2) % pnln;
-           if (isdiagonal(pnli, pnlip2, pnlps, pnln)) {
-               loadtriangle(pnlps[pnli], pnlps[pnlip1], pnlps[pnlip2]);
-               for (pnli = pnlip1; pnli < pnln - 1; pnli++)
-                   pnlps[pnli] = pnlps[pnli + 1];
-               triangulate(pnlps, pnln - 1);
-               return;
-           }
-       }
-       abort();
-    } else
-       loadtriangle(pnlps[0], pnlps[1], pnlps[2]);
+       if (pnln > 3) 
+       {
+               for (pnli = 0; pnli < pnln; pnli++) 
+               {
+                       pnlip1 = (pnli + 1) % pnln;
+                       pnlip2 = (pnli + 2) % pnln;
+                       if (isdiagonal(pnli, pnlip2, pnlps, pnln)) 
+                       {
+                               loadtriangle(pnlps[pnli], pnlps[pnlip1], pnlps[pnlip2]);
+                               for (pnli = pnlip1; pnli < pnln - 1; pnli++)
+                                       pnlps[pnli] = pnlps[pnli + 1];
+                               triangulate(pnlps, pnln - 1);
+                               return;
+                       }
+               }
+               abort();
+    } 
+       else
+               loadtriangle(pnlps[0], pnlps[1], pnlps[2]);
 }
 
 /* check if (i, i + 2) is a diagonal */