diff options
Diffstat (limited to 'extern/libopenjpeg/tgt.h')
| -rw-r--r-- | extern/libopenjpeg/tgt.h | 68 |
1 files changed, 18 insertions, 50 deletions
diff --git a/extern/libopenjpeg/tgt.h b/extern/libopenjpeg/tgt.h index 3d152f8a90e..c08c8da0af4 100644 --- a/extern/libopenjpeg/tgt.h +++ b/extern/libopenjpeg/tgt.h @@ -1,19 +1,10 @@ /* - * 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) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2007, Professor Benoit Macq * Copyright (c) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux - * Copyright (c) 2003-2014, Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team - * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr> - * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France - * Copyright (c) 2012, CS Systemes d'Information, France * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,25 +46,22 @@ are used by some function in T2.C. Tag node */ typedef struct opj_tgt_node { - struct opj_tgt_node *parent; - OPJ_INT32 value; - OPJ_INT32 low; - OPJ_UINT32 known; + struct opj_tgt_node *parent; + int value; + int low; + int known; } opj_tgt_node_t; /** Tag tree */ -typedef struct opj_tgt_tree -{ - OPJ_UINT32 numleafsh; - OPJ_UINT32 numleafsv; - OPJ_UINT32 numnodes; - opj_tgt_node_t *nodes; - OPJ_UINT32 nodes_size; /* maximum size taken by nodes */ +typedef struct opj_tgt_tree { + int numleafsh; + int numleafsv; + int numnodes; + opj_tgt_node_t *nodes; } opj_tgt_tree_t; - /** @name Exported functions */ /*@{*/ /* ----------------------------------------------------------------------- */ @@ -83,38 +71,24 @@ Create a tag-tree @param numleafsv Height of the array of leafs of the tree @return Returns a new tag-tree if successful, returns NULL otherwise */ -opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv); - -/** - * Reinitialises a tag-tree from an exixting one. - * - * @param p_tree the tree to reinitialize. - * @param p_num_leafs_h the width of the array of leafs of the tree - * @param p_num_leafs_v the height of the array of leafs of the tree - * @return a new tag-tree if successful, NULL otherwise -*/ -opj_tgt_tree_t *opj_tgt_init(opj_tgt_tree_t * p_tree, - OPJ_UINT32 p_num_leafs_h, - OPJ_UINT32 p_num_leafs_v); +opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv); /** Destroy a tag-tree, liberating memory @param tree Tag-tree to destroy */ -void opj_tgt_destroy(opj_tgt_tree_t *tree); +void tgt_destroy(opj_tgt_tree_t *tree); /** Reset a tag-tree (set all leaves to 0) @param tree Tag-tree to reset */ -void opj_tgt_reset(opj_tgt_tree_t *tree); +void tgt_reset(opj_tgt_tree_t *tree); /** Set the value of a leaf of a tag-tree @param tree Tag-tree to modify @param leafno Number that identifies the leaf to modify @param value New value of the leaf */ -void opj_tgt_setvalue(opj_tgt_tree_t *tree, - OPJ_UINT32 leafno, - OPJ_INT32 value); +void tgt_setvalue(opj_tgt_tree_t *tree, int leafno, int value); /** Encode the value of a leaf of the tag-tree up to a given threshold @param bio Pointer to a BIO handle @@ -122,10 +96,7 @@ Encode the value of a leaf of the tag-tree up to a given threshold @param leafno Number that identifies the leaf to encode @param threshold Threshold to use when encoding value of the leaf */ -void opj_tgt_encode(opj_bio_t *bio, - opj_tgt_tree_t *tree, - OPJ_UINT32 leafno, - OPJ_INT32 threshold); +void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold); /** Decode the value of a leaf of the tag-tree up to a given threshold @param bio Pointer to a BIO handle @@ -134,10 +105,7 @@ Decode the value of a leaf of the tag-tree up to a given threshold @param threshold Threshold to use when decoding value of the leaf @return Returns 1 if the node's value < threshold, returns 0 otherwise */ -OPJ_UINT32 opj_tgt_decode(opj_bio_t *bio, - opj_tgt_tree_t *tree, - OPJ_UINT32 leafno, - OPJ_INT32 threshold); +int tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold); /* ----------------------------------------------------------------------- */ /*@}*/ |