Update for version 0.8

1 files changed, 118 insertions, 164 deletions

diff --git a/libopenjpeg/pi.c b/libopenjpeg/pi.c
index eca2c451..42bfab29 100644
--- a/libopenjpeg/pi.c
+++ b/libopenjpeg/pi.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2003-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,53 +31,40 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-
-/* <summary> */
-/* Create a packet iterator.   */
-/* </summary> */
+/* <summary>
+ * Create a packet iterator.
+ * </summary> */
 pi_iterator_t *pi_create(j2k_image_t * img, j2k_cp_t * cp, int tileno)
 {
-	int p, q;
-	int compno, resno, pino, layno, precno;
+	int p, q, i;
+	int compno, resno, pino;
 	int maxres = 0;
 	pi_iterator_t *pi;
 	j2k_tcp_t *tcp;
 	j2k_tccp_t *tccp;
 
 	tcp = &cp->tcps[tileno];
-	pi =
-		(pi_iterator_t *) malloc((tcp->numpocs + 1) * sizeof(pi_iterator_t));
+	pi = (pi_iterator_t *) malloc((tcp->numpocs + 1) * sizeof(pi_iterator_t));
 
 	for (pino = 0; pino < tcp->numpocs + 1; pino++) {	/* change */
 		p = tileno % cp->tw;
 		q = tileno / cp->tw;
 
-		/*    pi->tx0=int_max(cp->tx0+p*cp->tdx, img->x0);
-		   pi->ty0=int_max(cp->ty0+q*cp->tdy, img->y0);
-		   pi->tx1=int_min(cp->tx0+(p+1)*cp->tdx, img->x1);
-		   pi->ty1=int_min(cp->ty0+(q+1)*cp->tdy, img->y1);
-		   pi->numcomps=img->numcomps;
-		   pi->comps=(pi_comp_t*)malloc(img->numcomps*sizeof(pi_comp_t)); */
-
 		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, img->x0);
 		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, img->y0);
 		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, img->x1);
 		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, img->y1);
 		pi[pino].numcomps = img->numcomps;
-		pi[pino].comps =
-			(pi_comp_t *) malloc(img->numcomps * sizeof(pi_comp_t));
+		pi[pino].comps = (pi_comp_t *) malloc(img->numcomps * sizeof(pi_comp_t));
 
 		for (compno = 0; compno < pi->numcomps; compno++) {
 			int tcx0, tcy0, tcx1, tcy1;
-			/* pi_comp_t *comp=&pi->comps[compno]; */
 			pi_comp_t *comp = &pi[pino].comps[compno];
 			tccp = &tcp->tccps[compno];
 			comp->dx = img->comps[compno].dx;
 			comp->dy = img->comps[compno].dy;
 			comp->numresolutions = tccp->numresolutions;
-			comp->resolutions =
-				(pi_resolution_t *) malloc(comp->numresolutions *
-																	 sizeof(pi_resolution_t));
+			comp->resolutions = (pi_resolution_t *) malloc(comp->numresolutions * sizeof(pi_resolution_t));
 			tcx0 = int_ceildiv(pi->tx0, comp->dx);
 			tcy0 = int_ceildiv(pi->ty0, comp->dy);
 			tcx1 = int_ceildiv(pi->tx1, comp->dx);
@@ -110,30 +97,24 @@ pi_iterator_t *pi_create(j2k_image_t * img, j2k_cp_t * cp, int tileno)
 				res->ph = (py1 - py0) >> res->pdy;
 			}
 		}
+		
+		tccp = &tcp->tccps[0];
+		pi[pino].step_p=1;
+		pi[pino].step_c=100*pi[pino].step_p;
+		pi[pino].step_r=img->numcomps*pi[pino].step_c;
+		pi[pino].step_l=maxres*pi[pino].step_r;
 
-		/*   pi->first=1;
-		   pi->poc.resno0=0;
-		   pi->poc.compno0=0;
-		   pi->poc.layno1=tcp->numlayers;
-		   pi->poc.resno1=maxres;
-		   pi->poc.compno1=img->numcomps;
-		   pi->poc.prg=tcp->prg; */
-
-		for (layno = 0; layno < 10; layno++) {
-			/* pi_comp_t *compo; */
-			/* pi_resolution_t *res; */
-			for (resno = 0; resno < 10; resno++) {
-				for (compno = 0; compno < 3; compno++) {
-					/* compo=&pi[pino].comps[compno]; */
-					/* res=&compo->resolutions[pi->resno]; */
-					for (precno = 0; precno < 99; precno++) {
-						pi[pino].include[layno][resno][compno][precno] = 0;
-					}
-				}
-			}
-		}
+		if (pino==0)
+		  {  
+		    pi[pino].include = (short int*)malloc(img->numcomps*maxres*tcp->numlayers*100*sizeof(short int));
+		    for (i=0 ; i<img->numcomps*maxres*tcp->numlayers*100; i++)
+		      pi[pino].include[i]=0;
+		  }
+		/* pi[pino].include=(short int*)calloc(img->numcomps*maxres*tcp->numlayers*1000,sizeof(short int));*/
+		else
+		  pi[pino].include=pi[pino-1].include;
 
