Merge branch 'master' into travis-matrix

[openjpeg.git] / src / lib / openjp2 / jp2.c

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;