Merge remote-tracking branch 'stefanv/Low-bit_depth-png' · staticfloat/matplotlib@bca1fb0 · GitHub

1. staticfloat
2. matplotlib

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Commit bca1fb0

Browse filesBrowse the repository at this point in the historyBrowse files

mdboom

committed

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

Conflicts: src/_png.cpp

2 parents 89f4421 + f57dddc commit bca1fb0
Copy full SHA for bca1fb0

1 file changed

+3-3Lines changed: 3 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • _png.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/_png.cpp‎

Copy file name to clipboardExpand all lines: src/_png.cpp

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -467,9 +467,9 @@ _png_module::_read_png(const Py::Object& py_fileobj, const bool float_result)
467	467
468	468	PyArrayObject *A = NULL;
469	469	if (float_result) {
470		- double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1;
471		-
472		- A = (PyArrayObject *) PyArray_SimpleNew(num_dims, dimensions, NPY_FLOAT);
	470	+ double max_value = (1 << bit_depth) - 1;
	471	+ PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew(
	472	+ num_dims, dimensions, PyArray_FLOAT);
473	473
474	474	if (A == NULL)
475	475	{

0 commit comments

Comments

0 (0)