Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f1c9c07

Browse filesBrowse files
committed
More compiler warnings from gcc
1 parent 2f2d79f commit f1c9c07
Copy full SHA for f1c9c07

File tree

Expand file treeCollapse file tree

2 files changed

+9
-7
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+9
-7
lines changed

‎lib/matplotlib/delaunay/VoronoiDiagramGenerator.cpp

Copy file name to clipboardExpand all lines: lib/matplotlib/delaunay/VoronoiDiagramGenerator.cpp
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -766,9 +766,8 @@ void VoronoiDiagramGenerator::out_vertex(struct Site *v)
766766

767767
void VoronoiDiagramGenerator::out_site(struct Site *s)
768768
{
769-
if(!triangulate & plot & !debug)
769+
if(!triangulate && plot && !debug)
770770
circle (s->coord.x, s->coord.y, cradius);
771-
772771
}
773772

774773

@@ -932,7 +931,10 @@ bool VoronoiDiagramGenerator::voronoi(int triangulate)
932931

933932
if(!retval)
934933
return false;
935-
934+
935+
newintstar.x = 0;
936+
newintstar.y = 0;
937+
936938
newsite = nextone();
937939
while(1)
938940
{

‎src/_path_wrapper.cpp

Copy file name to clipboardExpand all lines: src/_path_wrapper.cpp
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static PyObject *Py_points_in_path(PyObject *self, PyObject *args, PyObject *kwd
7979
return NULL;
8080
}
8181

82-
npy_intp dims[] = { points.size() };
82+
npy_intp dims[] = { (npy_intp)points.size() };
8383
numpy::array_view<bool, 1> results(dims);
8484

8585
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
138138
return NULL;
139139
}
140140

141-
npy_intp dims[] = { points.size() };
141+
npy_intp dims[] = { (npy_intp)points.size() };
142142
numpy::array_view<bool, 1> results(dims);
143143

144144
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
437437

438438
try {
439439
numpy::array_view<double, 2> vertices(vertices_obj);
440-
npy_intp dims[] = { vertices.size(), 2 };
440+
npy_intp dims[] = { (npy_intp)vertices.size(), 2 };
441441
numpy::array_view<double, 2> result(dims);
442442
CALL_CPP("affine_transform", (affine_transform_2d(vertices, trans, result)));
443443
return result.pyobj();
444444
} catch (py::exception) {
445445
PyErr_Clear();
446446
try {
447447
numpy::array_view<double, 1> vertices(vertices_obj);
448-
npy_intp dims[] = { vertices.size() };
448+
npy_intp dims[] = { (npy_intp)vertices.size() };
449449
numpy::array_view<double, 1> result(dims);
450450
CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));
451451
return result.pyobj();

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.