From 8c9151c86b5250693f8247d58c75d1c3ef6ea54a Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Tue, 11 Dec 2012 14:09:24 +0000
Subject: [PATCH] [trunk] JP3D: completely redo the opj_tgt_create function.
 Take as input the initial opj_tgt_create as found in openjpeg 1.5, and extend
 with the 3rd dimension.

---
 src/lib/openjp3d/tgt.c | 45 +++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/lib/openjp3d/tgt.c b/src/lib/openjp3d/tgt.c
index 77a751a6..c86cfe6d 100755
--- a/src/lib/openjp3d/tgt.c
+++ b/src/lib/openjp3d/tgt.c
@@ -68,6 +68,7 @@ opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv, int numleafsz) {
 	opj_tgt_node_t *node = NULL;
 	opj_tgt_node_t *parentnode = NULL;
 	opj_tgt_node_t *parentnode0 = NULL;
+	opj_tgt_node_t *parentnode1 = NULL;
 	opj_tgt_tree_t *tree = NULL;
 	int i, j, k, p, p0;
 	int numlvls;
@@ -108,38 +109,32 @@ opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv, int numleafsz) {
 	node = tree->nodes;
 	parentnode = &tree->nodes[tree->numleafsh * tree->numleafsv * tree->numleafsz];
 	parentnode0 = parentnode;
-		
-	p = tree->numleafsh * tree->numleafsv * tree->numleafsz;
-	p0 = p;
-	n = 0;
+	parentnode1 = parentnode;
 	/*fprintf(stdout,"\nH %d V %d Z %d numlvls %d nodes %d\n",tree->numleafsh,tree->numleafsv,tree->numleafsz,numlvls,tree->numnodes);*/
 	for (i = 0; i < numlvls - 1; ++i) {
-		for (j = 0; j < nplv[i]; ++j) {
-			k = nplh[i]*nplz[i];
-			while (--k >= 0) {
-				node->parent = parentnode;		/*fprintf(stdout,"node[%d].parent = node[%d]\n",n,p);*/
-				++node;	++n;		
-				if (--k >= 0 && n < p) {
-					node->parent = parentnode;	/*fprintf(stdout,"node[%d].parent = node[%d]\n",n,p);*/
-					++node;	++n;	
-				}
-				if (nplz[i] != 1){ /*2D operation vs 3D operation*/
-					if (--k >= 0 && n < p) {
+		for (z = 0; z < nplz[i]; ++z) {
+			for (j = 0; j < nplv[i]; ++j) {
+				k = nplh[i];
+				while(--k >= 0) {
+					node->parent = parentnode;		/*fprintf(stdout,"node[%d].parent = node[%d]\n",n,p);*/
+					++node;
+					if(--k >= 0) {
 						node->parent = parentnode;	/*fprintf(stdout,"node[%d].parent = node[%d]\n",n,p);*/
-						++node;	++n;
-					}
-					if (--k >= 0 && n < p) {
-						node->parent = parentnode;	/*fprintf(stdout,"node[%d].parent = node[%d]\n",n,p);*/
-						++node;	++n;
+						++node;
 					}
+					++parentnode;
+				}
+				if((j & 1) || j == nplv[i] - 1) {
+					parentnode0 = parentnode;
+				} else {
+					parentnode = parentnode0;
 				}
-				++parentnode; ++p;
 			}
-			if ((j & 1) || j == nplv[i] - 1) {
-				parentnode0 = parentnode;			p0 = p;		/*fprintf(stdout,"parent = node[%d] \n",p);*/
+			if ((z & 1) || z == nplz[i] - 1) {
+				parentnode1 = parentnode;
 			} else {
-				parentnode = parentnode0;			p = p0;		/*fprintf(stdout,"parent = node[%d] \n",p);*/
-				parentnode0 += nplh[i]*nplz[i];		p0 += nplh[i]*nplz[i];
+				parentnode0 = parentnode1;
+				parentnode = parentnode1;
 			}
 		}
 	}
-- 
2.30.2