python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-22 06:40:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2024-08-14 19:04:13 +00:00
parent 8a1c03e142
commit 13944d5c63
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/_jpegxl.c
View File

@ -218,7 +218,8 @@ _jxl_decoder_new(PyObject *self, PyObject *args) {
// convert jxl data string to C uint8_t pointer // convert jxl data string to C uint8_t pointer
PyBytes_AsStringAndSize( PyBytes_AsStringAndSize(
(PyObject *)jxl_string, (char **)&_tmp_jxl_data, &_tmp_jxl_data_len); (PyObject *)jxl_string, (char **)&_tmp_jxl_data, &_tmp_jxl_data_len
);
// here occurs this copying (inefficiency) // here occurs this copying (inefficiency)
decp->jxl_data = malloc(_tmp_jxl_data_len); decp->jxl_data = malloc(_tmp_jxl_data_len);
@ -232,13 +233,15 @@ _jxl_decoder_new(PyObject *self, PyObject *args) {
decp->decoder = JxlDecoderCreate(NULL); decp->decoder = JxlDecoderCreate(NULL);
decp->status = JxlDecoderSetParallelRunner( decp->status = JxlDecoderSetParallelRunner(
decp->decoder, JxlThreadParallelRunner, decp->runner); decp->decoder, JxlThreadParallelRunner, decp->runner
);
_PIL_JXL_CHECK("JxlDecoderSetParallelRunner") _PIL_JXL_CHECK("JxlDecoderSetParallelRunner")
decp->status = JxlDecoderSubscribeEvents( decp->status = JxlDecoderSubscribeEvents(
decp->decoder, decp->decoder,
JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING | JXL_DEC_FRAME | JXL_DEC_BOX | JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING | JXL_DEC_FRAME | JXL_DEC_BOX |
JXL_DEC_FULL_IMAGE); JXL_DEC_FULL_IMAGE
);
_PIL_JXL_CHECK("JxlDecoderSubscribeEvents") _PIL_JXL_CHECK("JxlDecoderSubscribeEvents")
// tell libjxl to decompress boxes (for example Exif is usually compressed) // tell libjxl to decompress boxes (for example Exif is usually compressed)
@ -271,7 +274,8 @@ decoder_loop_skip_process:
decp->pixel_format.data_type != JXL_TYPE_UINT16) { decp->pixel_format.data_type != JXL_TYPE_UINT16) {
// only 8 bit integer value images are supported for now // only 8 bit integer value images are supported for now
PyErr_SetString( PyErr_SetString(
PyExc_NotImplementedError, "unsupported pixel data type"); PyExc_NotImplementedError, "unsupported pixel data type"
);
goto end_with_custom_error; goto end_with_custom_error;
} }
decp->mode = _pil_jxl_get_mode(&decp->basic_info); decp->mode = _pil_jxl_get_mode(&decp->basic_info);
@ -282,7 +286,8 @@ decoder_loop_skip_process:
// got color encoding // got color encoding
if (decp->status == JXL_DEC_COLOR_ENCODING) { if (decp->status == JXL_DEC_COLOR_ENCODING) {
decp->status = JxlDecoderGetICCProfileSize( decp->status = JxlDecoderGetICCProfileSize(
decp->decoder, JXL_COLOR_PROFILE_TARGET_DATA, &decp->jxl_icc_len); decp->decoder, JXL_COLOR_PROFILE_TARGET_DATA, &decp->jxl_icc_len
);
_PIL_JXL_CHECK("JxlDecoderGetICCProfileSize"); _PIL_JXL_CHECK("JxlDecoderGetICCProfileSize");
decp->jxl_icc = malloc(decp->jxl_icc_len); decp->jxl_icc = malloc(decp->jxl_icc_len);
@ -295,7 +300,8 @@ decoder_loop_skip_process:
decp->decoder, decp->decoder,
JXL_COLOR_PROFILE_TARGET_DATA, JXL_COLOR_PROFILE_TARGET_DATA,
decp->jxl_icc, decp->jxl_icc,
decp->jxl_icc_len); decp->jxl_icc_len
);
_PIL_JXL_CHECK("JxlDecoderGetColorAsICCProfile"); _PIL_JXL_CHECK("JxlDecoderGetColorAsICCProfile");
continue; continue;
@ -337,9 +343,8 @@ decoder_loop_skip_process:
final_jxl_buf = _new_jxl_buf; final_jxl_buf = _new_jxl_buf;
decp->status = JxlDecoderSetBoxBuffer( decp->status = JxlDecoderSetBoxBuffer(
decp->decoder, decp->decoder, final_jxl_buf + final_jxl_buf_len, cur_compr_box_size
final_jxl_buf + final_jxl_buf_len, );
cur_compr_box_size);
_PIL_JXL_CHECK("JxlDecoderSetBoxBuffer"); _PIL_JXL_CHECK("JxlDecoderSetBoxBuffer");
decp->status = JxlDecoderProcessInput(decp->decoder); decp->status = JxlDecoderProcessInput(decp->decoder);
@ -393,7 +398,8 @@ end:
128, 128,
"could not create decoder object. libjxl call: %s returned: %d", "could not create decoder object. libjxl call: %s returned: %d",
jxl_call_name, jxl_call_name,
decp->status); decp->status
);
PyErr_SetString(PyExc_OSError, err_msg); PyErr_SetString(PyExc_OSError, err_msg);
end_with_custom_error: end_with_custom_error:
@ -418,7 +424,8 @@ _jxl_decoder_get_info(PyObject *self) {
decp->basic_info.animation.tps_numerator, decp->basic_info.animation.tps_numerator,
decp->basic_info.animation.tps_denominator, decp->basic_info.animation.tps_denominator,
decp->basic_info.animation.num_loops, decp->basic_info.animation.num_loops,
decp->n_frames); decp->n_frames
);
} }
PyObject * PyObject *
@ -456,7 +463,8 @@ _jxl_decoder_get_next(PyObject *self) {
size_t new_outbuf_len; size_t new_outbuf_len;
decp->status = JxlDecoderImageOutBufferSize( decp->status = JxlDecoderImageOutBufferSize(
decp->decoder, &decp->pixel_format, &new_outbuf_len); decp->decoder, &decp->pixel_format, &new_outbuf_len
);
_PIL_JXL_CHECK("JxlDecoderImageOutBufferSize"); _PIL_JXL_CHECK("JxlDecoderImageOutBufferSize");
// only allocate memory when current buffer is too small // only allocate memory when current buffer is too small
@ -471,7 +479,8 @@ _jxl_decoder_get_next(PyObject *self) {
} }
decp->status = JxlDecoderSetImageOutBuffer( decp->status = JxlDecoderSetImageOutBuffer(
decp->decoder, &decp->pixel_format, decp->outbuf, decp->outbuf_len); decp->decoder, &decp->pixel_format, decp->outbuf, decp->outbuf_len
);
_PIL_JXL_CHECK("JxlDecoderSetImageOutBuffer"); _PIL_JXL_CHECK("JxlDecoderSetImageOutBuffer");
// decode image into output_buffer // decode image into output_buffer
@ -500,7 +509,8 @@ end:
128, 128,
"could not read frame. libjxl call: %s returned: %d", "could not read frame. libjxl call: %s returned: %d",
jxl_call_name, jxl_call_name,
decp->status); decp->status
);
PyErr_SetString(PyExc_OSError, err_msg); PyErr_SetString(PyExc_OSError, err_msg);
end_with_custom_error: end_with_custom_error:
@ -603,17 +613,17 @@ JpegXlDecoderVersion_str(void) {
"%d.%d.%d", "%d.%d.%d",
version_number / 1000000, version_number / 1000000,
(version_number % 1000000) / 1000, (version_number % 1000000) / 1000,
(version_number % 1000)); (version_number % 1000)
);
return version; return version;
} }
static PyMethodDef jpegxlMethods[] = { static PyMethodDef jpegxlMethods[] = {
{"JpegXlDecoderVersion", {"JpegXlDecoderVersion", JpegXlDecoderVersion_wrapper, METH_NOARGS, "JpegXlVersion"
JpegXlDecoderVersion_wrapper, },
METH_NOARGS,
"JpegXlVersion"},
{"PILJpegXlDecoder", _jxl_decoder_new, METH_VARARGS, "PILJpegXlDecoder"}, {"PILJpegXlDecoder", _jxl_decoder_new, METH_VARARGS, "PILJpegXlDecoder"},
{NULL, NULL}}; {NULL, NULL}
};
static int static int
setup_module(PyObject *m) { setup_module(PyObject *m) {