Merge pull request matplotlib#2991 from jkseppan/tidyup-ft2font

mdboom · mdboom · commit 85b34701c99f · 2014-04-20T18:13:59.000-04:00
Silence some compiler warnings related to ft2font
diff --git a/src/file_compat.h b/src/file_compat.h
@@ -192,15 +192,15 @@ mpl_PyFile_OpenFile(PyObject *filename, const char *mode)
     if (open == NULL) {
         return NULL;
     }
-    return PyObject_CallFunction(open, "Os", filename, mode);
+    return PyObject_CallFunction(open, (char*)"Os", filename, mode);
 }
 
 static NPY_INLINE int
 mpl_PyFile_CloseFile(PyObject *file)
 {
     PyObject *ret;
 
-    ret = PyObject_CallMethod(file, "close", NULL);
+    ret = PyObject_CallMethod(file, (char*)"close", NULL);
     if (ret == NULL) {
         return -1;
     }
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -193,7 +193,10 @@ FT2Image::py_write_bitmap(const Py::Tuple & args)
 
     write_bitmap(fh);
 
-    mpl_PyFile_DupClose(py_file, fh, offset);
+    if (mpl_PyFile_DupClose(py_file, fh, offset))
+    {
+        throw Py::Exception();
+    }
     mpl_PyFile_CloseFile(py_file);
     Py_DECREF(py_file);
 
@@ -2143,7 +2146,10 @@ static void close_file_callback(FT_Stream stream)
 {
     py_file_def *def = (py_file_def *)stream->descriptor.pointer;
 
-    mpl_PyFile_DupClose(def->py_file, def->fp, def->offset);
+    if (mpl_PyFile_DupClose(def->py_file, def->fp, def->offset))
+    {
+        throw Py::Exception();
+    }
 
     if (def->close_file) {
         mpl_PyFile_CloseFile(def->py_file);
@@ -2165,7 +2171,7 @@ FT2Font::make_open_args(PyObject *py_file_arg, FT_Open_Args *open_args)
     py_file_def *stream_info = NULL;
     long file_size;
     FT_Byte *new_memory;
-    mpl_off_t offset;
+    mpl_off_t offset = 0;
 
     int result = -1;
 
@@ -2208,7 +2214,7 @@ FT2Font::make_open_args(PyObject *py_file_arg, FT_Open_Args *open_args)
         open_args->stream = &stream;
     } else {
         if (PyObject_HasAttrString(py_file_arg, "read") &&
-            (data = PyObject_CallMethod(py_file_arg, "read", ""))) {
+            (data = PyObject_CallMethod(py_file_arg, (char*)"read", (char*)""))) {
             if (PyBytes_AsStringAndSize(data, &data_ptr, &data_len)) {
                 goto exit;
             }

Original file line number	Diff line number	Diff line change
`@@ -192,15 +192,15 @@ mpl_PyFile_OpenFile(PyObject filename, const char mode)`
`192`	`192`	`if (open == NULL) {`
`193`	`193`	`return NULL;`
`194`	`194`	`}`
`195`		`- return PyObject_CallFunction(open, "Os", filename, mode);`
	`195`	`+ return PyObject_CallFunction(open, (char*)"Os", filename, mode);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`static NPY_INLINE int`
`199`	`199`	`mpl_PyFile_CloseFile(PyObject *file)`
`200`	`200`	`{`
`201`	`201`	`PyObject *ret;`
`202`	`202`
`203`		`- ret = PyObject_CallMethod(file, "close", NULL);`
	`203`	`+ ret = PyObject_CallMethod(file, (char*)"close", NULL);`
`204`	`204`	`if (ret == NULL) {`
`205`	`205`	`return -1;`
`206`	`206`	`}`