Merge pull request matplotlib#3691 from mdboom/more-cpp-cleanup

jenshnielsen · jenshnielsen · commit ed9538278501 · 2014-10-28T19:04:26.000Z
Minor C++ improvements
diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp
@@ -31,6 +31,12 @@
 #include "pprdrv.h"
 #include "truetype.h"
 #include <sstream>
+#ifdef _POSIX_C_SOURCE
+#    undef _POSIX_C_SOURCE
+#endif
+#ifdef _XOPEN_SOURCE
+#    undef _XOPEN_SOURCE
+#endif
 #include <Python.h>
 
 /*==========================================================================
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -670,10 +670,7 @@ extern "C" {
 
 struct module_state
 {
-/* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
     int _dummy;
-#endif
 };
 
 #if PY3K
diff --git a/src/_gtkagg.cpp b/src/_gtkagg.cpp
@@ -110,10 +110,7 @@ extern "C" {
 
     struct module_state
     {
-        /* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
         int _dummy;
-#endif
     };
 
 #if PY3K
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -722,10 +722,7 @@ extern "C" {
 
 struct module_state
 {
-/* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
     int _dummy;
-#endif
 };
 
 #if PY3K
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -669,10 +669,7 @@ extern "C" {
 
     struct module_state
     {
-        /* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
         int _dummy;
-#endif
     };
 
 #if PY3K
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -490,10 +490,7 @@ extern "C" {
 
     struct module_state
     {
-        /* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
         int _dummy;
-#endif
     };
 
 #if PY3K
diff --git a/src/cntr.c b/src/cntr.c
@@ -722,6 +722,9 @@ slit_cutter (Csite * site, int up, int pass2)
          * -- this never happens on the first pass */
         long p1 = site->edge;
         int z1;
+
+        assert(pass2);
+
         for (;;)
         {
             z1 = data[p1] & Z_VALUE;
@@ -1406,7 +1409,11 @@ int reorder(double *xpp, double *ypp, short *kpp,
 
     /* Find the subpaths as sets of connected segments. */
 
-    subp = (int *)malloc(nsegs * sizeof(int));
+    if (nsegs) {
+        subp = (int *)malloc(nsegs * sizeof(int));
+    } else {
+        subp = NULL;
+    }
     for (i=0; i<nsegs; i++) subp[i] = -1;
 
     nsp = 0;
@@ -2025,5 +2032,3 @@ init_cntr(void)
         return m;
     #endif
 }
-
-
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -74,7 +74,7 @@ void FT2Image::resize(long width, long height)
         m_height = (unsigned long)height;
     }
 
-    if (numBytes) {
+    if (numBytes && m_buffer) {
         memset(m_buffer, 0, numBytes);
     }
 
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -1618,10 +1618,7 @@ extern "C" {
 
 struct module_state
 {
-/* The Sun compiler can't handle empty structs */
-#if defined(__SUNPRO_C) || defined(_MSC_VER)
     int _dummy;
-#endif
 };
 
 #if PY3K
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -11,6 +11,13 @@ typedef unsigned __int8   uint8_t;
 #include <stdint.h>
 #endif
 
+#ifdef _POSIX_C_SOURCE
+#    undef _POSIX_C_SOURCE
+#endif
+#ifdef _XOPEN_SOURCE
+#    undef _XOPEN_SOURCE
+#endif
+
 #include <Python.h>
 
 #if PY_MAJOR_VERSION >= 3
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -18,6 +18,13 @@
 
 #include <complex>
 
+#ifdef _POSIX_C_SOURCE
+#    undef _POSIX_C_SOURCE
+#endif
+#ifdef _XOPEN_SOURCE
+#    undef _XOPEN_SOURCE
+#endif
+
 #include <Python.h>
 #include <numpy/ndarrayobject.h>
 
@@ -317,39 +324,6 @@ class array_view_accessors<AV, T, 3>
 
 };
 
-    // /* These are converter functions designed for use with the "O&"
-    //    functionality of PyArg_ParseTuple and friends. */
-
-    // template<class T>
-    // class array_converter {
-    // public:
-    //     int operator()(PyObject *obj, void *arrp)
-    //     {
-    //         T *arr = (T *)arrp;
-
-    //         if (!arr->set(obj)) {
-    //             return 0;
-    //         }
-
-    //         return 1;
-    //     }
-    // };
-
-    // template <class T>
-    // class array_converter_contiguous {
-    // public:
-    //     int operator()(PyObject *obj, void *arrp)
-    //     {
-    //         T *arr = (T *)arrp;
-
-    //         if (!arr->set(obj, true)) {
-    //             return 0;
-    //         }
-
-    //         return 1;
-    //     }
-    // };
-
 }
 
 static npy_intp zeros[] = { 0, 0, 0 };
