Reformat whole codebase with astyle.options (#128)
[openjpeg.git] / src / lib / openmj2 / pi.c
index e8e33bfe6008d78aec0d88ebd054632c02dd23ed..d0fdb9b1959378f01e7de2922253cfad9f434084 100644 (file)
@@ -1,9 +1,15 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
+ * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
 /**
 Get next packet in layer-resolution-component-precinct order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi);
 /**
 Get next packet in resolution-layer-component-precinct order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi);
 /**
 Get next packet in resolution-precinct-component-layer order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi);
 /**
 Get next packet in precinct-component-resolution-layer order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi);
 /**
 Get next packet in component-precinct-resolution-layer order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_cprl(opj_pi_iterator_t * pi);
 
@@ -73,891 +79,957 @@ static opj_bool pi_next_cprl(opj_pi_iterator_t * pi);
 
 /*@}*/
 
-/* 
+/*
 ==========================================================
    local functions
 ==========================================================
 */
 
-static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi) {
-       opj_pi_comp_t *comp = NULL;
-       opj_pi_resolution_t *res = NULL;
-       long index = 0;
-       
-       if (!pi->first) {
-               comp = &pi->comps[pi->compno];
-               res = &comp->resolutions[pi->resno];
-               goto LABEL_SKIP;
-       } else {
-               pi->first = 0;
-       }
-
-       for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-               for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1;
-               pi->resno++) {
-                       for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-                               comp = &pi->comps[pi->compno];
-                               if (pi->resno >= comp->numresolutions) {
-                                       continue;
-                               }
-                               res = &comp->resolutions[pi->resno];
-                               if (!pi->tp_on){
-                                       pi->poc.precno1 = res->pw * res->ph;
-                               }
-                               for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
-                                       index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-                                       if (!pi->include[index]) {
-                                               pi->include[index] = 1;
-                                               return OPJ_TRUE;
-                                       }
-LABEL_SKIP:;
-                               }
-                       }
-               }
-       }
-       
-       return OPJ_FALSE;
+static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        comp = &pi->comps[pi->compno];
+        res = &comp->resolutions[pi->resno];
+        goto LABEL_SKIP;
+    } else {
+        pi->first = 0;
+    }
+
+    for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+        for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1;
+                pi->resno++) {
+            for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+                comp = &pi->comps[pi->compno];
+                if (pi->resno >= comp->numresolutions) {
+                    continue;
+                }
+                res = &comp->resolutions[pi->resno];
+                if (!pi->tp_on) {
+                    pi->poc.precno1 = res->pw * res->ph;
+                }
+                for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
+                    index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno *
+                            pi->step_c + pi->precno * pi->step_p;
+                    if (!pi->include[index]) {
+                        pi->include[index] = 1;
+                        return OPJ_TRUE;
+                    }
+LABEL_SKIP:
+                    ;
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi) {
-       opj_pi_comp_t *comp = NULL;
-       opj_pi_resolution_t *res = NULL;
-       long index = 0;
-
-       if (!pi->first) {
-               comp = &pi->comps[pi->compno];
-               res = &comp->resolutions[pi->resno];
-               goto LABEL_SKIP;
-       } else {
-               pi->first = 0;
-       }
-
-       for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-               for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-                       for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-                               comp = &pi->comps[pi->compno];
-                               if (pi->resno >= comp->numresolutions) {
-                                       continue;
-                               }
-                               res = &comp->resolutions[pi->resno];
-                               if(!pi->tp_on){
-                                       pi->poc.precno1 = res->pw * res->ph;
-                               }
-                               for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
-                                       index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-                                       if (!pi->include[index]) {
-                                               pi->include[index] = 1;
-                                               return OPJ_TRUE;
-                                       }
-LABEL_SKIP:;
-                               }
-                       }
-               }
-       }
-       
-       return OPJ_FALSE;
+static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        comp = &pi->comps[pi->compno];
+        res = &comp->resolutions[pi->resno];
+        goto LABEL_SKIP;
+    } else {
+        pi->first = 0;
+    }
+
+    for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
+        for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+            for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+                comp = &pi->comps[pi->compno];
+                if (pi->resno >= comp->numresolutions) {
+                    continue;
+                }
+                res = &comp->resolutions[pi->resno];
+                if (!pi->tp_on) {
+                    pi->poc.precno1 = res->pw * res->ph;
+                }
+                for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
+                    index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno *
+                            pi->step_c + pi->precno * pi->step_p;
+                    if (!pi->include[index]) {
+                        pi->include[index] = 1;
+                        return OPJ_TRUE;
+                    }
+LABEL_SKIP:
+                    ;
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi) {
-       opj_pi_comp_t *comp = NULL;
-       opj_pi_resolution_t *res = NULL;
-       long index = 0;
-
-       if (!pi->first) {
-               goto LABEL_SKIP;
-       } else {
-               int compno, resno;
-               pi->first = 0;
-               pi->dx = 0;
-               pi->dy = 0;
-               for (compno = 0; compno < pi->numcomps; compno++) {
-                       comp = &pi->comps[compno];
-                       for (resno = 0; resno < comp->numresolutions; resno++) {
-                               int dx, dy;
-                               res = &comp->resolutions[resno];
-                               dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-                               dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-                               pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-                               pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-                       }
-               }
-       }
-if (!pi->tp_on){
-                       pi->poc.ty0 = pi->ty0;
-                       pi->poc.tx0 = pi->tx0;
-                       pi->poc.ty1 = pi->ty1;
-                       pi->poc.tx1 = pi->tx1;
-               }
-       for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-               for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-                       for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-                               for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-                                       int levelno;
-                                       int trx0, try0;
-                                       int trx1, try1;
-                                       int rpx, rpy;
-                                       int prci, prcj;
-                                       comp = &pi->comps[pi->compno];
-                                       if (pi->resno >= comp->numresolutions) {
-                                               continue;
-                                       }
-                                       res = &comp->resolutions[pi->resno];
-                                       levelno = comp->numresolutions - 1 - pi->resno;
-                                       trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-                                       try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-                                       trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-                                       try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-                                       rpx = res->pdx + levelno;
-                                       rpy = res->pdy + levelno;
-                                       if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-                                               continue;       
-                                       }
-                                       if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-                                               continue; 
-                                       }
-                                       
-                                       if ((res->pw==0)||(res->ph==0)) continue;
-                                       
-                                       if ((trx0==trx1)||(try0==try1)) continue;
-                                       
-                                       prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-                                                - int_floordivpow2(trx0, res->pdx);
-                                       prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-                                                - int_floordivpow2(try0, res->pdy);
-                                       pi->precno = prci + prcj * res->pw;
-                                       for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-                                               index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-                                               if (!pi->include[index]) {
-                                                       pi->include[index] = 1;
-                                                       return OPJ_TRUE;
-                                               }
-LABEL_SKIP:;
-                                       }
-                               }
-                       }
-               }
-       }
-       
-       return OPJ_FALSE;
+static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        goto LABEL_SKIP;
+    } else {
+        int compno, resno;
+        pi->first = 0;
+        pi->dx = 0;
+        pi->dy = 0;
+        for (compno = 0; compno < pi->numcomps; compno++) {
+            comp = &pi->comps[compno];
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int dx, dy;
+                res = &comp->resolutions[resno];
+                dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+                dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+                pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+                pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+            }
+        }
+    }
+    if (!pi->tp_on) {
+        pi->poc.ty0 = pi->ty0;
+        pi->poc.tx0 = pi->tx0;
+        pi->poc.ty1 = pi->ty1;
+        pi->poc.tx1 = pi->tx1;
+    }
+    for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
+        for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1;
+                pi->y += pi->dy - (pi->y % pi->dy)) {
+            for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1;
+                    pi->x += pi->dx - (pi->x % pi->dx)) {
+                for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+                    int levelno;
+                    int trx0, try0;
+                    int trx1, try1;
+                    int rpx, rpy;
+                    int prci, prcj;
+                    comp = &pi->comps[pi->compno];
+                    if (pi->resno >= comp->numresolutions) {
+                        continue;
+                    }
+                    res = &comp->resolutions[pi->resno];
+                    levelno = comp->numresolutions - 1 - pi->resno;
+                    trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+                    try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+                    trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+                    try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+                    rpx = res->pdx + levelno;
+                    rpy = res->pdy + levelno;
+                    if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) &&
+                            ((try0 << levelno) % (1 << rpy))))) {
+                        continue;
+                    }
+                    if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) &&
+                            ((trx0 << levelno) % (1 << rpx))))) {
+                        continue;
+                    }
+
+                    if ((res->pw == 0) || (res->ph == 0)) {
+                        continue;
+                    }
+
+                    if ((trx0 == trx1) || (try0 == try1)) {
+                        continue;
+                    }
+
+                    prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx)
+                           - int_floordivpow2(trx0, res->pdx);
+                    prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy)
+                           - int_floordivpow2(try0, res->pdy);
+                    pi->precno = prci + prcj * res->pw;
+                    for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+                        index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno *
+                                pi->step_c + pi->precno * pi->step_p;
+                        if (!pi->include[index]) {
+                            pi->include[index] = 1;
+                            return OPJ_TRUE;
+                        }
+LABEL_SKIP:
+                        ;
+                    }
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi) {
-       opj_pi_comp_t *comp = NULL;
-       opj_pi_resolution_t *res = NULL;
-       long index = 0;
-
-       if (!pi->first) {
-               comp = &pi->comps[pi->compno];
-               goto LABEL_SKIP;
-       } else {
-               int compno, resno;
-               pi->first = 0;
-               pi->dx = 0;
-               pi->dy = 0;
-               for (compno = 0; compno < pi->numcomps; compno++) {
-                       comp = &pi->comps[compno];
-                       for (resno = 0; resno < comp->numresolutions; resno++) {
-                               int dx, dy;
-                               res = &comp->resolutions[resno];
-                               dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-                               dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-                               pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-                               pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-                       }
-               }
-       }
-       if (!pi->tp_on){
-                       pi->poc.ty0 = pi->ty0;
-                       pi->poc.tx0 = pi->tx0;
-                       pi->poc.ty1 = pi->ty1;
-                       pi->poc.tx1 = pi->tx1;
-               }
-       for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-               for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-                       for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-                               comp = &pi->comps[pi->compno];
-                               for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
-                                       int levelno;
-                                       int trx0, try0;
-                                       int trx1, try1;
-                                       int rpx, rpy;
-                                       int prci, prcj;
-                                       res = &comp->resolutions[pi->resno];
-                                       levelno = comp->numresolutions - 1 - pi->resno;
-                                       trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-                                       try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-                                       trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-                                       try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-                                       rpx = res->pdx + levelno;
-                                       rpy = res->pdy + levelno;
-                                       if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-                                               continue;       
-                                       }
-                                       if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-                                               continue; 
-                                       }
-                                       
-                                       if ((res->pw==0)||(res->ph==0)) continue;
-                                       
-                                       if ((trx0==trx1)||(try0==try1)) continue;
-                                       
-                                       prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-                                                - int_floordivpow2(trx0, res->pdx);
-                                       prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-                                                - int_floordivpow2(try0, res->pdy);
-                                       pi->precno = prci + prcj * res->pw;
-                                       for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-                                               index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-                                               if (!pi->include[index]) {
-                                                       pi->include[index] = 1;
-                                                       return OPJ_TRUE;
-                                               }       
-LABEL_SKIP:;
-                                       }
-                               }
-                       }
-               }
-       }
-       
-       return OPJ_FALSE;
+static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        comp = &pi->comps[pi->compno];
+        goto LABEL_SKIP;
+    } else {
+        int compno, resno;
+        pi->first = 0;
+        pi->dx = 0;
+        pi->dy = 0;
+        for (compno = 0; compno < pi->numcomps; compno++) {
+            comp = &pi->comps[compno];
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int dx, dy;
+                res = &comp->resolutions[resno];
+                dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+                dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+                pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+                pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+            }
+        }
+    }
+    if (!pi->tp_on) {
+        pi->poc.ty0 = pi->ty0;
+        pi->poc.tx0 = pi->tx0;
+        pi->poc.ty1 = pi->ty1;
+        pi->poc.tx1 = pi->tx1;
+    }
+    for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1;
+            pi->y += pi->dy - (pi->y % pi->dy)) {
+        for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1;
+                pi->x += pi->dx - (pi->x % pi->dx)) {
+            for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+                comp = &pi->comps[pi->compno];
+                for (pi->resno = pi->poc.resno0;
+                        pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
+                    int levelno;
+                    int trx0, try0;
+                    int trx1, try1;
+                    int rpx, rpy;
+                    int prci, prcj;
+                    res = &comp->resolutions[pi->resno];
+                    levelno = comp->numresolutions - 1 - pi->resno;
+                    trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+                    try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+                    trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+                    try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+                    rpx = res->pdx + levelno;
+                    rpy = res->pdy + levelno;
+                    if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) &&
+                            ((try0 << levelno) % (1 << rpy))))) {
+                        continue;
+                    }
+                    if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) &&
+                            ((trx0 << levelno) % (1 << rpx))))) {
+                        continue;
+                    }
+
+                    if ((res->pw == 0) || (res->ph == 0)) {
+                        continue;
+                    }
+
+                    if ((trx0 == trx1) || (try0 == try1)) {
+                        continue;
+                    }
+
+                    prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx)
+                           - int_floordivpow2(trx0, res->pdx);
+                    prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy)
+                           - int_floordivpow2(try0, res->pdy);
+                    pi->precno = prci + prcj * res->pw;
+                    for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+                        index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno *
+                                pi->step_c + pi->precno * pi->step_p;
+                        if (!pi->include[index]) {
+                            pi->include[index] = 1;
+                            return OPJ_TRUE;
+                        }
+LABEL_SKIP:
+                        ;
+                    }
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-static opj_bool pi_next_cprl(opj_pi_iterator_t * pi) {
-       opj_pi_comp_t *comp = NULL;
-       opj_pi_resolution_t *res = NULL;
-       long index = 0;
-
-       if (!pi->first) {
-               comp = &pi->comps[pi->compno];
-               goto LABEL_SKIP;
-       } else {
-               pi->first = 0;
-       }
-
-       for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-               int resno;
-               comp = &pi->comps[pi->compno];
-               pi->dx = 0;
-               pi->dy = 0;
-               for (resno = 0; resno < comp->numresolutions; resno++) {
-                       int dx, dy;
-                       res = &comp->resolutions[resno];
-                       dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-                       dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-                       pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-                       pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-               }
-               if (!pi->tp_on){
-                       pi->poc.ty0 = pi->ty0;
-                       pi->poc.tx0 = pi->tx0;
-                       pi->poc.ty1 = pi->ty1;
-                       pi->poc.tx1 = pi->tx1;
-               }
-               for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-                       for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-                               for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
-                                       int levelno;
-                                       int trx0, try0;
-                                       int trx1, try1;
-                                       int rpx, rpy;
-                                       int prci, prcj;
-                                       res = &comp->resolutions[pi->resno];
-                                       levelno = comp->numresolutions - 1 - pi->resno;
-                                       trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-                                       try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-                                       trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-                                       try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-                                       rpx = res->pdx + levelno;
-                                       rpy = res->pdy + levelno;
-                                       if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-                                               continue;       
-                                       }
-                                       if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-                                               continue; 
-                                       }
-                                       
-                                       if ((res->pw==0)||(res->ph==0)) continue;
-                                       
-                                       if ((trx0==trx1)||(try0==try1)) continue;
-                                       
-                                       prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-                                                - int_floordivpow2(trx0, res->pdx);
-                                       prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-                                                - int_floordivpow2(try0, res->pdy);
-                                       pi->precno = prci + prcj * res->pw;
-                                       for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-                                               index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-                                               if (!pi->include[index]) {
-                                                       pi->include[index] = 1;
-                                                       return OPJ_TRUE;
-                                               }
-LABEL_SKIP:;
-                                       }
-                               }
-                       }
-               }
-       }
-       
-       return OPJ_FALSE;
+static opj_bool pi_next_cprl(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        comp = &pi->comps[pi->compno];
+        goto LABEL_SKIP;
+    } else {
+        pi->first = 0;
+    }
+
+    for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+        int resno;
+        comp = &pi->comps[pi->compno];
+        pi->dx = 0;
+        pi->dy = 0;
+        for (resno = 0; resno < comp->numresolutions; resno++) {
+            int dx, dy;
+            res = &comp->resolutions[resno];
+            dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+            dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+            pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+            pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+        }
+        if (!pi->tp_on) {
+            pi->poc.ty0 = pi->ty0;
+            pi->poc.tx0 = pi->tx0;
+            pi->poc.ty1 = pi->ty1;
+            pi->poc.tx1 = pi->tx1;
+        }
+        for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1;
+                pi->y += pi->dy - (pi->y % pi->dy)) {
+            for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1;
+                    pi->x += pi->dx - (pi->x % pi->dx)) {
+                for (pi->resno = pi->poc.resno0;
+                        pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
+                    int levelno;
+                    int trx0, try0;
+                    int trx1, try1;
+                    int rpx, rpy;
+                    int prci, prcj;
+                    res = &comp->resolutions[pi->resno];
+                    levelno = comp->numresolutions - 1 - pi->resno;
+                    trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+                    try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+                    trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+                    try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+                    rpx = res->pdx + levelno;
+                    rpy = res->pdy + levelno;
+                    if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) &&
+                            ((try0 << levelno) % (1 << rpy))))) {
+                        continue;
+                    }
+                    if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) &&
+                            ((trx0 << levelno) % (1 << rpx))))) {
+                        continue;
+                    }
+
+                    if ((res->pw == 0) || (res->ph == 0)) {
+                        continue;
+                    }
+
+                    if ((trx0 == trx1) || (try0 == try1)) {
+                        continue;
+                    }
+
+                    prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx)
+                           - int_floordivpow2(trx0, res->pdx);
+                    prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy)
+                           - int_floordivpow2(try0, res->pdy);
+                    pi->precno = prci + prcj * res->pw;
+                    for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+                        index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno *
+                                pi->step_c + pi->precno * pi->step_p;
+                        if (!pi->include[index]) {
+                            pi->include[index] = 1;
+                            return OPJ_TRUE;
+                        }
+LABEL_SKIP:
+                        ;
+                    }
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-/* 
+/*
 ==========================================================
    Packet iterator interface
 ==========================================================
 */
 
