improve conversion from str to char*, avoid deprecation warnings during

ddale · ddale · commit 02bd7f905fb3 · 2008-04-19T14:22:11.000Z
build

svn path=/branches/v0_91_maint/; revision=5050
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -2269,7 +2269,7 @@ RendererAgg::write_rgba(const Py::Tuple& args) {
       throw Py::TypeError("Object does not appear to be a 8-bit string path or a Python file-like object");
     }
 
-    PyObject_CallFunction(write_method, "s#", pixBuffer, NUMBYTES);
+    PyObject_CallFunction(write_method, (char *)"s#", pixBuffer, NUMBYTES);
 
     Py_XDECREF(write_method);
   }
@@ -2282,7 +2282,7 @@ static void write_png_data(png_structp png_ptr, png_bytep data, png_size_t lengt
   PyObject* write_method = PyObject_GetAttrString(py_file_obj, "write");
   PyObject* result = NULL;
   if (write_method)
-    result = PyObject_CallFunction(write_method, "s#", data, length);
+    result = PyObject_CallFunction(write_method, (char *)"s#", data, length);
   Py_XDECREF(write_method);
   Py_XDECREF(result);
 }
@@ -2292,7 +2292,7 @@ static void flush_png_data(png_structp png_ptr) {
   PyObject* flush_method = PyObject_GetAttrString(py_file_obj, "flush");
   PyObject* result = NULL;
   if (flush_method)
-    result = PyObject_CallFunction(flush_method, "");
+    result = PyObject_CallFunction(flush_method, (char *)"");
   Py_XDECREF(flush_method);
   Py_XDECREF(result);
 }

Original file line number	Diff line number	Diff line change
`@@ -2269,7 +2269,7 @@ RendererAgg::write_rgba(const Py::Tuple& args) {`
`2269`	`2269`	`throw Py::TypeError("Object does not appear to be a 8-bit string path or a Python file-like object");`
`2270`	`2270`	`}`
`2271`	`2271`
`2272`		`- PyObject_CallFunction(write_method, "s#", pixBuffer, NUMBYTES);`
	`2272`	`+ PyObject_CallFunction(write_method, (char *)"s#", pixBuffer, NUMBYTES);`
`2273`	`2273`
`2274`	`2274`	`Py_XDECREF(write_method);`
`2275`	`2275`	`}`
`@@ -2282,7 +2282,7 @@ static void write_png_data(png_structp png_ptr, png_bytep data, png_size_t lengt`
`2282`	`2282`	`PyObject* write_method = PyObject_GetAttrString(py_file_obj, "write");`
`2283`	`2283`	`PyObject* result = NULL;`
`2284`	`2284`	`if (write_method)`
`2285`		`- result = PyObject_CallFunction(write_method, "s#", data, length);`
	`2285`	`+ result = PyObject_CallFunction(write_method, (char *)"s#", data, length);`
`2286`	`2286`	`Py_XDECREF(write_method);`
`2287`	`2287`	`Py_XDECREF(result);`
`2288`	`2288`	`}`
`@@ -2292,7 +2292,7 @@ static void flush_png_data(png_structp png_ptr) {`
`2292`	`2292`	`PyObject* flush_method = PyObject_GetAttrString(py_file_obj, "flush");`
`2293`	`2293`	`PyObject* result = NULL;`
`2294`	`2294`	`if (flush_method)`
`2295`		`- result = PyObject_CallFunction(flush_method, "");`
	`2295`	`+ result = PyObject_CallFunction(flush_method, (char *)"");`
`2296`	`2296`	`Py_XDECREF(flush_method);`
`2297`	`2297`	`Py_XDECREF(result);`
`2298`	`2298`	`}`