Merge remote-tracking branch 'origin/master'

Author: speps

LibTessDotNet/Sources/Geom.cs

@@ -198,9 +198,9 @@ public static float Interpolate(float a, float x, float b, float y)
                     : (y + (x-y) * (b/(a+b))));
         }
 
-        static void Swap<T>(ref T a, ref T b)
+        static void Swap(ref MeshUtils.Vertex a, ref MeshUtils.Vertex b)
         {
-            T tmp = a;
+            var tmp = a;
             a = b;
             b = tmp;
         }

LibTessDotNet/Sources/PriorityQueue.cs

@@ -65,9 +65,10 @@ class StackItem
         {
             internal int p, r;
         };
-        void Swap<T>(ref T a, ref T b)
+
+        static void Swap(ref int a, ref int b)
         {
-            T tmp = a;
+            int tmp = a;
             a = b;
             b = tmp;
         }

LibTessDotNet/Sources/Tess.cs

@@ -567,8 +567,9 @@ private void OutputContours()
                 vertCount = 0;
                 start = edge = f._anEdge;
                 do {
-                    _vertices[vertIndex++].Position = edge._Org._coords;
-                    _vertices[vertIndex++].Data = edge._Org._data;
+                    _vertices[vertIndex].Position = edge._Org._coords;
+                    _vertices[vertIndex].Data = edge._Org._data;
+                    ++vertIndex;
                     ++vertCount;
                     edge = edge._Lnext;
                 } while (edge != start);