-opj_pi_iterator_t *pi_create_decode(opj_image_t *image, opj_cp_t *cp, int tileno) {
-       int p, q;
-       int compno, resno, pino;
-       opj_pi_iterator_t *pi = NULL;
-       opj_tcp_t *tcp = NULL;
-       opj_tccp_t *tccp = NULL;
-
-       tcp = &cp->tcps[tileno];
-
-       pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
-       if(!pi) {
-               /* TODO: throw an error */
-               return NULL;
-       }
-
-       for (pino = 0; pino < tcp->numpocs + 1; pino++) {       /* change */
-               int maxres = 0;
-               int maxprec = 0;
-               p = tileno % cp->tw;
-               q = tileno / cp->tw;
-
-               pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-               pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-               pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-               pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-               pi[pino].numcomps = image->numcomps;
-
-               pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
-               if(!pi[pino].comps) {
-                       /* TODO: throw an error */
-                       pi_destroy(pi, cp, tileno);
-                       return NULL;
-               }
-               
-               for (compno = 0; compno < pi->numcomps; compno++) {
-                       int tcx0, tcy0, tcx1, tcy1;
-                       opj_pi_comp_t *comp = &pi[pino].comps[compno];
-                       tccp = &tcp->tccps[compno];
-                       comp->dx = image->comps[compno].dx;
-                       comp->dy = image->comps[compno].dy;
-                       comp->numresolutions = tccp->numresolutions;
-
-                       comp->resolutions = (opj_pi_resolution_t*) opj_calloc(comp->numresolutions, sizeof(opj_pi_resolution_t));
-                       if(!comp->resolutions) {
-                               /* TODO: throw an error */
-                               pi_destroy(pi, cp, tileno);
-                               return NULL;
-                       }
-
-                       tcx0 = int_ceildiv(pi->tx0, comp->dx);
-                       tcy0 = int_ceildiv(pi->ty0, comp->dy);
-                       tcx1 = int_ceildiv(pi->tx1, comp->dx);
-                       tcy1 = int_ceildiv(pi->ty1, comp->dy);
-                       if (comp->numresolutions > maxres) {
-                               maxres = comp->numresolutions;
-                       }
-
-                       for (resno = 0; resno < comp->numresolutions; resno++) {
-                               int levelno;
-                               int rx0, ry0, rx1, ry1;
-                               int px0, py0, px1, py1;
-                               opj_pi_resolution_t *res = &comp->resolutions[resno];
-                               if (tccp->csty & J2K_CCP_CSTY_PRT) {
-                                       res->pdx = tccp->prcw[resno];
-                                       res->pdy = tccp->prch[resno];
-                               } else {
-                                       res->pdx = 15;
-                                       res->pdy = 15;
-                               }
-                               levelno = comp->numresolutions - 1 - resno;
-                               rx0 = int_ceildivpow2(tcx0, levelno);
-                               ry0 = int_ceildivpow2(tcy0, levelno);
-                               rx1 = int_ceildivpow2(tcx1, levelno);
-                               ry1 = int_ceildivpow2(tcy1, levelno);
-                               px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
-                               py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
-                               px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
-                               py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
-                               res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
-                               res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
-                               
-                               if (res->pw*res->ph > maxprec) {
-                                       maxprec = res->pw*res->ph;
-                               }
-                               
-                       }
-               }
-               
-               tccp = &tcp->tccps[0];
-               pi[pino].step_p = 1;
-               pi[pino].step_c = maxprec * pi[pino].step_p;
-               pi[pino].step_r = image->numcomps * pi[pino].step_c;
-               pi[pino].step_l = maxres * pi[pino].step_r;
-               
-               if (pino == 0) {
-                       pi[pino].include = (short int*) opj_calloc(image->numcomps * maxres * tcp->numlayers * maxprec, sizeof(short int));
-                       if(!pi[pino].include) {
-                               /* TODO: throw an error */
-                               pi_destroy(pi, cp, tileno);
-                               return NULL;
-                       }
-               }
-               else {
-                       pi[pino].include = pi[pino - 1].include;
-               }
-               
-               if (tcp->POC == 0) {
-                       pi[pino].first = 1;
-                       pi[pino].poc.resno0 = 0;
-                       pi[pino].poc.compno0 = 0;
-                       pi[pino].poc.layno1 = tcp->numlayers;
-                       pi[pino].poc.resno1 = maxres;
-                       pi[pino].poc.compno1 = image->numcomps;
-                       pi[pino].poc.prg = tcp->prg;
-               } else {
-                       pi[pino].first = 1;
-                       pi[pino].poc.resno0 = tcp->pocs[pino].resno0;
-                       pi[pino].poc.compno0 = tcp->pocs[pino].compno0;
-                       pi[pino].poc.layno1 = tcp->pocs[pino].layno1;
-                       pi[pino].poc.resno1 = tcp->pocs[pino].resno1;
-                       pi[pino].poc.compno1 = tcp->pocs[pino].compno1;
-                       pi[pino].poc.prg = tcp->pocs[pino].prg;
-               }
-               pi[pino].poc.layno0  = 0;
-               pi[pino].poc.precno0 = 0; 
-               pi[pino].poc.precno1 = maxprec;
-                       
-       }
-       
-       return pi;
+opj_pi_iterator_t *pi_create_decode(opj_image_t *image, opj_cp_t *cp,
+                                    int tileno)
+{
+    int p, q;
+    int compno, resno, pino;
+    opj_pi_iterator_t *pi = NULL;
+    opj_tcp_t *tcp = NULL;
+    opj_tccp_t *tccp = NULL;
+
+    tcp = &cp->tcps[tileno];
+
+    pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1),
+                                         sizeof(opj_pi_iterator_t));
+    if (!pi) {
+        /* TODO: throw an error */
+        return NULL;
+    }
+
+    for (pino = 0; pino < tcp->numpocs + 1; pino++) {   /* change */
+        int maxres = 0;
+        int maxprec = 0;
+        p = tileno % cp->tw;
+        q = tileno / cp->tw;
+
+        pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+        pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+        pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+        pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+        pi[pino].numcomps = image->numcomps;
+
+        pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps,
+                         sizeof(opj_pi_comp_t));
+        if (!pi[pino].comps) {
+            /* TODO: throw an error */
+            pi_destroy(pi, cp, tileno);
+            return NULL;
+        }
+
+        for (compno = 0; compno < pi->numcomps; compno++) {
+            int tcx0, tcy0, tcx1, tcy1;
+            opj_pi_comp_t *comp = &pi[pino].comps[compno];
+            tccp = &tcp->tccps[compno];
+            comp->dx = image->comps[compno].dx;
+            comp->dy = image->comps[compno].dy;
+            comp->numresolutions = tccp->numresolutions;
+
+            comp->resolutions = (opj_pi_resolution_t*) opj_calloc(comp->numresolutions,
+                                sizeof(opj_pi_resolution_t));
+            if (!comp->resolutions) {
+                /* TODO: throw an error */
+                pi_destroy(pi, cp, tileno);
+                return NULL;
+            }
+
+            tcx0 = int_ceildiv(pi->tx0, comp->dx);
+            tcy0 = int_ceildiv(pi->ty0, comp->dy);
+            tcx1 = int_ceildiv(pi->tx1, comp->dx);
+            tcy1 = int_ceildiv(pi->ty1, comp->dy);
+            if (comp->numresolutions > maxres) {
+                maxres = comp->numresolutions;
+            }
+
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int levelno;
+                int rx0, ry0, rx1, ry1;
+                int px0, py0, px1, py1;
+                opj_pi_resolution_t *res = &comp->resolutions[resno];
+                if (tccp->csty & J2K_CCP_CSTY_PRT) {
+                    res->pdx = tccp->prcw[resno];
+                    res->pdy = tccp->prch[resno];
+                } else {
+                    res->pdx = 15;
+                    res->pdy = 15;
+                }
+                levelno = comp->numresolutions - 1 - resno;
+                rx0 = int_ceildivpow2(tcx0, levelno);
+                ry0 = int_ceildivpow2(tcy0, levelno);
+                rx1 = int_ceildivpow2(tcx1, levelno);
+                ry1 = int_ceildivpow2(tcy1, levelno);
+                px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
+                py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
+                px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
+                py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
+                res->pw = (rx0 == rx1) ? 0 : ((px1 - px0) >> res->pdx);
+                res->ph = (ry0 == ry1) ? 0 : ((py1 - py0) >> res->pdy);
+
+                if (res->pw * res->ph > maxprec) {
+                    maxprec = res->pw * res->ph;
+                }
+
+            }
+        }
+
+        tccp = &tcp->tccps[0];
+        pi[pino].step_p = 1;
+        pi[pino].step_c = maxprec * pi[pino].step_p;
+        pi[pino].step_r = image->numcomps * pi[pino].step_c;
+        pi[pino].step_l = maxres * pi[pino].step_r;
+
+        if (pino == 0) {
+            pi[pino].include = (short int*) opj_calloc(image->numcomps * maxres *
+                               tcp->numlayers * maxprec, sizeof(short int));
+            if (!pi[pino].include) {
+                /* TODO: throw an error */
+                pi_destroy(pi, cp, tileno);
+                return NULL;
+            }
+        } else {
+            pi[pino].include = pi[pino - 1].include;
+        }
+
+        if (tcp->POC == 0) {
+            pi[pino].first = 1;
+            pi[pino].poc.resno0 = 0;
+            pi[pino].poc.compno0 = 0;
+            pi[pino].poc.layno1 = tcp->numlayers;
+            pi[pino].poc.resno1 = maxres;
+            pi[pino].poc.compno1 = image->numcomps;
+            pi[pino].poc.prg = tcp->prg;
+        } else {
+            pi[pino].first = 1;
+            pi[pino].poc.resno0 = tcp->pocs[pino].resno0;
+            pi[pino].poc.compno0 = tcp->pocs[pino].compno0;
+            pi[pino].poc.layno1 = tcp->pocs[pino].layno1;
+            pi[pino].poc.resno1 = tcp->pocs[pino].resno1;
+            pi[pino].poc.compno1 = tcp->pocs[pino].compno1;
+            pi[pino].poc.prg = tcp->pocs[pino].prg;
+        }
+        pi[pino].poc.layno0  = 0;
+        pi[pino].poc.precno0 = 0;
+        pi[pino].poc.precno1 = maxprec;
+
+    }
+
+    return pi;
 }
 
 
-opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno, J2K_T2_MODE t2_mode){ 
-       int p, q, pino;
-       int compno, resno;
-       int maxres = 0;
-       int maxprec = 0;
-       opj_pi_iterator_t *pi = NULL;
-       opj_tcp_t *tcp = NULL;
-       opj_tccp_t *tccp = NULL;
-       
-       tcp = &cp->tcps[tileno];
-
-       pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
-       if(!pi) {       return NULL;}
-       pi->tp_on = cp->tp_on;
-
-       for(pino = 0;pino < tcp->numpocs+1 ; pino ++){
-               p = tileno % cp->tw;
-               q = tileno / cp->tw;
-
-               pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-               pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-               pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-               pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-               pi[pino].numcomps = image->numcomps;
-               
-               pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
-               if(!pi[pino].comps) {
-                       pi_destroy(pi, cp, tileno);
-                       return NULL;
-               }
-               
-               for (compno = 0; compno < pi[pino].numcomps; compno++) {
-                       int tcx0, tcy0, tcx1, tcy1;
-                       opj_pi_comp_t *comp = &pi[pino].comps[compno];
-                       tccp = &tcp->tccps[compno];
-                       comp->dx = image->comps[compno].dx;
-                       comp->dy = image->comps[compno].dy;
-                       comp->numresolutions = tccp->numresolutions;
-
-                       comp->resolutions = (opj_pi_resolution_t*) opj_malloc(comp->numresolutions * sizeof(opj_pi_resolution_t));
-                       if(!comp->resolutions) {
-                               pi_destroy(pi, cp, tileno);
-                               return NULL;
-                       }
-
-                       tcx0 = int_ceildiv(pi[pino].tx0, comp->dx);
-                       tcy0 = int_ceildiv(pi[pino].ty0, comp->dy);
-                       tcx1 = int_ceildiv(pi[pino].tx1, comp->dx);
-                       tcy1 = int_ceildiv(pi[pino].ty1, comp->dy);
-                       if (comp->numresolutions > maxres) {
-                               maxres = comp->numresolutions;
-                       }
-
-                       for (resno = 0; resno < comp->numresolutions; resno++) {
-                               int levelno;
-                               int rx0, ry0, rx1, ry1;
-                               int px0, py0, px1, py1;
-                               opj_pi_resolution_t *res = &comp->resolutions[resno];
-                               if (tccp->csty & J2K_CCP_CSTY_PRT) {
-                                       res->pdx = tccp->prcw[resno];
-                                       res->pdy = tccp->prch[resno];
-                               } else {
-                                       res->pdx = 15;
-                                       res->pdy = 15;
-                               }
-                               levelno = comp->numresolutions - 1 - resno;
-                               rx0 = int_ceildivpow2(tcx0, levelno);
-                               ry0 = int_ceildivpow2(tcy0, levelno);
-                               rx1 = int_ceildivpow2(tcx1, levelno);
-                               ry1 = int_ceildivpow2(tcy1, levelno);
-                               px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
-                               py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
-                               px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
-                               py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
-                               res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
-                               res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
-
-                               if (res->pw*res->ph > maxprec) {
-                                       maxprec = res->pw * res->ph;
-                               }
-                       }
-               }
-               
-               tccp = &tcp->tccps[0];
-               pi[pino].step_p = 1;
-               pi[pino].step_c = maxprec * pi[pino].step_p;
-               pi[pino].step_r = image->numcomps * pi[pino].step_c;
-               pi[pino].step_l = maxres * pi[pino].step_r;
-               
-               for (compno = 0; compno < pi->numcomps; compno++) {
-                       opj_pi_comp_t *comp = &pi->comps[compno];
-                       for (resno = 0; resno < comp->numresolutions; resno++) {
-                               int dx, dy;
-                               opj_pi_resolution_t *res = &comp->resolutions[resno];
-                               dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-                               dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-                               pi[pino].dx = !pi->dx ? dx : int_min(pi->dx, dx);
-                               pi[pino].dy = !pi->dy ? dy : int_min(pi->dy, dy);
-                       }
-               }
-
-               if (pino == 0) {
-                       pi[pino].include = (short int*) opj_calloc(tcp->numlayers * pi[pino].step_l, sizeof(short int));
-                       if(!pi[pino].include) {
-                               pi_destroy(pi, cp, tileno);
-                               return NULL;
-                       }
-               }
-               else {
-                       pi[pino].include = pi[pino - 1].include;
-               }
-               
-               /* Generation of boundaries for each prog flag*/
-                       if(tcp->POC && ( cp->cinema || ((!cp->cinema) && (t2_mode == FINAL_PASS)))){
-                               tcp->pocs[pino].compS= tcp->pocs[pino].compno0;
-                               tcp->pocs[pino].compE= tcp->pocs[pino].compno1;
-                               tcp->pocs[pino].resS = tcp->pocs[pino].resno0;
-                               tcp->pocs[pino].resE = tcp->pocs[pino].resno1;
-                               tcp->pocs[pino].layE = tcp->pocs[pino].layno1;
-                               tcp->pocs[pino].prg  = tcp->pocs[pino].prg1;
-                               if (pino > 0)
-                                       tcp->pocs[pino].layS = (tcp->pocs[pino].layE > tcp->pocs[pino - 1].layE) ? tcp->pocs[pino - 1].layE : 0;
-                       }else {
-                               tcp->pocs[pino].compS= 0;
-                               tcp->pocs[pino].compE= image->numcomps;
-                               tcp->pocs[pino].resS = 0;
-                               tcp->pocs[pino].resE = maxres;
-                               tcp->pocs[pino].layS = 0;
-                               tcp->pocs[pino].layE = tcp->numlayers;
-                               tcp->pocs[pino].prg  = tcp->prg;
-                       }
-                       tcp->pocs[pino].prcS = 0;
-                       tcp->pocs[pino].prcE = maxprec;;
-                       tcp->pocs[pino].txS = pi[pino].tx0;
-                       tcp->pocs[pino].txE = pi[pino].tx1;
-                       tcp->pocs[pino].tyS = pi[pino].ty0;
-                       tcp->pocs[pino].tyE = pi[pino].ty1;
-                       tcp->pocs[pino].dx = pi[pino].dx;
-                       tcp->pocs[pino].dy = pi[pino].dy;
-               }
-                       return pi;
-       }
-
-
-
-void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno) {
-       int compno, pino;
-       opj_tcp_t *tcp = &cp->tcps[tileno];
-       if(pi) {
-               for (pino = 0; pino < tcp->numpocs + 1; pino++) {       
-                       if(pi[pino].comps) {
-                               for (compno = 0; compno < pi->numcomps; compno++) {
-                                       opj_pi_comp_t *comp = &pi[pino].comps[compno];
-                                       if(comp->resolutions) {
-                                               opj_free(comp->resolutions);
-                                       }
-                               }
-                               opj_free(pi[pino].comps);
-                       }
-               }
-               if(pi->include) {
-                       opj_free(pi->include);
-               }
-               opj_free(pi);
-       }
+opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp,
+                                        int tileno, J2K_T2_MODE t2_mode)
+{
+    int p, q, pino;
+    int compno, resno;
+    int maxres = 0;
+    int maxprec = 0;
+    opj_pi_iterator_t *pi = NULL;
+    opj_tcp_t *tcp = NULL;
+    opj_tccp_t *tccp = NULL;
+
+    tcp = &cp->tcps[tileno];
+
+    pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1),
+                                         sizeof(opj_pi_iterator_t));
+    if (!pi) {
+        return NULL;
+    }
+    pi->tp_on = cp->tp_on;
+
+    for (pino = 0; pino < tcp->numpocs + 1 ; pino ++) {
+        p = tileno % cp->tw;
+        q = tileno / cp->tw;
+
+        pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+        pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+        pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+        pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+        pi[pino].numcomps = image->numcomps;
+
+        pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps,
+                         sizeof(opj_pi_comp_t));
+        if (!pi[pino].comps) {
+            pi_destroy(pi, cp, tileno);
+            return NULL;
+        }
+
+        for (compno = 0; compno < pi[pino].numcomps; compno++) {
+            int tcx0, tcy0, tcx1, tcy1;
+            opj_pi_comp_t *comp = &pi[pino].comps[compno];
+            tccp = &tcp->tccps[compno];
+            comp->dx = image->comps[compno].dx;
+            comp->dy = image->comps[compno].dy;
+            comp->numresolutions = tccp->numresolutions;
+
+            comp->resolutions = (opj_pi_resolution_t*) opj_malloc(comp->numresolutions *
+                                sizeof(opj_pi_resolution_t));
+            if (!comp->resolutions) {
+                pi_destroy(pi, cp, tileno);
+                return NULL;
+            }
+
+            tcx0 = int_ceildiv(pi[pino].tx0, comp->dx);
+            tcy0 = int_ceildiv(pi[pino].ty0, comp->dy);
+            tcx1 = int_ceildiv(pi[pino].tx1, comp->dx);
+            tcy1 = int_ceildiv(pi[pino].ty1, comp->dy);
+            if (comp->numresolutions > maxres) {
+                maxres = comp->numresolutions;
+            }
+
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int levelno;
+                int rx0, ry0, rx1, ry1;
+                int px0, py0, px1, py1;
+                opj_pi_resolution_t *res = &comp->resolutions[resno];
+                if (tccp->csty & J2K_CCP_CSTY_PRT) {
+                    res->pdx = tccp->prcw[resno];
+                    res->pdy = tccp->prch[resno];
+                } else {
+                    res->pdx = 15;
+                    res->pdy = 15;
+                }
+                levelno = comp->numresolutions - 1 - resno;
+                rx0 = int_ceildivpow2(tcx0, levelno);
+                ry0 = int_ceildivpow2(tcy0, levelno);
+                rx1 = int_ceildivpow2(tcx1, levelno);
+                ry1 = int_ceildivpow2(tcy1, levelno);
+                px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
+                py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
+                px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
+                py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
+                res->pw = (rx0 == rx1) ? 0 : ((px1 - px0) >> res->pdx);
+                res->ph = (ry0 == ry1) ? 0 : ((py1 - py0) >> res->pdy);
+
+                if (res->pw * res->ph > maxprec) {
+                    maxprec = res->pw * res->ph;
+                }
+            }
+        }
+
+        tccp = &tcp->tccps[0];
+        pi[pino].step_p = 1;
+        pi[pino].step_c = maxprec * pi[pino].step_p;
+        pi[pino].step_r = image->numcomps * pi[pino].step_c;
+        pi[pino].step_l = maxres * pi[pino].step_r;
+
+        for (compno = 0; compno < pi->numcomps; compno++) {
+            opj_pi_comp_t *comp = &pi->comps[compno];
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int dx, dy;
+                opj_pi_resolution_t *res = &comp->resolutions[resno];
+                dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+                dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+                pi[pino].dx = !pi->dx ? dx : int_min(pi->dx, dx);
+                pi[pino].dy = !pi->dy ? dy : int_min(pi->dy, dy);
+            }
+        }
+
+        if (pino == 0) {
+            pi[pino].include = (short int*) opj_calloc(tcp->numlayers * pi[pino].step_l,
+                               sizeof(short int));
+            if (!pi[pino].include) {
+                pi_destroy(pi, cp, tileno);
+                return NULL;
+            }
+        } else {
+            pi[pino].include = pi[pino - 1].include;
+        }
+
+        /* Generation of boundaries for each prog flag*/
+        if (tcp->POC && (cp->cinema || ((!cp->cinema) && (t2_mode == FINAL_PASS)))) {
+            tcp->pocs[pino].compS = tcp->pocs[pino].compno0;
+            tcp->pocs[pino].compE = tcp->pocs[pino].compno1;
+            tcp->pocs[pino].resS = tcp->pocs[pino].resno0;
+            tcp->pocs[pino].resE = tcp->pocs[pino].resno1;
+            tcp->pocs[pino].layE = tcp->pocs[pino].layno1;
+            tcp->pocs[pino].prg  = tcp->pocs[pino].prg1;
+            if (pino > 0) {
+                tcp->pocs[pino].layS = (tcp->pocs[pino].layE > tcp->pocs[pino - 1].layE) ?
+                                       tcp->pocs[pino - 1].layE : 0;
+            }
+        } else {
+            tcp->pocs[pino].compS = 0;
+            tcp->pocs[pino].compE = image->numcomps;
+            tcp->pocs[pino].resS = 0;
+            tcp->pocs[pino].resE = maxres;
+            tcp->pocs[pino].layS = 0;
+            tcp->pocs[pino].layE = tcp->numlayers;
+            tcp->pocs[pino].prg  = tcp->prg;
+        }
+        tcp->pocs[pino].prcS = 0;
+        tcp->pocs[pino].prcE = maxprec;;
+        tcp->pocs[pino].txS = pi[pino].tx0;
+        tcp->pocs[pino].txE = pi[pino].tx1;
+        tcp->pocs[pino].tyS = pi[pino].ty0;
+        tcp->pocs[pino].tyE = pi[pino].ty1;
+        tcp->pocs[pino].dx = pi[pino].dx;
+        tcp->pocs[pino].dy = pi[pino].dy;
+    }
+    return pi;
+}
+
+
+
+void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno)
+{
+    int compno, pino;
+    opj_tcp_t *tcp = &cp->tcps[tileno];
+    if (pi) {
+        for (pino = 0; pino < tcp->numpocs + 1; pino++) {
+            if (pi[pino].comps) {
+                for (compno = 0; compno < pi->numcomps; compno++) {
+                    opj_pi_comp_t *comp = &pi[pino].comps[compno];
+                    if (comp->resolutions) {
+                        opj_free(comp->resolutions);
+                    }
+                }
+                opj_free(pi[pino].comps);
+            }
+        }
+        if (pi->include) {
+            opj_free(pi->include);
+        }
+        opj_free(pi);
+    }
 }
 
