diff options
Diffstat (limited to 'third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch')
-rw-r--r-- | third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch b/third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch index 4a371e5c88..b2e7cdc75a 100644 --- a/third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch +++ b/third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch @@ -1,22 +1,22 @@ diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c -index 5de89cf0e..400ca8098 100644 +index c5f9dd53e..d31eb29a7 100644 --- a/third_party/libopenjpeg20/j2k.c +++ b/third_party/libopenjpeg20/j2k.c -@@ -5715,7 +5715,7 @@ static OPJ_BOOL opj_j2k_add_mct(opj_tcp_t * p_tcp, opj_image_t * p_image, OPJ_UI +@@ -6201,7 +6201,7 @@ static OPJ_BOOL opj_j2k_add_mct(opj_tcp_t * p_tcp, opj_image_t * p_image, + if (l_deco_array) { + l_data_size = MCT_ELEMENT_SIZE[l_deco_array->m_element_type] * p_image->numcomps + * p_image->numcomps; +- if (l_deco_array->m_data_size != l_data_size) { ++ if (l_deco_array->m_data_size != l_data_size || ! l_deco_array->m_data) { + return OPJ_FALSE; + } - if (l_deco_array) { - l_data_size = MCT_ELEMENT_SIZE[l_deco_array->m_element_type] * p_image->numcomps * p_image->numcomps; -- if (l_deco_array->m_data_size != l_data_size) { -+ if (l_deco_array->m_data_size != l_data_size || ! l_deco_array->m_data) { - return OPJ_FALSE; - } - -@@ -5734,7 +5734,7 @@ static OPJ_BOOL opj_j2k_add_mct(opj_tcp_t * p_tcp, opj_image_t * p_image, OPJ_UI - - if (l_offset_array) { - l_data_size = MCT_ELEMENT_SIZE[l_offset_array->m_element_type] * p_image->numcomps; -- if (l_offset_array->m_data_size != l_data_size) { -+ if (l_offset_array->m_data_size != l_data_size || ! l_offset_array->m_data) { - return OPJ_FALSE; - } +@@ -6222,7 +6222,7 @@ static OPJ_BOOL opj_j2k_add_mct(opj_tcp_t * p_tcp, opj_image_t * p_image, + if (l_offset_array) { + l_data_size = MCT_ELEMENT_SIZE[l_offset_array->m_element_type] * + p_image->numcomps; +- if (l_offset_array->m_data_size != l_data_size) { ++ if (l_offset_array->m_data_size != l_data_size || ! l_offset_array->m_data) { + return OPJ_FALSE; + } |