walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' into travis-matrix

This commit is contained in:
mayeut 2015-10-06 20:54:16 +02:00
parent 987f96004f e526d435cc
commit 26b2728c49
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/openjp2/j2k.c
View File

@ -3562,7 +3562,7 @@ static OPJ_BOOL opj_j2k_read_ppm (
return OPJ_FALSE; return OPJ_FALSE;
} }
l_cp->ppm_markers[l_Z_ppm].m_data = opj_malloc(p_header_size); l_cp->ppm_markers[l_Z_ppm].m_data = (OPJ_BYTE *) opj_malloc(p_header_size);
if (l_cp->ppm_markers[l_Z_ppm].m_data == NULL) { if (l_cp->ppm_markers[l_Z_ppm].m_data == NULL) {
/* clean up to be done on l_cp destruction */ /* clean up to be done on l_cp destruction */
opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to read PPM marker\n"); opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to read PPM marker\n");
@ -3784,7 +3784,7 @@ static OPJ_BOOL opj_j2k_read_ppt ( opj_j2k_t *p_j2k,
return OPJ_FALSE; return OPJ_FALSE;
} }
l_tcp->ppt_markers[l_Z_ppt].m_data = opj_malloc(p_header_size); l_tcp->ppt_markers[l_Z_ppt].m_data = (OPJ_BYTE *) opj_malloc(p_header_size);
if (l_tcp->ppt_markers[l_Z_ppt].m_data == NULL) { if (l_tcp->ppt_markers[l_Z_ppt].m_data == NULL) {
/* clean up to be done on l_tcp destruction */ /* clean up to be done on l_tcp destruction */
opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to read PPT marker\n"); opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to read PPT marker\n");

2
src/lib/openjp2/jp2.c
View File

@ -889,7 +889,7 @@ static OPJ_BOOL opj_jp2_check_color(opj_image_t *image, opj_jp2_color_t *color,
} }
} }
pcol_usage = opj_calloc(nr_channels, sizeof(OPJ_BOOL)); pcol_usage = (OPJ_BOOL *) opj_calloc(nr_channels, sizeof(OPJ_BOOL));
if (!pcol_usage) { if (!pcol_usage) {
opj_event_msg(p_manager, EVT_ERROR, "Unexpected OOM.\n"); opj_event_msg(p_manager, EVT_ERROR, "Unexpected OOM.\n");
return OPJ_FALSE; return OPJ_FALSE;