-opj_bool pi_next(opj_pi_iterator_t * pi) {
-       switch (pi->poc.prg) {
-               case LRCP:
-                       return pi_next_lrcp(pi);
-               case RLCP:
-                       return pi_next_rlcp(pi);
-               case RPCL:
-                       return pi_next_rpcl(pi);
-               case PCRL:
-                       return pi_next_pcrl(pi);
-               case CPRL:
-                       return pi_next_cprl(pi);
-               case PROG_UNKNOWN:
-                       return OPJ_FALSE;
-       }
-       
-       return OPJ_FALSE;
+opj_bool pi_next(opj_pi_iterator_t * pi)
+{
+    switch (pi->poc.prg) {
+    case LRCP:
+        return pi_next_lrcp(pi);
+    case RLCP:
+        return pi_next_rlcp(pi);
+    case RPCL:
+        return pi_next_rpcl(pi);
+    case PCRL:
+        return pi_next_pcrl(pi);
+    case CPRL:
+        return pi_next_cprl(pi);
+    case PROG_UNKNOWN:
+        return OPJ_FALSE;
+    }
+
+    return OPJ_FALSE;
 }
 
-opj_bool pi_create_encode( opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos, J2K_T2_MODE t2_mode,int cur_totnum_tp){
-       char prog[4];
-       int i;
-       int incr_top=1,resetX=0;
-       opj_tcp_t *tcps =&cp->tcps[tileno];
-       opj_poc_t *tcp= &tcps->pocs[pino];
-
-       pi[pino].first = 1;
-       pi[pino].poc.prg = tcp->prg;
-
-       switch(tcp->prg){
-               case CPRL: strncpy(prog, "CPRL",4);
-                       break;
-               case LRCP: strncpy(prog, "LRCP",4);
-                       break;
-               case PCRL: strncpy(prog, "PCRL",4);
-                       break;
-               case RLCP: strncpy(prog, "RLCP",4);
-                       break;
-               case RPCL: strncpy(prog, "RPCL",4);
-                       break;
-               case PROG_UNKNOWN: 
-                       return OPJ_TRUE;
-       }
-
-       if(!(cp->tp_on && ((!cp->cinema && (t2_mode == FINAL_PASS)) || cp->cinema))){
-               pi[pino].poc.resno0 = tcp->resS;
-               pi[pino].poc.resno1 = tcp->resE;
-               pi[pino].poc.compno0 = tcp->compS;
-               pi[pino].poc.compno1 = tcp->compE;
-               pi[pino].poc.layno0 = tcp->layS;
-               pi[pino].poc.layno1 = tcp->layE;
-               pi[pino].poc.precno0 = tcp->prcS;
-               pi[pino].poc.precno1 = tcp->prcE;
-               pi[pino].poc.tx0 = tcp->txS;
-               pi[pino].poc.ty0 = tcp->tyS;
-               pi[pino].poc.tx1 = tcp->txE;
-               pi[pino].poc.ty1 = tcp->tyE;
-       }else {
-               if( tpnum < cur_totnum_tp){
-                       for(i=3;i>=0;i--){
-                               switch(prog[i]){
-                               case 'C':
-                                       if (i > tppos){
-                                               pi[pino].poc.compno0 = tcp->compS;
-                                               pi[pino].poc.compno1 = tcp->compE;
-                                       }else{
-                                               if (tpnum == 0){
-                                                       tcp->comp_t = tcp->compS;
-                                                       pi[pino].poc.compno0 = tcp->comp_t;
-                                                       pi[pino].poc.compno1 = tcp->comp_t+1;
-                                                       tcp->comp_t+=1;
-                                               }else{
-                                                       if (incr_top == 1){
-                                                               if(tcp->comp_t ==tcp->compE){
-                                                                       tcp->comp_t = tcp->compS;
-                                                                       pi[pino].poc.compno0 = tcp->comp_t;
-                                                                       pi[pino].poc.compno1 = tcp->comp_t+1;
-                                                                       tcp->comp_t+=1;
-                                                                       incr_top=1;
-                                                               }else{
-                                                                       pi[pino].poc.compno0 = tcp->comp_t;
-                                                                       pi[pino].poc.compno1 = tcp->comp_t+1;
-                                                                       tcp->comp_t+=1;
-                                                                       incr_top=0;
-                                                               }
-                                                       }else{
-                                                               pi[pino].poc.compno0 = tcp->comp_t-1;
-                                                               pi[pino].poc.compno1 = tcp->comp_t;
-                                                       }
-                                               }
-                                       }
-                                       break;
-
-                               case 'R':
-                                       if (i > tppos){
-                                               pi[pino].poc.resno0 = tcp->resS;
-                                               pi[pino].poc.resno1 = tcp->resE;
-                                       }else{
-                                               if (tpnum == 0){
-                                                       tcp->res_t = tcp->resS;
-                                                       pi[pino].poc.resno0 = tcp->res_t;
-                                                       pi[pino].poc.resno1 = tcp->res_t+1;
-                                                       tcp->res_t+=1;
-                                               }else{
-                                                       if (incr_top == 1){
-                                                               if(tcp->res_t==tcp->resE){
-                                                                       tcp->res_t = tcp->resS;
-                                                                       pi[pino].poc.resno0 = tcp->res_t;
-                                                                       pi[pino].poc.resno1 = tcp->res_t+1;
-                                                                       tcp->res_t+=1;
-                                                                       incr_top=1;
-                                                               }else{
-                                                                       pi[pino].poc.resno0 = tcp->res_t;
-                                                                       pi[pino].poc.resno1 = tcp->res_t+1;
-                                                                       tcp->res_t+=1;
-                                                                       incr_top=0;
-                                                               }
-                                                       }else{
-                                                               pi[pino].poc.resno0 = tcp->res_t - 1;
-                                                               pi[pino].poc.resno1 = tcp->res_t;
-                                                       }
-                                               }
-                                       }
-                                       break;
-
-                               case 'L':
-                                       if (i > tppos){
-                                               pi[pino].poc.layno0 = tcp->layS;
-                                               pi[pino].poc.layno1 = tcp->layE;
-                                       }else{
-                                               if (tpnum == 0){
-                                                       tcp->lay_t = tcp->layS;
-                                                       pi[pino].poc.layno0 = tcp->lay_t;
-                                                       pi[pino].poc.layno1 = tcp->lay_t+1;
-                                                       tcp->lay_t+=1;
-                                               }else{
-                                                       if (incr_top == 1){
-                                                               if(tcp->lay_t == tcp->layE){
-                                                                       tcp->lay_t = tcp->layS;
-                                                                       pi[pino].poc.layno0 = tcp->lay_t;
-                                                                       pi[pino].poc.layno1 = tcp->lay_t+1;
-                                                                       tcp->lay_t+=1;
-                                                                       incr_top=1;
-                                                               }else{
-                                                                       pi[pino].poc.layno0 = tcp->lay_t;
-                                                                       pi[pino].poc.layno1 = tcp->lay_t+1;
-                                                                       tcp->lay_t+=1;
-                                                                       incr_top=0;
-                                                               }
-                                                       }else{
-                                                               pi[pino].poc.layno0 = tcp->lay_t - 1;
-                                                               pi[pino].poc.layno1 = tcp->lay_t;
-                                                       }
-                                               }
-                                       }
-                                       break;
-
-                               case 'P':
-                                       switch(tcp->prg){
-                                               case LRCP:
-                                               case RLCP:
-                                                       if (i > tppos){
-                                                               pi[pino].poc.precno0 = tcp->prcS;
-                                                               pi[pino].poc.precno1 = tcp->prcE;
-                                                       }else{
-                                                               if (tpnum == 0){
-                                                                       tcp->prc_t = tcp->prcS;
-                                                                       pi[pino].poc.precno0 = tcp->prc_t;
-                                                                       pi[pino].poc.precno1 = tcp->prc_t+1;
-                                                                       tcp->prc_t+=1; 
-                                                               }else{
-                                                                       if (incr_top == 1){
-                                                                               if(tcp->prc_t == tcp->prcE){
-                                                                                       tcp->prc_t = tcp->prcS;
-                                                                                       pi[pino].poc.precno0 = tcp->prc_t;
-                                                                                       pi[pino].poc.precno1 = tcp->prc_t+1;
-                                                                                       tcp->prc_t+=1;
-                                                                                       incr_top=1;
-                                                                               }else{
-                                                                                       pi[pino].poc.precno0 = tcp->prc_t;
-                                                                                       pi[pino].poc.precno1 = tcp->prc_t+1;
-                                                                                       tcp->prc_t+=1;
-                                                                                       incr_top=0;
-                                                                               }
-                                                                       }else{
-                                                                               pi[pino].poc.precno0 = tcp->prc_t - 1;
-                                                                               pi[pino].poc.precno1 = tcp->prc_t;
-                                                                       }
-                                                               }
-                                                       }
-                                               break;
-                                               default:
-                                                       if (i > tppos){
-                                                               pi[pino].poc.tx0 = tcp->txS;
-                                                               pi[pino].poc.ty0 = tcp->tyS;
-                                                               pi[pino].poc.tx1 = tcp->txE;
-                                                               pi[pino].poc.ty1 = tcp->tyE;
-                                                       }else{
-                                                               if (tpnum == 0){
-                                                                       tcp->tx0_t = tcp->txS;
-                                                                       tcp->ty0_t = tcp->tyS;
-                                                                       pi[pino].poc.tx0 = tcp->tx0_t;
-                                                                       pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
-                                                                       pi[pino].poc.ty0 = tcp->ty0_t;
-                                                                       pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-                                                                       tcp->tx0_t = pi[pino].poc.tx1;
-                                                                       tcp->ty0_t = pi[pino].poc.ty1;
-                                                               }else{
-                                                                       if (incr_top == 1){
-                                                                               if(tcp->tx0_t >= tcp->txE){
-                                                                                       if(tcp->ty0_t >= tcp->tyE){
-                                                                                               tcp->ty0_t = tcp->tyS;
-                                                                                               pi[pino].poc.ty0 = tcp->ty0_t;
-                                                                                               pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-                                                                                               tcp->ty0_t = pi[pino].poc.ty1;
-                                                                                               incr_top=1;resetX=1;
-                                                                                       }else{
-                                                                                               pi[pino].poc.ty0 = tcp->ty0_t;
-                                                                                               pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-                                                                                               tcp->ty0_t = pi[pino].poc.ty1;
-                                                                                               incr_top=0;resetX=1;
-                                                                                       }
-                                                                                       if(resetX==1){
-                                                                                               tcp->tx0_t = tcp->txS;
-                                                                                               pi[pino].poc.tx0 = tcp->tx0_t;
-                                                                                               pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
-                                                                                               tcp->tx0_t = pi[pino].poc.tx1;
-                                                                                       }
-                                                                               }else{
-                                                                                       pi[pino].poc.tx0 = tcp->tx0_t;
-                                                                                       pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
-                                                                                       tcp->tx0_t = pi[pino].poc.tx1;
-                                                                                       pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
-                                                                                       pi[pino].poc.ty1 = tcp->ty0_t ;
-                                                                                       incr_top=0;
-                                                                               }
-                                                                       }else{
-                                                                               pi[pino].poc.tx0 = tcp->tx0_t - tcp->dx - (tcp->tx0_t % tcp->dx);
-                                                                               pi[pino].poc.tx1 = tcp->tx0_t ;
-                                                                               pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
-                                                                               pi[pino].poc.ty1 = tcp->ty0_t ;
-                                                                       }
-                                                               }
-                                                       }
-                                               break;
-                                               }
-                                               break;
-                               }               
-                       } 
-               }
-       }       
-       return OPJ_FALSE;
+opj_bool pi_create_encode(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno,
+                          int pino, int tpnum, int tppos, J2K_T2_MODE t2_mode, int cur_totnum_tp)
+{
+    char prog[4];
+    int i;
+    int incr_top = 1, resetX = 0;
+    opj_tcp_t *tcps = &cp->tcps[tileno];
+    opj_poc_t *tcp = &tcps->pocs[pino];
+
+    pi[pino].first = 1;
+    pi[pino].poc.prg = tcp->prg;
+
+    switch (tcp->prg) {
+    case CPRL:
+        strncpy(prog, "CPRL", 4);
+        break;
+    case LRCP:
+        strncpy(prog, "LRCP", 4);
+        break;
+    case PCRL:
+        strncpy(prog, "PCRL", 4);
+        break;
+    case RLCP:
+        strncpy(prog, "RLCP", 4);
+        break;
+    case RPCL:
+        strncpy(prog, "RPCL", 4);
+        break;
+    case PROG_UNKNOWN:
+        return OPJ_TRUE;
+    }
+
+    if (!(cp->tp_on && ((!cp->cinema && (t2_mode == FINAL_PASS)) || cp->cinema))) {
+        pi[pino].poc.resno0 = tcp->resS;
+        pi[pino].poc.resno1 = tcp->resE;
+        pi[pino].poc.compno0 = tcp->compS;
+        pi[pino].poc.compno1 = tcp->compE;
+        pi[pino].poc.layno0 = tcp->layS;
+        pi[pino].poc.layno1 = tcp->layE;
+        pi[pino].poc.precno0 = tcp->prcS;
+        pi[pino].poc.precno1 = tcp->prcE;
+        pi[pino].poc.tx0 = tcp->txS;
+        pi[pino].poc.ty0 = tcp->tyS;
+        pi[pino].poc.tx1 = tcp->txE;
+        pi[pino].poc.ty1 = tcp->tyE;
+    } else {
+        if (tpnum < cur_totnum_tp) {
+            for (i = 3; i >= 0; i--) {
+                switch (prog[i]) {
+                case 'C':
+                    if (i > tppos) {
+                        pi[pino].poc.compno0 = tcp->compS;
+                        pi[pino].poc.compno1 = tcp->compE;
+                    } else {
+                        if (tpnum == 0) {
+                            tcp->comp_t = tcp->compS;
+                            pi[pino].poc.compno0 = tcp->comp_t;
+                            pi[pino].poc.compno1 = tcp->comp_t + 1;
+                            tcp->comp_t += 1;
+                        } else {
+                            if (incr_top == 1) {
+                                if (tcp->comp_t == tcp->compE) {
+                                    tcp->comp_t = tcp->compS;
+                                    pi[pino].poc.compno0 = tcp->comp_t;
+                                    pi[pino].poc.compno1 = tcp->comp_t + 1;
+                                    tcp->comp_t += 1;
+                                    incr_top = 1;
+                                } else {
+                                    pi[pino].poc.compno0 = tcp->comp_t;
+                                    pi[pino].poc.compno1 = tcp->comp_t + 1;
+                                    tcp->comp_t += 1;
+                                    incr_top = 0;
+                                }
+                            } else {
+                                pi[pino].poc.compno0 = tcp->comp_t - 1;
+                                pi[pino].poc.compno1 = tcp->comp_t;
+                            }
+                        }
+                    }
+                    break;
+
+                case 'R':
+                    if (i > tppos) {
+                        pi[pino].poc.resno0 = tcp->resS;
+                        pi[pino].poc.resno1 = tcp->resE;
+                    } else {
+                        if (tpnum == 0) {
+                            tcp->res_t = tcp->resS;
+                            pi[pino].poc.resno0 = tcp->res_t;
+                            pi[pino].poc.resno1 = tcp->res_t + 1;
+                            tcp->res_t += 1;
+                        } else {
+                            if (incr_top == 1) {
+                                if (tcp->res_t == tcp->resE) {
+                                    tcp->res_t = tcp->resS;
+                                    pi[pino].poc.resno0 = tcp->res_t;
+                                    pi[pino].poc.resno1 = tcp->res_t + 1;
+                                    tcp->res_t += 1;
+                                    incr_top = 1;
+                                } else {
+                                    pi[pino].poc.resno0 = tcp->res_t;
+                                    pi[pino].poc.resno1 = tcp->res_t + 1;
+                                    tcp->res_t += 1;
+                                    incr_top = 0;
+                                }
+                            } else {
+                                pi[pino].poc.resno0 = tcp->res_t - 1;
+                                pi[pino].poc.resno1 = tcp->res_t;
+                            }
+                        }
+                    }
+                    break;
+
+                case 'L':
+                    if (i > tppos) {
+                        pi[pino].poc.layno0 = tcp->layS;
+                        pi[pino].poc.layno1 = tcp->layE;
+                    } else {
+                        if (tpnum == 0) {
+                            tcp->lay_t = tcp->layS;
+                            pi[pino].poc.layno0 = tcp->lay_t;
+                            pi[pino].poc.layno1 = tcp->lay_t + 1;
+                            tcp->lay_t += 1;
+                        } else {
+                            if (incr_top == 1) {
+                                if (tcp->lay_t == tcp->layE) {
+                                    tcp->lay_t = tcp->layS;
+                                    pi[pino].poc.layno0 = tcp->lay_t;
+                                    pi[pino].poc.layno1 = tcp->lay_t + 1;
+                                    tcp->lay_t += 1;
+                                    incr_top = 1;
+                                } else {
+                                    pi[pino].poc.layno0 = tcp->lay_t;
+                                    pi[pino].poc.layno1 = tcp->lay_t + 1;
+                                    tcp->lay_t += 1;
+                                    incr_top = 0;
+                                }
+                            } else {
+                                pi[pino].poc.layno0 = tcp->lay_t - 1;
+                                pi[pino].poc.layno1 = tcp->lay_t;
+                            }
+                        }
+                    }
+                    break;
+
+                case 'P':
+                    switch (tcp->prg) {
+                    case LRCP:
+                    case RLCP:
+                        if (i > tppos) {
+                            pi[pino].poc.precno0 = tcp->prcS;
+                            pi[pino].poc.precno1 = tcp->prcE;
+                        } else {
+                            if (tpnum == 0) {
+                                tcp->prc_t = tcp->prcS;
+                                pi[pino].poc.precno0 = tcp->prc_t;
+                                pi[pino].poc.precno1 = tcp->prc_t + 1;
+                                tcp->prc_t += 1;
+                            } else {
+                                if (incr_top == 1) {
+                                    if (tcp->prc_t == tcp->prcE) {
+                                        tcp->prc_t = tcp->prcS;
+                                        pi[pino].poc.precno0 = tcp->prc_t;
+                                        pi[pino].poc.precno1 = tcp->prc_t + 1;
+                                        tcp->prc_t += 1;
+                                        incr_top = 1;
+                                    } else {
+                                        pi[pino].poc.precno0 = tcp->prc_t;
+                                        pi[pino].poc.precno1 = tcp->prc_t + 1;
+                                        tcp->prc_t += 1;
+                                        incr_top = 0;
+                                    }
+                                } else {
+                                    pi[pino].poc.precno0 = tcp->prc_t - 1;
+                                    pi[pino].poc.precno1 = tcp->prc_t;
+                                }
+                            }
+                        }
+                        break;
+                    default:
+                        if (i > tppos) {
+                            pi[pino].poc.tx0 = tcp->txS;
+                            pi[pino].poc.ty0 = tcp->tyS;
+                            pi[pino].poc.tx1 = tcp->txE;
+                            pi[pino].poc.ty1 = tcp->tyE;
+                        } else {
+                            if (tpnum == 0) {
+                                tcp->tx0_t = tcp->txS;
+                                tcp->ty0_t = tcp->tyS;
+                                pi[pino].poc.tx0 = tcp->tx0_t;
+                                pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
+                                pi[pino].poc.ty0 = tcp->ty0_t;
+                                pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+                                tcp->tx0_t = pi[pino].poc.tx1;
+                                tcp->ty0_t = pi[pino].poc.ty1;
+                            } else {
+                                if (incr_top == 1) {
+                                    if (tcp->tx0_t >= tcp->txE) {
+                                        if (tcp->ty0_t >= tcp->tyE) {
+                                            tcp->ty0_t = tcp->tyS;
+                                            pi[pino].poc.ty0 = tcp->ty0_t;
+                                            pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+                                            tcp->ty0_t = pi[pino].poc.ty1;
+                                            incr_top = 1;
+                                            resetX = 1;
+                                        } else {
+                                            pi[pino].poc.ty0 = tcp->ty0_t;
+                                            pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+                                            tcp->ty0_t = pi[pino].poc.ty1;
+                                            incr_top = 0;
+                                            resetX = 1;
+                                        }
+                                        if (resetX == 1) {
+                                            tcp->tx0_t = tcp->txS;
+                                            pi[pino].poc.tx0 = tcp->tx0_t;
+                                            pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
+                                            tcp->tx0_t = pi[pino].poc.tx1;
+                                        }
+                                    } else {
+                                        pi[pino].poc.tx0 = tcp->tx0_t;
+                                        pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
+                                        tcp->tx0_t = pi[pino].poc.tx1;
+                                        pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
+                                        pi[pino].poc.ty1 = tcp->ty0_t ;
+                                        incr_top = 0;
+                                    }
+                                } else {
+                                    pi[pino].poc.tx0 = tcp->tx0_t - tcp->dx - (tcp->tx0_t % tcp->dx);
+                                    pi[pino].poc.tx1 = tcp->tx0_t ;
+                                    pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
+                                    pi[pino].poc.ty1 = tcp->ty0_t ;
+                                }
+                            }
+                        }
+                        break;
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    return OPJ_FALSE;
 }