@@ -425,6 +399,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
         PyArrayObject *tmp;
 
         if (arr == NULL || arr == Py_None) {
+            Py_XDECREF(m_arr);
             m_arr = NULL;
             m_data = NULL;
             m_shape = zeros;
@@ -440,6 +415,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
             }
 
             if (PyArray_NDIM(tmp) == 0 || PyArray_DIM(tmp, 0) == 0) {
+                Py_XDECREF(m_arr);
                 m_arr = NULL;
                 m_data = NULL;
                 m_shape = zeros;
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -493,16 +493,14 @@ int convert_offset_position(PyObject *obj, void *offsetp)
     e_offset_position *offset = (e_offset_position *)offsetp;
     const char *names[] = {"data", NULL};
     int values[] = {OFFSET_POSITION_DATA};
-    int result;
-
-    *offset = OFFSET_POSITION_FIGURE;
+    int result = (int)OFFSET_POSITION_FIGURE;
 
-    if (convert_string_enum(obj, "offset_position", names, values, &result)) {
-        *offset = (e_offset_position)result;
-    } else {
+    if (!convert_string_enum(obj, "offset_position", names, values, &result)) {
         PyErr_Clear();
     }
 
+    *offset = (e_offset_position)result;
+
     return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -670,10 +670,7 @@ extern "C" {`
`670`	`670`
`671`	`671`	`struct module_state`
`672`	`672`	`{`
`673`		`-/* The Sun compiler can't handle empty structs */`
`674`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`675`	`673`	`int _dummy;`
`676`		`-#endif`
`677`	`674`	`};`
`678`	`675`
`679`	`676`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,7 @@ extern "C" {`
`110`	`110`
`111`	`111`	`struct module_state`
`112`	`112`	`{`
`113`		`- /* The Sun compiler can't handle empty structs */`
`114`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`115`	`113`	`int _dummy;`
`116`		`-#endif`
`117`	`114`	`};`
`118`	`115`
`119`	`116`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -722,10 +722,7 @@ extern "C" {`
`722`	`722`
`723`	`723`	`struct module_state`
`724`	`724`	`{`
`725`		`-/* The Sun compiler can't handle empty structs */`
`726`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`727`	`725`	`int _dummy;`
`728`		`-#endif`
`729`	`726`	`};`
`730`	`727`
`731`	`728`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -669,10 +669,7 @@ extern "C" {`
`669`	`669`
`670`	`670`	`struct module_state`
`671`	`671`	`{`
`672`		`- /* The Sun compiler can't handle empty structs */`
`673`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`674`	`672`	`int _dummy;`
`675`		`-#endif`
`676`	`673`	`};`
`677`	`674`
`678`	`675`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -490,10 +490,7 @@ extern "C" {`
`490`	`490`
`491`	`491`	`struct module_state`
`492`	`492`	`{`
`493`		`- /* The Sun compiler can't handle empty structs */`
`494`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`495`	`493`	`int _dummy;`
`496`		`-#endif`
`497`	`494`	`};`
`498`	`495`
`499`	`496`	`#if PY3K`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void FT2Image::resize(long width, long height)`
`74`	`74`	`m_height = (unsigned long)height;`
`75`	`75`	`}`
`76`	`76`
`77`		`- if (numBytes) {`
	`77`	`+ if (numBytes && m_buffer) {`
`78`	`78`	`memset(m_buffer, 0, numBytes);`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -1618,10 +1618,7 @@ extern "C" {`
`1618`	`1618`
`1619`	`1619`	`struct module_state`
`1620`	`1620`	`{`
`1621`		`-/* The Sun compiler can't handle empty structs */`
`1622`		`-#if defined(__SUNPRO_C) \|\| defined(_MSC_VER)`
`1623`	`1621`	`int _dummy;`
`1624`		`-#endif`
`1625`	`1622`	`};`
`1626`	`1623`
`1627`	`1624`	`#if PY3K`