Merge pull request #1434 from mgiuca-google/c++-11-narrowing

ianthomas23 · ianthomas23 · commit c63f671d1385 · 2012-11-04T07:12:31.000-08:00
C++11 narrowing conversions
diff --git a/lib/matplotlib/tri/_tri.cpp b/lib/matplotlib/tri/_tri.cpp
@@ -277,7 +277,7 @@ void Triangulation::calculate_edges()
     }
 
     // Convert to python _edges array.
-    npy_intp dims[2] = {edge_set.size(), 2};
+    npy_intp dims[2] = {static_cast<npy_intp>(edge_set.size()), 2};
     _edges = (PyArrayObject*)PyArray_SimpleNew(2, dims, PyArray_INT);
     int* edges_ptr = (int*)PyArray_DATA(_edges);
     for (EdgeSet::const_iterator it = edge_set.begin(); it != edge_set.end(); ++it) {
@@ -571,7 +571,7 @@ Py::Object TriContourGenerator::contour_to_segs(const Contour& contour)
     Py::List segs(contour.size());
     for (Contour::size_type i = 0; i < contour.size(); ++i) {
         const ContourLine& line = contour[i];
-        npy_intp dims[2] = {line.size(),2};
+        npy_intp dims[2] = {static_cast<npy_intp>(line.size()),2};
         PyArrayObject* py_line = (PyArrayObject*)PyArray_SimpleNew(
                                                      2, dims, PyArray_DOUBLE);
         double* p = (double*)PyArray_DATA(py_line);
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -1353,7 +1353,7 @@ _add_polygon(Py::List& polygons, const std::vector<double>& polygon)
     {
         return;
     }
-    npy_intp polygon_dims[] = { polygon.size() / 2, 2, 0 };
+    npy_intp polygon_dims[] = { static_cast<npy_intp>(polygon.size() / 2), 2, 0 };
     PyArrayObject* polygon_array = NULL;
     polygon_array = (PyArrayObject*)PyArray_SimpleNew
                     (2, polygon_dims, PyArray_DOUBLE);

Original file line number	Diff line number	Diff line change
`@@ -1353,7 +1353,7 @@ _add_polygon(Py::List& polygons, const std::vector<double>& polygon)`
`1353`	`1353`	`{`
`1354`	`1354`	`return;`
`1355`	`1355`	`}`
`1356`		`- npy_intp polygon_dims[] = { polygon.size() / 2, 2, 0 };`
	`1356`	`+ npy_intp polygon_dims[] = { static_cast<npy_intp>(polygon.size() / 2), 2, 0 };`
`1357`	`1357`	`PyArrayObject* polygon_array = NULL;`
`1358`	`1358`	`polygon_array = (PyArrayObject*)PyArray_SimpleNew`
`1359`	`1359`	`(2, polygon_dims, PyArray_DOUBLE);`