Merge pull request #7796 from AdamWill/png-swap-endian

mdboom · mdboom · commit 26567b3551b8 · 2017-01-11T10:19:26.000-05:00
Only byte-swap 16-bit PNGs on little-endian (#7792)
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -462,10 +462,12 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
         png_set_shift(png_ptr, sig_bit);
     }
 
+#if NPY_BYTE_ORDER == NPY_LITTLE_ENDIAN
     // Convert big endian to little
     if (bit_depth == 16) {
         png_set_swap(png_ptr);
     }
+#endif
 
     // Convert palletes to full RGB
     if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) {

Original file line number	Diff line number	Diff line change
`@@ -462,10 +462,12 @@ static PyObject _read_png(PyObject filein, bool float_result)`
`462`	`462`	`png_set_shift(png_ptr, sig_bit);`
`463`	`463`	`}`
`464`	`464`
	`465`	`+#if NPY_BYTE_ORDER == NPY_LITTLE_ENDIAN`
`465`	`466`	`// Convert big endian to little`
`466`	`467`	`if (bit_depth == 16) {`
`467`	`468`	`png_set_swap(png_ptr);`
`468`	`469`	`}`
	`470`	`+#endif`
`469`	`471`
`470`	`472`	`// Convert palletes to full RGB`
`471`	`473`	`if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) {`