@@ -408,19 +408,19 @@ static void _read_png_data(PyObject *py_file_obj, png_bytep data, png_size_t len
408
408
Py_ssize_t bufflen;
409
409
if (read_method) {
410
410
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
+ }
424
424
425
425
426
426
}
@@ -432,9 +432,8 @@ static void read_png_data(png_structp png_ptr, png_bytep data, png_size_t length
432
432
{
433
433
PyObject *py_file_obj = (PyObject *)png_get_io_ptr (png_ptr);
434
434
_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" );
438
437
}
439
438
440
439
}
@@ -494,9 +493,9 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
494
493
}
495
494
Py_XDECREF (read_method);
496
495
_read_png_data (py_file, header, 8 );
497
- if (PyErr_Occurred ()){
498
- goto exit ;
499
- }
496
+ if (PyErr_Occurred ()) {
497
+ goto exit ;
498
+ }
500
499
}
501
500
502
501
if (png_sig_cmp (header, 0 , 8 )) {
@@ -519,10 +518,9 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
519
518
}
520
519
521
520
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
+ }
526
524
goto exit ;
527
525
}
528
526
0 commit comments