Merge branch 'v1.5.x' into v2.0.x

mdboom · mdboom · commit 9d61a673453b · 2015-11-02T08:14:15.000-05:00
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -26,7 +26,7 @@
 
 import threading
 import numpy as np
-
+from math import radians, cos, sin
 from matplotlib import verbose, rcParams
 from matplotlib.backend_bases import (RendererBase, FigureManagerBase,
                                       FigureCanvasBase)
@@ -173,10 +173,10 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
         ox, oy, width, height, descent, font_image, used_characters = \
             self.mathtext_parser.parse(s, self.dpi, prop)
 
-        xd = descent * np.sin(np.deg2rad(angle))
-        yd = descent * np.cos(np.deg2rad(angle))
-        x = np.round(x + ox + xd)
-        y = np.round(y - oy + yd)
+        xd = descent * sin(radians(angle))
+        yd = descent * cos(radians(angle))
+        x = round(x + ox + xd)
+        y = round(y - oy + yd)
         self._renderer.draw_text_image(font_image, x, y + 1, angle, gc)
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
@@ -204,12 +204,12 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         xo, yo = font.get_bitmap_offset()
         xo /= 64.0
         yo /= 64.0
-        xd = -d * np.sin(np.deg2rad(angle))
-        yd = d * np.cos(np.deg2rad(angle))
+        xd = -d * sin(radians(angle))
+        yd = d * cos(radians(angle))
 
         #print x, y, int(x), int(y), s
         self._renderer.draw_text_image(
-            font, np.round(x - xd + xo), np.round(y + yd + yo) + 1, angle, gc)
+            font, round(x - xd + xo), round(y + yd + yo) + 1, angle, gc)
 
     def get_text_width_height_descent(self, s, prop, ismath):
         """
@@ -254,10 +254,10 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
         Z = np.array(Z * 255.0, np.uint8)
 
         w, h, d = self.get_text_width_height_descent(s, prop, ismath)
-        xd = d * np.sin(np.deg2rad(angle))
-        yd = d * np.cos(np.deg2rad(angle))
-        x = np.round(x + xd)
-        y = np.round(y + yd)
+        xd = d * sin(radians(angle))
+        yd = d * cos(radians(angle))
+        x = round(x + xd)
+        y = round(y + yd)
 
         self._renderer.draw_text_image(Z, x, y, angle, gc)
 
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -177,8 +177,8 @@ static PyObject *PyImage_color_conv(PyImage *self, PyObject *args, PyObject *kwd
                      free(buff));
 
     PyObject *result = PyByteArray_FromStringAndSize((const char *)buff, size);
+    free(buff);
     if (result == NULL) {
-        free(buff);
         return NULL;
     }
 
diff --git a/src/_path.h b/src/_path.h
@@ -1136,7 +1136,6 @@ int convert_to_string(PathIterator &path,
 
     *buffersize = path.total_vertices() * (precision + 5) * 4;
     if (*buffersize == 0) {
-        *buffer = NULL;
         return 0;
     }
 
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -638,8 +638,9 @@ static PyObject *Py_convert_to_string(PyObject *self, PyObject *args, PyObject *
     PyObject *codesobj;
     char *codes[5];
     int postfix;
-    char *buffer;
+    char *buffer = NULL;
     size_t buffersize;
+    PyObject *result;
     int status;
 
     if (!PyArg_ParseTuple(args,
@@ -702,10 +703,14 @@ static PyObject *Py_convert_to_string(PyObject *self, PyObject *args, PyObject *
     }
 
     if (buffersize == 0) {
-        return PyBytes_FromString("");
+        result = PyBytes_FromString("");
     } else {
-        return PyBytes_FromStringAndSize(buffer, buffersize);
+        result = PyBytes_FromStringAndSize(buffer, buffersize);
     }
+
+    free(buffer);
+
+    return result;
 }
 
 extern "C" {
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -1053,6 +1053,8 @@ static PyObject *PyFT2Font_get_name_index(PyFT2Font *self, PyObject *args, PyObj
 
     CALL_CPP("get_name_index", name_index = self->x->get_name_index(glyphname));
 
+    PyMem_Free(glyphname);
+
     return PyLong_FromLong(name_index);
 }
 
@@ -1106,6 +1108,8 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
         }
     }
 
+    PyMem_Free(tagname);
+
     void *table = FT_Get_Sfnt_Table(self->x->get_face(), (FT_Sfnt_Tag)tag);
     if (!table) {
         Py_RETURN_NONE;

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,8 @@ static PyObject PyImage_color_conv(PyImage self, PyObject args, PyObject kwd`
`177`	`177`	`free(buff));`
`178`	`178`
`179`	`179`	`PyObject result = PyByteArray_FromStringAndSize((const char )buff, size);`
	`180`	`+ free(buff);`
`180`	`181`	`if (result == NULL) {`
`181`		`- free(buff);`
`182`	`182`	`return NULL;`
`183`	`183`	`}`
`184`	`184`
Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,6 @@ int convert_to_string(PathIterator &path,`
`1136`	`1136`
`1137`	`1137`	`buffersize = path.total_vertices() (precision + 5) * 4;`
`1138`	`1138`	`if (*buffersize == 0) {`
`1139`		`- *buffer = NULL;`
`1140`	`1139`	`return 0;`
`1141`	`1140`	`}`
`1142`	`1141`
Original file line number	Diff line number	Diff line change
`@@ -1053,6 +1053,8 @@ static PyObject PyFT2Font_get_name_index(PyFT2Font self, PyObject *args, PyObj`
`1053`	`1053`
`1054`	`1054`	`CALL_CPP("get_name_index", name_index = self->x->get_name_index(glyphname));`
`1055`	`1055`
	`1056`	`+ PyMem_Free(glyphname);`
	`1057`	`+`
`1056`	`1058`	`return PyLong_FromLong(name_index);`
`1057`	`1059`	`}`
`1058`	`1060`
`@@ -1106,6 +1108,8 @@ static PyObject PyFT2Font_get_sfnt_table(PyFT2Font self, PyObject *args, PyObj`
`1106`	`1108`	`}`
`1107`	`1109`	`}`
`1108`	`1110`
	`1111`	`+ PyMem_Free(tagname);`
	`1112`	`+`
`1109`	`1113`	`void *table = FT_Get_Sfnt_Table(self->x->get_face(), (FT_Sfnt_Tag)tag);`
`1110`	`1114`	`if (!table) {`
`1111`	`1115`	`Py_RETURN_NONE;`