@@ -408,19 +408,19 @@ static void _read_png_data(PyObject *py_file_obj, png_bytep data, png_size_t len
408408 Py_ssize_t bufflen;
409409 if (read_method) {
410410 result = PyObject_CallFunction (read_method, (char *)" i" , length);
411- if (result) {
412- if (PyBytes_AsStringAndSize (result, &buffer, &bufflen) == 0 ) {
413- if (bufflen == (Py_ssize_t)length) {
414- memcpy (data, buffer, length);
415- } else {
416- PyErr_SetString (PyExc_IOError, " read past end of file" );
417- }
418- } else {
419- PyErr_SetString (PyExc_IOError, " Failed to copy buffer" );
420- }
421- } else {
422- PyErr_SetString (PyExc_IOError, " Failed to read file" );
423- }
411+ if (result) {
412+ if (PyBytes_AsStringAndSize (result, &buffer, &bufflen) == 0 ) {
413+ if (bufflen == (Py_ssize_t)length) {
414+ memcpy (data, buffer, length);
415+ } else {
416+ PyErr_SetString (PyExc_IOError, " read past end of file" );
417+ }
418+ } else {
419+ PyErr_SetString (PyExc_IOError, " Failed to copy buffer" );
420+ }
421+ } else {
422+ PyErr_SetString (PyExc_IOError, " Failed to read file" );
423+ }
424424
425425
426426 }
@@ -432,9 +432,8 @@ static void read_png_data(png_structp png_ptr, png_bytep data, png_size_t length
432432{
433433 PyObject *py_file_obj = (PyObject *)png_get_io_ptr (png_ptr);
434434 _read_png_data (py_file_obj, data, length);
435- if (PyErr_Occurred ())
436- {
437- png_error (png_ptr, " failed to read file" );
435+ if (PyErr_Occurred ()) {
436+ png_error (png_ptr, " failed to read file" );
438437 }
439438
440439}
@@ -494,9 +493,9 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
494493 }
495494 Py_XDECREF (read_method);
496495 _read_png_data (py_file, header, 8 );
497- if (PyErr_Occurred ()){
498- goto exit;
499- }
496+ if (PyErr_Occurred ()) {
497+ goto exit;
498+ }
500499 }
501500
502501 if (png_sig_cmp (header, 0 , 8 )) {
@@ -519,10 +518,9 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
519518 }
520519
521520 if (setjmp (png_jmpbuf (png_ptr))) {
522- if (!PyErr_Occurred ())
523- {
524- PyErr_SetString (PyExc_RuntimeError, " Error setting jump" );
525- }
521+ if (!PyErr_Occurred ()) {
522+ PyErr_SetString (PyExc_RuntimeError, " Error setting jump" );
523+ }
526524 goto exit;
527525 }
528526
0 commit comments