fixed a bug in context numerotation that prevented the RESET switch to work correctly...

diff --git a/ChangeLog b/ChangeLog
index cedd477909e3e6c8787ca8f9a263f4ff30d34cc1..baa216c9ef75540cd1fb55e6575fd7b5282b13dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 February 28, 2007
+* [antonin] fixed a bug in context numerotation that prevented the RESET switch to work correctly : mqc_reset_enc in mqc.c
 * [Fod] Corrected codec Makefile by adding the compilation of "compat/getopt.c" 
 
 February 27, 2007

diff --git a/libopenjpeg/mqc.c b/libopenjpeg/mqc.c
index 19a389ede7fb766d4d5cf4b02361abad5ea1feb9..e6dd0079efc23b40423a8ae675645becdcfa3b47 100644 (file)
--- a/libopenjpeg/mqc.c
+++ b/libopenjpeg/mqc.c
@@ -439,9 +439,9 @@ int mqc_bypass_flush_enc(opj_mqc_t *mqc) {
 
 void mqc_reset_enc(opj_mqc_t *mqc) {
        mqc_resetstates(mqc);
-       mqc_setstate(mqc, 18, 0, 46);
-       mqc_setstate(mqc, 0, 0, 3);
-       mqc_setstate(mqc, 1, 0, 4);
+       mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+       mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+       mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 }
 
 int mqc_restart_enc(opj_mqc_t *mqc) {