More compiler warnings from gcc

mdboom · mdboom · commit f1c9c07bfd2c · 2015-10-20T15:37:11.000-04:00
diff --git a/lib/matplotlib/delaunay/VoronoiDiagramGenerator.cpp b/lib/matplotlib/delaunay/VoronoiDiagramGenerator.cpp
@@ -766,9 +766,8 @@ void VoronoiDiagramGenerator::out_vertex(struct Site *v)
 
 void VoronoiDiagramGenerator::out_site(struct Site *s)
 {
-    if(!triangulate & plot & !debug)
+    if(!triangulate && plot && !debug)
         circle (s->coord.x, s->coord.y, cradius);
-    
 }
 
 
@@ -932,7 +931,10 @@ bool VoronoiDiagramGenerator::voronoi(int triangulate)
 
     if(!retval)
         return false;
-    
+
+    newintstar.x = 0;
+    newintstar.y = 0;
+
     newsite = nextone();
     while(1)
     {
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -79,7 +79,7 @@ static PyObject *Py_points_in_path(PyObject *self, PyObject *args, PyObject *kwd
         return NULL;
     }
 
-    npy_intp dims[] = { points.size() };
+    npy_intp dims[] = { (npy_intp)points.size() };
     numpy::array_view<bool, 1> results(dims);
 
     CALL_CPP("points_in_path", (points_in_path(points, r, path, trans, results)));
@@ -138,7 +138,7 @@ static PyObject *Py_points_on_path(PyObject *self, PyObject *args, PyObject *kwd
         return NULL;
     }
 
-    npy_intp dims[] = { points.size() };
+    npy_intp dims[] = { (npy_intp)points.size() };
     numpy::array_view<bool, 1> results(dims);
 
     CALL_CPP("points_on_path", (points_on_path(points, r, path, trans, results)));
@@ -437,15 +437,15 @@ static PyObject *Py_affine_transform(PyObject *self, PyObject *args, PyObject *k
 
     try {
         numpy::array_view<double, 2> vertices(vertices_obj);
-        npy_intp dims[] = { vertices.size(), 2 };
+        npy_intp dims[] = { (npy_intp)vertices.size(), 2 };
         numpy::array_view<double, 2> result(dims);
         CALL_CPP("affine_transform", (affine_transform_2d(vertices, trans, result)));
         return result.pyobj();
     } catch (py::exception) {
         PyErr_Clear();
         try {
             numpy::array_view<double, 1> vertices(vertices_obj);
-            npy_intp dims[] = { vertices.size() };
+            npy_intp dims[] = { (npy_intp)vertices.size() };
             numpy::array_view<double, 1> result(dims);
             CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));
             return result.pyobj();

Original file line number	Diff line number	Diff line change
`@@ -766,9 +766,8 @@ void VoronoiDiagramGenerator::out_vertex(struct Site *v)`
`766`	`766`
`767`	`767`	`void VoronoiDiagramGenerator::out_site(struct Site *s)`
`768`	`768`	`{`
`769`		`- if(!triangulate & plot & !debug)`
	`769`	`+ if(!triangulate && plot && !debug)`
`770`	`770`	`circle (s->coord.x, s->coord.y, cradius);`
`771`		`-`
`772`	`771`	`}`
`773`	`772`
`774`	`773`
`@@ -932,7 +931,10 @@ bool VoronoiDiagramGenerator::voronoi(int triangulate)`
`932`	`931`
`933`	`932`	`if(!retval)`
`934`	`933`	`return false;`
`935`		`-`
	`934`	`+`
	`935`	`+ newintstar.x = 0;`
	`936`	`+ newintstar.y = 0;`
	`937`	`+`
`936`	`938`	`newsite = nextone();`
`937`	`939`	`while(1)`
`938`	`940`	`{`