Minor C++ improvements

mdboom · mdboom · commit 7ac0f2bab22e · 2014-10-28T12:08:52.000-04:00
diff --git a/src/cntr.c b/src/cntr.c
@@ -717,6 +717,8 @@ slit_cutter (Csite * site, int up, int pass2)
 
     if (up)
     {
+        assert(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 */
@@ -1406,7 +1408,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 +2031,3 @@ init_cntr(void)
         return m;
     #endif
 }
-
-
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -68,16 +68,13 @@ void FT2Image::resize(long width, long height)
             delete[] m_buffer;
             m_buffer = NULL;
             m_buffer = new unsigned char[numBytes];
+            memset(m_buffer, 0, numBytes);
         }
 
         m_width = (unsigned long)width;
         m_height = (unsigned long)height;
     }
 
-    if (numBytes) {
-        memset(m_buffer, 0, numBytes);
-    }
-
     m_dirty = true;
 }
 
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -425,6 +425,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 +441,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 = 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 = result;
+
     return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,16 +68,13 @@ void FT2Image::resize(long width, long height)`
`68`	`68`	`delete[] m_buffer;`
`69`	`69`	`m_buffer = NULL;`
`70`	`70`	`m_buffer = new unsigned char[numBytes];`
	`71`	`+ memset(m_buffer, 0, numBytes);`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`m_width = (unsigned long)width;`
`74`	`75`	`m_height = (unsigned long)height;`
`75`	`76`	`}`
`76`	`77`
`77`		`- if (numBytes) {`
`78`		`- memset(m_buffer, 0, numBytes);`
`79`		`- }`
`80`		`-`
`81`	`78`	`m_dirty = true;`
`82`	`79`	`}`
`83`	`80`