Merge pull request #206 from damonkohler/work2

Fixes compile error in Triangulate.

android_15/src/org/ros/android/view/visualization/layer/PointCloud2DLayer.java

@@ -101,10 +101,10 @@ public class PointCloud2DLayer extends SubscriberLayer<PointCloud2> implements T
     Preconditions.checkArgument(pointCloud.getFields().get(2).getDatatype() == PointField.FLOAT32);
     Preconditions.checkArgument(pointCloud.getPointStep() == 16);
     Preconditions.checkArgument(pointCloud.getData().order().equals(ByteOrder.LITTLE_ENDIAN));
-    final int numVertices = (pointCloud.getRowStep() / pointCloud.getPointStep() +
+    final int size = (pointCloud.getRowStep() / pointCloud.getPointStep() +
         1 /* triangle fan origin */) * 3 /* x, y, z */;
-    if (vertexBackBuffer == null || vertexBackBuffer.capacity() < numVertices) {
-      vertexBackBuffer = Vertices.allocateBuffer(numVertices);
+    if (vertexBackBuffer == null || vertexBackBuffer.capacity() < size) {
+      vertexBackBuffer = Vertices.allocateBuffer(size);
     }
     vertexBackBuffer.clear();
     // We start with the origin of the triangle fan.

android_15/src/org/ros/android/view/visualization/shape/Triangulate.java

@@ -117,7 +117,7 @@ public class Triangulate {
         m++;
 
         // Remove v from remaining polygon.
-        for (int s = v, int t = v + 1; t < nv; s++, t++) {
+        for (int s = v, t = v + 1; t < nv; s++, t++) {
           V[s] = V[t];
         }
         nv--;