From 521b9bef33551960086a5abae0f544640faf5bfc Mon Sep 17 00:00:00 2001 From: Francois-Olivier Devaux Date: Tue, 23 Jan 2007 11:41:16 +0000 Subject: [PATCH] Modification of the context numbers, to reflect what has been specified in standard. --- libopenjpeg/t1.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libopenjpeg/t1.h b/libopenjpeg/t1.h index 9b5567fb..74a8dff1 100644 --- a/libopenjpeg/t1.h +++ b/libopenjpeg/t1.h @@ -68,17 +68,17 @@ in T1.C are used by some function in TCD.C. #define T1_REFINE 0x2000 #define T1_VISIT 0x4000 -#define T1_NUMCTXS_AGG 1 #define T1_NUMCTXS_ZC 9 -#define T1_NUMCTXS_MAG 3 #define T1_NUMCTXS_SC 5 +#define T1_NUMCTXS_MAG 3 +#define T1_NUMCTXS_AGG 1 #define T1_NUMCTXS_UNI 1 -#define T1_CTXNO_AGG 0 -#define T1_CTXNO_ZC (T1_CTXNO_AGG+T1_NUMCTXS_AGG) -#define T1_CTXNO_MAG (T1_CTXNO_ZC+T1_NUMCTXS_ZC) -#define T1_CTXNO_SC (T1_CTXNO_MAG+T1_NUMCTXS_MAG) -#define T1_CTXNO_UNI (T1_CTXNO_SC+T1_NUMCTXS_SC) +#define T1_CTXNO_ZC 0 +#define T1_CTXNO_SC (T1_CTXNO_ZC+T1_NUMCTXS_ZC) +#define T1_CTXNO_MAG (T1_CTXNO_SC+T1_NUMCTXS_SC) +#define T1_CTXNO_AGG (T1_CTXNO_MAG+T1_NUMCTXS_MAG) +#define T1_CTXNO_UNI (T1_CTXNO_AGG+T1_NUMCTXS_AGG) #define T1_NUMCTXS (T1_CTXNO_UNI+T1_NUMCTXS_UNI) #define T1_NMSEDEC_FRACBITS (T1_NMSEDEC_BITS-1)