Added missing casts for return values of opj_malloc()/opj_calloc().

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 291c9b77ead52a9b1ba4c8d6f06477bb83d47148..c8d8cf1ac89b134e07359f50f4a6f532d08aab7a 100644 (file)
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -3562,7 +3562,7 @@ static OPJ_BOOL opj_j2k_read_ppm (
                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) {
                /* clean up to be done on l_cp destruction */
                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;
        }
        
-       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) {
                /* clean up to be done on l_tcp destruction */
                opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to read PPT marker\n");

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 8bf60f62ac0e0a135ce4894e28b8fcf00ba465aa..c14e9a066726673b18cab8d989f95188b377a06a 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -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) {
                        opj_event_msg(p_manager, EVT_ERROR, "Unexpected OOM.\n");
                        return OPJ_FALSE;