-		if (pino == tcp->numpocs) {
+		if (tcp->POC == 0) {
 			pi[pino].first = 1;
 			pi[pino].poc.resno0 = 0;
 			pi[pino].poc.compno0 = 0;
@@ -154,9 +135,11 @@ pi_iterator_t *pi_create(j2k_image_t * img, j2k_cp_t * cp, int tileno)
 	return pi;
 }
 
-/* <summary> */
-/* Get next packet in layer=resolution-component-precinct order.   */
-/* </summary> */
+/* <summary>
+ * Get next packet in layer-resolution-component-precinct order.
+ * 
+ * pi: packet iterator to modify
+ * </summary> */
 int pi_next_lrcp(pi_iterator_t * pi)
 {
 	pi_comp_t *comp;
@@ -170,32 +153,32 @@ int pi_next_lrcp(pi_iterator_t * pi)
 		pi->first = 0;
 	}
 	for (pi->layno = 0; 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];
-				for (pi->precno = 0; pi->precno < res->pw * res->ph; pi->precno++) {
-					if (!pi->include[pi->layno][pi->resno][pi->compno][pi->precno]) {
-						pi->include[pi->layno][pi->resno][pi->compno][pi->precno] = 1;
-						return 1;
-					}
-				skip:;
-				}
-			}
+	  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];
+	      for (pi->precno = 0; pi->precno < res->pw * res->ph; pi->precno++) 
+		{
+		  if (!pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
+		    pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;
+		    return 1;
+		  }
+		skip:;
 		}
+	    }
+	  }
 	}
 	return 0;
 }
 
-/* <summary> */
-/* Get next packet in resolution-layer-component-precinct order.   */
-/* </summary> */
+/* <summary>
+ * Get next packet in resolution-layer-component-precinct order.
+ *
+ * pi: packet iterator to modify
+ * </summary> */
 int pi_next_rlcp(pi_iterator_t * pi)
 {
 	pi_comp_t *comp;
@@ -210,28 +193,30 @@ int pi_next_rlcp(pi_iterator_t * pi)
 	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
 		for (pi->layno = 0; 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];
-				for (pi->precno = 0; pi->precno < res->pw * res->ph; pi->precno++) {
-					if (!pi->include[pi->layno][pi->resno][pi->compno][pi->precno]) {
-						pi->include[pi->layno][pi->resno][pi->compno][pi->precno] = 1;
-						return 1;
-					}
-				skip:;
-				}
+			     pi->compno++) {
+			  comp = &pi->comps[pi->compno];
+			  if (pi->resno >= comp->numresolutions) {
+			    continue;
+			  }
+			  res = &comp->resolutions[pi->resno];
+			  for (pi->precno = 0; pi->precno < res->pw * res->ph; pi->precno++) {
+			    if (!pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
+			      pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;
+			      return 1;
+			    }
+			  skip:;
+			  }
 			}
 		}
 	}
 	return 0;
 }
 
-/* <summary> */
-/* Get next packet in resolution-precinct-component-layer order.   */
-/* </summary> */
+/* <summary>
+ * Get next packet in resolution-precinct-component-layer order.
+ *
+ * pi: packet iterator to modify
+ * </summary> */
 int pi_next_rpcl(pi_iterator_t * pi)
 {
 	pi_comp_t *comp;
@@ -248,22 +233,17 @@ int pi_next_rpcl(pi_iterator_t * pi)
 			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));
