From c66e6be4a4579b870a3524f90cd457f7b78a7cd4 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Fri, 5 Oct 2012 12:34:46 +0000 Subject: [PATCH] [trunk] update t1_generate_luts.c with the right ouput to generate t1_luts --- src/lib/openjp2/t1_generate_luts.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/openjp2/t1_generate_luts.c b/src/lib/openjp2/t1_generate_luts.c index b2e3334d..65b0e4f0 100644 --- a/src/lib/openjp2/t1_generate_luts.c +++ b/src/lib/openjp2/t1_generate_luts.c @@ -206,7 +206,7 @@ int main(){ } } - printf("static char lut_ctxno_zc[1024] = {\n "); + printf("static OPJ_BYTE lut_ctxno_zc[1024] = {\n "); for (i = 0; i < 1023; ++i) { printf("%i, ", lut_ctxno_zc[i]); if(!((i+1)&0x1f)) @@ -215,7 +215,7 @@ int main(){ printf("%i\n};\n\n", lut_ctxno_zc[1023]); /* lut_ctxno_sc */ - printf("static char lut_ctxno_sc[256] = {\n "); + printf("static OPJ_BYTE lut_ctxno_sc[256] = {\n "); for (i = 0; i < 255; ++i) { printf("0x%x, ", t1_init_ctxno_sc(i << 4)); if(!((i+1)&0xf)) @@ -224,7 +224,7 @@ int main(){ printf("0x%x\n};\n\n", t1_init_ctxno_sc(255 << 4)); /* lut_spb */ - printf("static char lut_spb[256] = {\n "); + printf("static OPJ_BYTE lut_spb[256] = {\n "); for (i = 0; i < 255; ++i) { printf("%i, ", t1_init_spb(i << 4)); if(!((i+1)&0x1f)) @@ -258,16 +258,16 @@ int main(){ (int) (floor((u * u) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0)); } - printf("static short lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {\n "); + printf("static OPJ_INT16 lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {\n "); dump_array16(lut_nmsedec_sig, 1 << T1_NMSEDEC_BITS); - printf("static short lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {\n "); + printf("static OPJ_INT16 lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {\n "); dump_array16(lut_nmsedec_sig0, 1 << T1_NMSEDEC_BITS); - printf("static short lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {\n "); + printf("static OPJ_INT16 lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {\n "); dump_array16(lut_nmsedec_ref, 1 << T1_NMSEDEC_BITS); - printf("static short lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {\n "); + printf("static OPJ_INT16 lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {\n "); dump_array16(lut_nmsedec_ref0, 1 << T1_NMSEDEC_BITS); return 0;