Merge pull request #4206 from mdboom/cpp-warnings

WeatherGod · WeatherGod · commit d204c64ec1ef · 2015-03-09T13:30:11.000-04:00
Fix C++ warnings from latest clang-analyzer
diff --git a/lib/matplotlib/delaunay/natneighbors.cpp b/lib/matplotlib/delaunay/natneighbors.cpp
@@ -289,7 +289,6 @@ void NaturalNeighbors::interpolate_unstructured(double *z, int size,
     int i, tri1, tri2;
 
     tri1 = 0;
-    tri2 = 0;
     for (i=0; i<size; i++) {
         tri2 = tri1;
         output[i] = interpolate_one(z, intx[i], inty[i], defvalue, tri2);
diff --git a/src/cntr.c b/src/cntr.c
@@ -715,16 +715,14 @@ slit_cutter (Csite * site, int up, int pass2)
     double *ycp = pass2 ? site->ycp : 0;
     short *kcp = pass2 ? site->kcp : 0;
 
-    if (up)
+    if (up && pass2)
     {
         /* upward stroke of slit proceeds up left side of slit until
          * it hits a boundary or a point not between the contour levels
          * -- this never happens on the first pass */
         long p1 = site->edge;
         int z1;
 
-        assert(pass2);
-
         for (;;)
         {
             z1 = data[p1] & Z_VALUE;
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -495,7 +495,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
 
     PyObject *pyobj()
     {
-        Py_INCREF(m_arr);
+        Py_XINCREF(m_arr);
         return (PyObject *)m_arr;
     }
 
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -119,7 +119,7 @@ int convert_cap(PyObject *capobj, void *capp)
 {
     const char *names[] = {"butt", "round", "projecting", NULL};
     int values[] = {agg::butt_cap, agg::round_cap, agg::square_cap};
-    int result;
+    int result = agg::butt_cap;
 
     if (!convert_string_enum(capobj, "capstyle", names, values, &result)) {
         return 0;
@@ -133,7 +133,7 @@ int convert_join(PyObject *joinobj, void *joinp)
 {
     const char *names[] = {"miter", "round", "bevel", NULL};
     int values[] = {agg::miter_join_revert, agg::round_join, agg::bevel_join};
-    int result;
+    int result = agg::miter_join_revert;
 
     if (!convert_string_enum(joinobj, "joinstyle", names, values, &result)) {
         return 0;

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`495`	`495`
`496`	`496`	`PyObject *pyobj()`
`497`	`497`	`{`
`498`		`- Py_INCREF(m_arr);`
	`498`	`+ Py_XINCREF(m_arr);`
`499`	`499`	`return (PyObject *)m_arr;`
`500`	`500`	`}`
`501`	`501`