walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix MSVC210 build issue (use of C99 declaration after statement) introduced in ba1edf6cd4

This commit is contained in:
Even Rouault 2016-05-23 16:00:04 +02:00
parent 107eb31531
commit 7092f7ea11
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/openjp2/t1.c
View File

@ -1650,13 +1650,13 @@ static OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1,
opj_raw_t *raw = t1->raw; /* RAW component */ opj_raw_t *raw = t1->raw; /* RAW component */
opj_mqc_t *mqc = t1->mqc; /* MQC component */ opj_mqc_t *mqc = t1->mqc; /* MQC component */
mqc->lut_ctxno_zc_orient = lut_ctxno_zc + orient * 256;
OPJ_INT32 bpno_plus_one; OPJ_INT32 bpno_plus_one;
OPJ_UINT32 passtype; OPJ_UINT32 passtype;
OPJ_UINT32 segno, passno; OPJ_UINT32 segno, passno;
OPJ_BYTE type = T1_TYPE_MQ; /* BYPASS mode */ OPJ_BYTE type = T1_TYPE_MQ; /* BYPASS mode */
mqc->lut_ctxno_zc_orient = lut_ctxno_zc + orient * 256;
if(!opj_t1_allocate_buffers( if(!opj_t1_allocate_buffers(
t1, t1,
(OPJ_UINT32)(cblk->x1 - cblk->x0), (OPJ_UINT32)(cblk->x1 - cblk->x0),
@ -1903,7 +1903,6 @@ static void opj_t1_encode_cblk(opj_t1_t *t1,
OPJ_FLOAT64 cumwmsedec = 0.0; OPJ_FLOAT64 cumwmsedec = 0.0;
opj_mqc_t *mqc = t1->mqc; /* MQC component */ opj_mqc_t *mqc = t1->mqc; /* MQC component */
mqc->lut_ctxno_zc_orient = lut_ctxno_zc + orient * 256;
OPJ_UINT32 passno; OPJ_UINT32 passno;
OPJ_INT32 bpno; OPJ_INT32 bpno;
@ -1914,6 +1913,8 @@ static void opj_t1_encode_cblk(opj_t1_t *t1,
OPJ_BYTE type = T1_TYPE_MQ; OPJ_BYTE type = T1_TYPE_MQ;
OPJ_FLOAT64 tempwmsedec; OPJ_FLOAT64 tempwmsedec;
mqc->lut_ctxno_zc_orient = lut_ctxno_zc + orient * 256;
max = 0; max = 0;
for (i = 0; i < t1->w; ++i) { for (i = 0; i < t1->w; ++i) {
for (j = 0; j < t1->h; ++j) { for (j = 0; j < t1->h; ++j) {