+				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);
 			}
 		}
 	}
 	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-		for (pi->y = pi->ty0; pi->y < pi->ty1;
-				 pi->y += pi->dy - (pi->y % pi->dy)) {
-			for (pi->x = pi->tx0; pi->x < pi->tx1;
-					 pi->x += pi->dx - (pi->x % pi->dx)) {
-				for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1;
-						 pi->compno++) {
+		for (pi->y = pi->ty0; pi->y < pi->ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+			for (pi->x = pi->tx0; pi->x < pi->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 rpx, rpy;
@@ -278,28 +258,21 @@ int pi_next_rpcl(pi_iterator_t * pi)
 					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
 					rpx = res->pdx + levelno;
 					rpy = res->pdy + levelno;
-					if (!
-							(pi->x % (comp->dx << rpx) == 0
-							 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
+					if (!(pi->x % (comp->dx << rpx) == 0 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
 						continue;
 					}
-					if (!
-							(pi->y % (comp->dy << rpy) == 0
-							 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
+					if (!(pi->y % (comp->dy << rpy) == 0 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
 						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);
+					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 = 0; pi->layno < pi->poc.layno1; pi->layno++) {
-						if (!pi->include[pi->layno][pi->resno][pi->compno][pi->precno]) {
-							pi->include[pi->layno][pi->resno][pi->compno][pi->precno] =
-								1;
-							return 1;
+					  if (!pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
+					    pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;			
+					    return 1;
 						}
 					skip:;
 					}
@@ -310,9 +283,11 @@ int pi_next_rpcl(pi_iterator_t * pi)
 	return 0;
 }
 
-/* <summary> */
-/* Get next packet in precinct-component-resolution-layer order.   */
-/* </summary> */
+/* <summary>
+ * Get next packet in precinct-component-resolution-layer order.
+ *
+ * pi: packet iterator to modify
+ * </summary> */
 int pi_next_pcrl(pi_iterator_t * pi)
 {
 	pi_comp_t *comp;
@@ -330,25 +305,18 @@ int pi_next_pcrl(pi_iterator_t * pi)
 			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));
+				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);
 			}
 		}
 	}
-	for (pi->y = pi->ty0; pi->y < pi->ty1;
-			 pi->y += pi->dy - (pi->y % pi->dy)) {
-		for (pi->x = pi->tx0; pi->x < pi->tx1;
-				 pi->x += pi->dx - (pi->x % pi->dx)) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1;
-					 pi->compno++) {
+	for (pi->y = pi->ty0; pi->y < pi->ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+		for (pi->x = pi->tx0; pi->x < pi->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++) {
+				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
 					int levelno;
 					int trx0, try0;
 					int rpx, rpy;
@@ -359,27 +327,18 @@ int pi_next_pcrl(pi_iterator_t * pi)
 					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
 					rpx = res->pdx + levelno;
 					rpy = res->pdy + levelno;
-					if (!
-							(pi->x % (comp->dx << rpx) == 0
-							 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
+					if (!(pi->x % (comp->dx << rpx) == 0 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
 						continue;
 					}
-					if (!
-							(pi->y % (comp->dy << rpy) == 0
-							 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
+					if (!(pi->y % (comp->dy << rpy) == 0 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
 						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);
+					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 = 0; pi->layno < pi->poc.layno1; pi->layno++) {
-						if (!pi->include[pi->layno][pi->resno][pi->compno][pi->precno]) {
-							pi->include[pi->layno][pi->resno][pi->compno][pi->precno] =
-								1;
+					  if (! pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
+					    pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;
 							return 1;
 						}
 					skip:;
@@ -391,9 +350,11 @@ int pi_next_pcrl(pi_iterator_t * pi)
 	return 0;
 }
 
-/* <summary> */
-/* Get next packet in component-precinct-resolution-layer order.   */
-/* </summary> */
+/* <summary>
+ * Get next packet in component-precinct-resolution-layer order.
+ *
+ * pi: packet iterator to modify
+ * </summary> */
 int pi_next_cprl(pi_iterator_t * pi)
 {
 	pi_comp_t *comp;
@@ -435,28 +396,19 @@ int pi_next_cprl(pi_iterator_t * pi)
 					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
 					rpx = res->pdx + levelno;
 					rpy = res->pdy + levelno;
-					if (!
-							(pi->x % (comp->dx << rpx) == 0
-							 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
+					if (!(pi->x % (comp->dx << rpx) == 0 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
 						continue;
 					}
-					if (!
-							(pi->y % (comp->dy << rpy) == 0
-							 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
+					if (!(pi->y % (comp->dy << rpy) == 0 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
 						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);
+					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 = 0; pi->layno < pi->poc.layno1; pi->layno++) {
-						if (!pi->include[pi->layno][pi->resno][pi->compno][pi->precno]) {
-							pi->include[pi->layno][pi->resno][pi->compno][pi->precno] =
-								1;
-							return 1;
+					  if (! pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
+					    pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;
+					    return 1;
 						}
 					skip:;
 					}
@@ -467,9 +419,11 @@ int pi_next_cprl(pi_iterator_t * pi)
 	return 0;
 }
 
-/* <summary> */
-/* Get next packet.   */
-/* </summary> */
+/* <summary>
+ * Get next packet.
+  *
+  * pi: packet iterator to modify
+  * </summary> */
 int pi_next(pi_iterator_t * pi)
 {
 	switch (pi->poc.prg) {