Open files in binary mode.

mdboom · mdboom · commit dda9b7ab3e4e · 2013-01-11T11:15:50.000-05:00
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -2034,7 +2034,7 @@ RendererAgg::write_rgba(const Py::Tuple& args)
 
     if (py_fileobj.isString())
     {
-        if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"w")) == NULL) {
+        if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"wb")) == NULL) {
             throw Py::Exception();
         }
         close_file = true;
@@ -2044,7 +2044,7 @@ RendererAgg::write_rgba(const Py::Tuple& args)
         py_file = py_fileobj.ptr();
     }
 
-    if ((fp = npy_PyFile_Dup(py_file, (char *)"w")))
+    if ((fp = npy_PyFile_Dup(py_file, (char *)"wb")))
     {
         if (fwrite(pixBuffer, 1, NUMBYTES, fp) != NUMBYTES)
         {
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -133,7 +133,7 @@ Py::Object _png_module::write_png(const Py::Tuple& args)
     PyObject* py_file = NULL;
     if (py_fileobj.isString())
     {
-        if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"w")) == NULL) {
+        if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"wb")) == NULL) {
             throw Py::Exception();
         }
         close_file = true;
@@ -143,7 +143,7 @@ Py::Object _png_module::write_png(const Py::Tuple& args)
         py_file = py_fileobj.ptr();
     }
 
-    if ((fp = npy_PyFile_Dup(py_file, (char *)"w")))
+    if ((fp = npy_PyFile_Dup(py_file, (char *)"wb")))
     {
         close_dup_file = true;
     }
@@ -313,15 +313,15 @@ _png_module::_read_png(const Py::Object& py_fileobj, const bool float_result,
 
     if (py_fileobj.isString())
     {
-        if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"r")) == NULL) {
+        if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"rb")) == NULL) {
             throw Py::Exception();
         }
         close_file = true;
     } else {
         py_file = py_fileobj.ptr();
     }
 
-    if ((fp = npy_PyFile_Dup(py_file, "r")))
+    if ((fp = npy_PyFile_Dup(py_file, "rb")))
     {
         close_dup_file = true;
     }

Original file line number	Diff line number	Diff line change
`@@ -2034,7 +2034,7 @@ RendererAgg::write_rgba(const Py::Tuple& args)`
`2034`	`2034`
`2035`	`2035`	`if (py_fileobj.isString())`
`2036`	`2036`	`{`
`2037`		`- if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"w")) == NULL) {`
	`2037`	`+ if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"wb")) == NULL) {`
`2038`	`2038`	`throw Py::Exception();`
`2039`	`2039`	`}`
`2040`	`2040`	`close_file = true;`
`@@ -2044,7 +2044,7 @@ RendererAgg::write_rgba(const Py::Tuple& args)`
`2044`	`2044`	`py_file = py_fileobj.ptr();`
`2045`	`2045`	`}`
`2046`	`2046`
`2047`		`- if ((fp = npy_PyFile_Dup(py_file, (char *)"w")))`
	`2047`	`+ if ((fp = npy_PyFile_Dup(py_file, (char *)"wb")))`
`2048`	`2048`	`{`
`2049`	`2049`	`if (fwrite(pixBuffer, 1, NUMBYTES, fp) != NUMBYTES)`
`2050`	`2050`	`{`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ Py::Object _png_module::write_png(const Py::Tuple& args)`
`133`	`133`	`PyObject* py_file = NULL;`
`134`	`134`	`if (py_fileobj.isString())`
`135`	`135`	`{`
`136`		`- if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"w")) == NULL) {`
	`136`	`+ if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"wb")) == NULL) {`
`137`	`137`	`throw Py::Exception();`
`138`	`138`	`}`
`139`	`139`	`close_file = true;`
`@@ -143,7 +143,7 @@ Py::Object _png_module::write_png(const Py::Tuple& args)`
`143`	`143`	`py_file = py_fileobj.ptr();`
`144`	`144`	`}`
`145`	`145`
`146`		`- if ((fp = npy_PyFile_Dup(py_file, (char *)"w")))`
	`146`	`+ if ((fp = npy_PyFile_Dup(py_file, (char *)"wb")))`
`147`	`147`	`{`
`148`	`148`	`close_dup_file = true;`
`149`	`149`	`}`
`@@ -313,15 +313,15 @@ _png_module::_read_png(const Py::Object& py_fileobj, const bool float_result,`
`313`	`313`
`314`	`314`	`if (py_fileobj.isString())`
`315`	`315`	`{`
`316`		`- if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"r")) == NULL) {`
	`316`	`+ if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"rb")) == NULL) {`
`317`	`317`	`throw Py::Exception();`
`318`	`318`	`}`
`319`	`319`	`close_file = true;`
`320`	`320`	`} else {`
`321`	`321`	`py_file = py_fileobj.ptr();`
`322`	`322`	`}`
`323`	`323`
`324`		`- if ((fp = npy_PyFile_Dup(py_file, "r")))`
	`324`	`+ if ((fp = npy_PyFile_Dup(py_file, "rb")))`
`325`	`325`	`{`
`326`	`326`	`close_dup_file = true;`
`327`	`327`	`}`