Merge remote-tracking branch 'stefanv/Low-bit_depth-png'

mdboom · mdboom · commit bca1fb052585 · 2012-01-10T08:20:35.000-05:00
Conflicts:
	src/_png.cpp
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -467,9 +467,9 @@ _png_module::_read_png(const Py::Object& py_fileobj, const bool float_result)
 
     PyArrayObject *A = NULL;
     if (float_result) {
-        double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1;
-
-        A = (PyArrayObject *) PyArray_SimpleNew(num_dims, dimensions, NPY_FLOAT);
+        double max_value = (1 << bit_depth) - 1;
+        PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew(
+            num_dims, dimensions, PyArray_FLOAT);
 
         if (A == NULL)
         {
