X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fopenjp3d%2Ftgt.c;h=fc1222d8ec1613509755a8064a76ec19b50220b8;hb=00cff6f5c02deabb64ccb15f15c13fcb773968fe;hp=8792995e4e85081a6a812bdb58d351effe4ae164;hpb=caaec3bb05b3ecaa4cf6bc8b59b7abd401faa42c;p=openjpeg.git

diff --git a/src/lib/openjp3d/tgt.c b/src/lib/openjp3d/tgt.c
index 8792995e..fc1222d8 100644
--- a/src/lib/openjp3d/tgt.c
+++ b/src/lib/openjp3d/tgt.c
@@ -1,4 +1,9 @@
 /*
+ * 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) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
@@ -30,222 +35,237 @@
 
 #include "opj_includes.h"
 
-/* 
+/*
 ==========================================================
    Tag-tree coder interface
 ==========================================================
 */
-void tgt_tree_dump (FILE *fd, opj_tgt_tree_t * tree){
-	int nodesno;
-
-	fprintf(fd, "TGT_TREE {\n");
-	fprintf(fd, "  numnodes: %d \n", tree->numnodes);	
-	fprintf(fd, "  numleafsh: %d, numleafsv: %d, numleafsz: %d,\n", tree->numleafsh, tree->numleafsv, tree->numleafsz);
-
-	for (nodesno = 0; nodesno < tree->numnodes; nodesno++) {
-		fprintf(fd, "tgt_node %d {\n", nodesno);
-		fprintf(fd, "  value: %d \n", tree->nodes[nodesno].value);
-		fprintf(fd, "  low: %d \n", tree->nodes[nodesno].low);
-		fprintf(fd, "  known: %d \n", tree->nodes[nodesno].known);
-		if (tree->nodes[nodesno].parent) {
-			fprintf(fd, "  parent.value: %d \n", tree->nodes[nodesno].parent->value);
-			fprintf(fd, "  parent.low: %d \n", tree->nodes[nodesno].parent->low);
-			fprintf(fd, "  parent.known: %d \n", tree->nodes[nodesno].parent->known);
-		}
-		fprintf(fd, "}\n");
-
-	}
-	fprintf(fd, "}\n");
+void tgt_tree_dump(FILE *fd, opj_tgt_tree_t * tree)
+{
+    int nodesno;
+
+    fprintf(fd, "TGT_TREE {\n");
+    fprintf(fd, "  numnodes: %d \n", tree->numnodes);
+    fprintf(fd, "  numleafsh: %d, numleafsv: %d, numleafsz: %d,\n", tree->numleafsh,
+            tree->numleafsv, tree->numleafsz);
+
+    for (nodesno = 0; nodesno < tree->numnodes; nodesno++) {
+        fprintf(fd, "tgt_node %d {\n", nodesno);
+        fprintf(fd, "  value: %d \n", tree->nodes[nodesno].value);
+        fprintf(fd, "  low: %d \n", tree->nodes[nodesno].low);
+        fprintf(fd, "  known: %d \n", tree->nodes[nodesno].known);
+        if (tree->nodes[nodesno].parent) {
+            fprintf(fd, "  parent.value: %d \n", tree->nodes[nodesno].parent->value);
+            fprintf(fd, "  parent.low: %d \n", tree->nodes[nodesno].parent->low);
+            fprintf(fd, "  parent.known: %d \n", tree->nodes[nodesno].parent->known);
+        }
+        fprintf(fd, "}\n");
+
+    }
+    fprintf(fd, "}\n");
 
 }
 
 
-opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv, int numleafsz) {
-	
-	int nplh[32];
-	int nplv[32];
-	int nplz[32];
-	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;
-	int n, z = 0;
-
-	tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t));
-	if(!tree) 
-		return NULL;
-	tree->numleafsh = numleafsh;
-	tree->numleafsv = numleafsv;
-	tree->numleafsz = numleafsz;
-
-	numlvls = 0;
-	nplh[0] = numleafsh;
-	nplv[0] = numleafsv;
-	nplz[0] = numleafsz;
-	tree->numnodes = 0;
-	do {
-		n = nplh[numlvls] * nplv[numlvls] * nplz[numlvls]; 
-		nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
-		nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
-		nplz[numlvls + 1] = (nplz[numlvls] + 1) / 2;
-		tree->numnodes += n;
-		++numlvls;
-	} while (n > 1);
-
-	if (tree->numnodes == 0) {
-		opj_free(tree);
-		return NULL;
-	}
-
-	tree->nodes = (opj_tgt_node_t *) opj_malloc(tree->numnodes * sizeof(opj_tgt_node_t));
-	if(!tree->nodes) {
-		opj_free(tree);
-		return NULL;
-	}
-
-	node = tree->nodes;
-	parentnode = &tree->nodes[tree->numleafsh * tree->numleafsv * tree->numleafsz];
-	parentnode0 = parentnode;
-	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 (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;
-					}
-					++parentnode;
-				}
-				if((j & 1) || j == nplv[i] - 1) {
-					parentnode0 = parentnode;
-				} else {
-					parentnode = parentnode0;
-				}
-			}
-			if ((z & 1) || z == nplz[i] - 1) {
-				parentnode1 = parentnode;
-			} else {
-				parentnode0 = parentnode1;
-				parentnode = parentnode1;
-			}
-		}
-	}
-	node->parent = 0;
-
-	
-	tgt_reset(tree);
-
-	return tree;
+opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv, int numleafsz)
+{
+
+    int nplh[32];
+    int nplv[32];
+    int nplz[32];
+    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;
+    int n, z = 0;
+
+    tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t));
+    if (!tree) {
+        return NULL;
+    }
+    tree->numleafsh = numleafsh;
+    tree->numleafsv = numleafsv;
+    tree->numleafsz = numleafsz;
+
+    numlvls = 0;
+    nplh[0] = numleafsh;
+    nplv[0] = numleafsv;
+    nplz[0] = numleafsz;
+    tree->numnodes = 0;
+    do {
+        n = nplh[numlvls] * nplv[numlvls] * nplz[numlvls];
+        nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
+        nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
+        nplz[numlvls + 1] = (nplz[numlvls] + 1) / 2;
+        tree->numnodes += n;
+        ++numlvls;
+    } while (n > 1);
+
+    if (tree->numnodes == 0) {
+        opj_free(tree);
+        return NULL;
+    }
+
+    tree->nodes = (opj_tgt_node_t *) opj_malloc(tree->numnodes * sizeof(
+                      opj_tgt_node_t));
+    if (!tree->nodes) {
+        opj_free(tree);
+        return NULL;
+    }
+
+    node = tree->nodes;
+    parentnode = &tree->nodes[tree->numleafsh * tree->numleafsv * tree->numleafsz];
+    parentnode0 = parentnode;
+    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 (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;
+                    }
+                    ++parentnode;
+                }
+                if ((j & 1) || j == nplv[i] - 1) {
+                    parentnode0 = parentnode;
+                } else {
+                    parentnode = parentnode0;
+                }
+            }
+            if ((z & 1) || z == nplz[i] - 1) {
+                parentnode1 = parentnode;
+            } else {
+                parentnode0 = parentnode1;
+                parentnode = parentnode1;
+            }
+        }
+    }
+    node->parent = 0;
+
+
+    tgt_reset(tree);
+
+    return tree;
 }
 
