Use correct types for array sizes.

QuLogic · QuLogic · commit bd746cd359ff · 2018-02-16T21:03:55.000-05:00
diff --git a/lib/matplotlib/tri/_tri.cpp b/lib/matplotlib/tri/_tri.cpp
@@ -629,9 +629,9 @@ PyObject* TriContourGenerator::contour_to_segs_and_kinds(const Contour& contour)
     ContourLine::const_iterator point;
 
     // Find total number of points in all contour lines.
-    int n_points = 0;
+    npy_intp n_points = 0;
     for (line = contour.begin(); line != contour.end(); ++line)
-        n_points += line->size();
+        n_points += (npy_intp)line->size();
 
     // Create segs array for point coordinates.
     npy_intp segs_dims[2] = {n_points, 2};
@@ -1021,8 +1021,8 @@ TrapezoidMapTriFinder::add_edge_to_tree(const Edge& edge)
     // Iterate through trapezoids intersecting edge from left to right.
     // Replace each old trapezoid with 2+ new trapezoids, and replace its
     // corresponding nodes in the search tree with new nodes.
-    unsigned int ntraps = trapezoids.size();
-    for (unsigned int i = 0; i < ntraps; ++i) {
+    size_t ntraps = trapezoids.size();
+    for (size_t i = 0; i < ntraps; ++i) {
         Trapezoid* old = trapezoids[i];  // old trapezoid to replace.
         bool start_trap = (i == 0);
         bool end_trap = (i == ntraps-1);
@@ -1397,8 +1397,8 @@ TrapezoidMapTriFinder::initialize()
     std::random_shuffle(_edges.begin()+2, _edges.end(), rng);
 
     // Add edges, one at a time, to tree.
-    unsigned int nedges = _edges.size();
-    for (unsigned int index = 2; index < nedges; ++index) {
+    size_t nedges = _edges.size();
+    for (size_t index = 2; index < nedges; ++index) {
         if (!add_edge_to_tree(_edges[index]))
             throw std::runtime_error("Triangulation is invalid");
         _tree->assert_valid(index == nedges-1);
diff --git a/src/_path.h b/src/_path.h
@@ -1229,7 +1229,7 @@ int convert_to_string(PathIterator &path,
     }
 
     if (sketch_params.scale != 0.0) {
-        *buffersize *= 10.0;
+        *buffersize *= 10;
     }
 
     *buffer = (char *)malloc(*buffersize);
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -173,7 +173,7 @@ static PyObject *Py_write_png(PyObject *self, PyObject *args, PyObject *kwds)
 
     png_uint_32 width = (png_uint_32)buffer.dim(1);
     png_uint_32 height = (png_uint_32)buffer.dim(0);
-    int channels = buffer.dim(2);
+    npy_intp channels = buffer.dim(2);
     std::vector<png_bytep> row_pointers(height);
     for (png_uint_32 row = 0; row < (png_uint_32)height; ++row) {
         row_pointers[row] = (png_bytep)&buffer(row, 0, 0);

Original file line number	Diff line number	Diff line change
`@@ -1229,7 +1229,7 @@ int convert_to_string(PathIterator &path,`
`1229`	`1229`	`}`
`1230`	`1230`
`1231`	`1231`	`if (sketch_params.scale != 0.0) {`
`1232`		`- buffersize = 10.0;`
	`1232`	`+ buffersize = 10;`
`1233`	`1233`	`}`
`1234`	`1234`
`1235`	`1235`	`buffer = (char )malloc(*buffersize);`