[trunk] correct the encoding of colr box information (thanks Winfried)

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

diff --git a/src/lib/openjp2/mqc.c b/src/lib/openjp2/mqc.c
index d38395d491731c480201914e37256a93ab2c650c..2ab61c44e8d3bf25b2cbde61d5dc8c9aa75061b8 100644 (file)
--- a/src/lib/openjp2/mqc.c
+++ b/src/lib/openjp2/mqc.c
@@ -364,9 +364,7 @@ opj_mqc_t* opj_mqc_create(void) {
 void opj_mqc_destroy(opj_mqc_t *mqc) {
        if(mqc) {
 #ifdef MQC_PERF_OPT
-               if (mqc->buffer) { /* TODO: LH: this test is pointless as free() is a no-op on 0 */
-                       opj_free(mqc->buffer);
-               }
+               opj_free(mqc->buffer);
 #endif
                opj_free(mqc);
        }
@@ -510,7 +508,7 @@ void opj_mqc_segmark_enc(opj_mqc_t *mqc) {
        }
 }
 
-opj_bool opj_mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len) {
+OPJ_BOOL opj_mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len) {
        opj_mqc_setcurctx(mqc, 0);
        mqc->start = bp;
        mqc->end = bp + len;