-void tgt_destroy(opj_tgt_tree_t *tree) {
-	opj_free(tree->nodes);
-	opj_free(tree);
+void tgt_destroy(opj_tgt_tree_t *tree)
+{
+    opj_free(tree->nodes);
+    opj_free(tree);
 }
 
-void tgt_reset(opj_tgt_tree_t *tree) {
-	int i;
-
-	if (NULL == tree)
-		return;
-	
-	for (i = 0; i < tree->numnodes; i++) {
-		tree->nodes[i].value = 999;
-		tree->nodes[i].low = 0;
-		tree->nodes[i].known = 0;
-	}
+void tgt_reset(opj_tgt_tree_t *tree)
+{
+    int i;
+
+    if (NULL == tree) {
+        return;
+    }
+
+    for (i = 0; i < tree->numnodes; i++) {
+        tree->nodes[i].value = 999;
+        tree->nodes[i].low = 0;
+        tree->nodes[i].known = 0;
+    }
 }
 
-void tgt_setvalue(opj_tgt_tree_t *tree, int leafno, int value) {
-	opj_tgt_node_t *node;
-	node = &tree->nodes[leafno];
-	while (node && node->value > value) {
-		node->value = value;
-		node = node->parent;
-	}
+void tgt_setvalue(opj_tgt_tree_t *tree, int leafno, int value)
+{
+    opj_tgt_node_t *node;
+    node = &tree->nodes[leafno];
+    while (node && node->value > value) {
+        node->value = value;
+        node = node->parent;
+    }
 }
 
-void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold) {
-	opj_tgt_node_t *stk[31];
-	opj_tgt_node_t **stkptr;
-	opj_tgt_node_t *node;
-	int low;
-
-	stkptr = stk;
-	node = &tree->nodes[leafno];
-	while (node->parent) {
-		*stkptr++ = node;
-		node = node->parent;
-	}
-	
-	low = 0;
-	for (;;) {
-		if (low > node->low) {
-			node->low = low;
-		} else {
-			low = node->low;
-		}
-		
-		while (low < threshold) {
-			if (low >= node->value) {
-				if (!node->known) {
-					bio_write(bio, 1, 1);
-					node->known = 1;
-				}
-				break;
-			}
-			bio_write(bio, 0, 1);
-			++low;
-		}
-		
-		node->low = low;
-		if (stkptr == stk)
-			break;
-		node = *--stkptr;
-	}
+void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno,
+                int threshold)
+{
+    opj_tgt_node_t *stk[31];
+    opj_tgt_node_t **stkptr;
+    opj_tgt_node_t *node;
+    int low;
+
+    stkptr = stk;
+    node = &tree->nodes[leafno];
+    while (node->parent) {
+        *stkptr++ = node;
+        node = node->parent;
+    }
+
+    low = 0;
+    for (;;) {
+        if (low > node->low) {
+            node->low = low;
+        } else {
+            low = node->low;
+        }
+
+        while (low < threshold) {
+            if (low >= node->value) {
+                if (!node->known) {
+                    bio_write(bio, 1, 1);
+                    node->known = 1;
+                }
+                break;
+            }
+            bio_write(bio, 0, 1);
+            ++low;
+        }
+
+        node->low = low;
+        if (stkptr == stk) {
+            break;
+        }
+        node = *--stkptr;
+    }
 }
 
-int tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold) {
-	opj_tgt_node_t *stk[31];
-	opj_tgt_node_t **stkptr;
-	opj_tgt_node_t *node;
-	int low;
-
-	stkptr = stk;
-	node = &tree->nodes[leafno];
-	while (node->parent) {
-		*stkptr++ = node;
-		node = node->parent;
-	}
-	
-	low = 0;
-	for (;;) {
-		if (low > node->low) {
-			node->low = low;
-		} else {
-			low = node->low;
-		}
-		while (low < threshold && low < node->value) {
-			if (bio_read(bio, 1)) {
-				node->value = low;
-			} else {
-				++low;
-			}
-		}
-		node->low = low;
-		if (stkptr == stk) {
-			break;
-		}
-		node = *--stkptr;
-	}
-	
-	return (node->value < threshold) ? 1 : 0;
+int tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold)
+{
+    opj_tgt_node_t *stk[31];
+    opj_tgt_node_t **stkptr;
+    opj_tgt_node_t *node;
+    int low;
+
+    stkptr = stk;
+    node = &tree->nodes[leafno];
+    while (node->parent) {
+        *stkptr++ = node;
+        node = node->parent;
+    }
+
+    low = 0;
+    for (;;) {
+        if (low > node->low) {
+            node->low = low;
+        } else {
+            low = node->low;
+        }
+        while (low < threshold && low < node->value) {
+            if (bio_read(bio, 1)) {
+                node->value = low;
+            } else {
+                ++low;
+            }
+        }
+        node->low = low;
+        if (stkptr == stk) {
+            break;
+        }
+        node = *--stkptr;
+    }
+
+    return (node->value < threshold) ? 1 : 0;
 }