- } else { \
- OPJ_INT32 *data1 = t1->data; \
- opj_flag_t *flagsp1 = &t1->flags[flags_stride + 1]; \
- for (k = 0; k < (h & ~3u); k += 4) { \
- for (i = 0; i < w; ++i) { \
- OPJ_INT32 *data2 = data1 + i; \
- opj_flag_t *flagsp2 = flagsp1 + i; \
- if (*flagsp2 == 0) { \
- opj_mqc_setcurctx(mqc, T1_CTXNO_AGG); \
- if (!opj_mqc_decode(mqc)) { \
- continue; \
- } \
- opj_mqc_setcurctx(mqc, T1_CTXNO_UNI); \
- runlen = opj_mqc_decode(mqc); \
- runlen = (runlen << 1) | opj_mqc_decode(mqc); \
- data2 += runlen * w; \
- for (j = runlen; j < 4; ++j) { \
- if (j == runlen) { \
- opj_t1_dec_clnpass_step_partial(t1, flagsp2, data2, oneplushalf, j); \
- } else { \
- opj_t1_dec_clnpass_step(t1, flagsp2, data2, oneplushalf, j); \
- } \
- data2 += w; \
- } \
- } else { \
- if (!(*flagsp2 & ((T1_SIGMA_THIS | T1_PI_THIS) << (0 * 3U)))) {\
- opj_t1_dec_clnpass_step_only_if_flag_not_sig_visit(t1, flagsp2, data2, oneplushalf, 0U, flags_stride); \
- } \
- data2 += w; \
- if (!(*flagsp2 & ((T1_SIGMA_THIS | T1_PI_THIS) << (1 * 3U)))) {\
- opj_t1_dec_clnpass_step_only_if_flag_not_sig_visit(t1, flagsp2, data2, oneplushalf, 1U, flags_stride); \
- } \
- data2 += w; \
- if (!(*flagsp2 & ((T1_SIGMA_THIS | T1_PI_THIS) << (2 * 3U)))) {\
- opj_t1_dec_clnpass_step_only_if_flag_not_sig_visit(t1, flagsp2, data2, oneplushalf, 2U, flags_stride); \
- } \
- data2 += w; \
- if (!(*flagsp2 & ((T1_SIGMA_THIS | T1_PI_THIS) << (3 * 3U)))) {\
- opj_t1_dec_clnpass_step_only_if_flag_not_sig_visit(t1, flagsp2, data2, oneplushalf, 3U, flags_stride); \
- } \
- data2 += w; \
- } \
- *flagsp2 &= ~(T1_PI_0 | T1_PI_1 | T1_PI_2 | T1_PI_3); \
- } \
- data1 += w << 2; \
- flagsp1 += flags_stride; \
- } \
- for (i = 0; i < w; ++i) { \
- OPJ_INT32 *data2 = data1 + i; \
- opj_flag_t *flagsp2 = flagsp1 + i; \
- for (j = k; j < h; ++j) { \
- opj_t1_dec_clnpass_step(t1, flagsp2, data2, oneplushalf, j - k); \
- data2 += w; \
+ UPLOAD_MQC_VARIABLES(mqc, curctx, c, a, ct); \
+ if( k < h ) { \
+ for (i = 0; i < l_w; ++i, ++flagsp, ++data) { \
+ for (j = 0; j < h - k; ++j) { \
+ opj_t1_dec_clnpass_step(t1, flagsp, data + j * l_w, oneplushalf, j, vsc); \