walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] Fix remainings issues with doxygen doc 

Convert DOS files to UNIX eol
This commit is contained in:
Mathieu Malaterre 2012-10-29 14:35:11 +00:00
parent ece2a2d6c2
commit 759be64115
14 changed files with 397 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/CMakeLists.txt
View File

@ -22,6 +22,12 @@ if(DOXYGEN_FOUND)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_protocol.png configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_protocol.png
${CMAKE_BINARY_DIR}/doc/html/jpip_protocol.png COPYONLY) ${CMAKE_BINARY_DIR}/doc/html/jpip_protocol.png COPYONLY)
file(GLOB headers
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/*.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/*.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjpip/*.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjpip/*.c
)
# Generate new target to build the html documentation # Generate new target to build the html documentation
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html
@ -29,6 +35,7 @@ if(DOXYGEN_FOUND)
DEPENDS ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox DEPENDS ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox
${CMAKE_BINARY_DIR}/doc/mainpage.dox ${CMAKE_BINARY_DIR}/doc/mainpage.dox
${CMAKE_BINARY_DIR}/doc/openjpip.dox ${CMAKE_BINARY_DIR}/doc/openjpip.dox
${headers}
) )
add_custom_target(doc ALL add_custom_target(doc ALL
DEPENDS ${CMAKE_BINARY_DIR}/doc/html/index.html DEPENDS ${CMAKE_BINARY_DIR}/doc/html/index.html

16
doc/Doxyfile.dox.cmake.in
View File

@ -1,4 +1,4 @@
# Doxyfile 1.7.3 # Doxyfile 1.7.1
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project related configuration options # Project related configuration options
@ -6,8 +6,6 @@
DOXYFILE_ENCODING = UTF-8 DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenJPEG PROJECT_NAME = OpenJPEG
PROJECT_NUMBER = @OPENJPEG_VERSION@ PROJECT_NUMBER = @OPENJPEG_VERSION@
PROJECT_BRIEF =
PROJECT_LOGO =
OUTPUT_DIRECTORY = @OPENJPEG_BINARY_DIR@/doc OUTPUT_DIRECTORY = @OPENJPEG_BINARY_DIR@/doc
CREATE_SUBDIRS = NO CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English
@ -74,7 +72,6 @@ SORT_BRIEF_DOCS = NO
SORT_MEMBERS_CTORS_1ST = NO SORT_MEMBERS_CTORS_1ST = NO
SORT_GROUP_NAMES = NO SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO SORT_BY_SCOPE_NAME = NO
STRICT_PROTO_MATCHING = NO
GENERATE_TODOLIST = YES GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES GENERATE_BUGLIST = YES
@ -100,7 +97,8 @@ WARN_LOGFILE =
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# configuration options related to the input files # configuration options related to the input files
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
INPUT = @OPENJPEG_SOURCE_DIR@/src/lib \ INPUT = @OPENJPEG_SOURCE_DIR@/src/lib/openjp2 \
@OPENJPEG_SOURCE_DIR@/src/lib/openjpip \
@OPENJPEG_BINARY_DIR@/doc @OPENJPEG_BINARY_DIR@/doc
INPUT_ENCODING = UTF-8 INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.h \ FILE_PATTERNS = *.h \
@ -109,16 +107,15 @@ FILE_PATTERNS = *.h \
RECURSIVE = YES RECURSIVE = YES
EXCLUDE = EXCLUDE =
EXCLUDE_SYMLINKS = NO EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = .svn EXCLUDE_PATTERNS = */.svn/*
EXCLUDE_SYMBOLS = EXCLUDE_SYMBOLS =
EXAMPLE_PATH = EXAMPLE_PATH =
EXAMPLE_PATTERNS = * EXAMPLE_PATTERNS = *
EXAMPLE_RECURSIVE = NO EXAMPLE_RECURSIVE = NO
IMAGE_PATH = IMAGE_PATH = @OPENJPEG_SOURCE_DIR@/doc
INPUT_FILTER = INPUT_FILTER =
FILTER_PATTERNS = FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO FILTER_SOURCE_FILES = NO
FILTER_SOURCE_PATTERNS =
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# configuration options related to source browsing # configuration options related to source browsing
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -181,8 +178,6 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO EXT_LINKS_IN_WINDOW = NO
FORMULA_FONTSIZE = 10 FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES FORMULA_TRANSPARENT = YES
USE_MATHJAX = NO
MATHJAX_RELPATH = http://www.mathjax.org/mathjax
SEARCHENGINE = NO SEARCHENGINE = NO
SERVER_BASED_SEARCH = NO SERVER_BASED_SEARCH = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -282,7 +277,6 @@ DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png DOT_IMAGE_FORMAT = png
DOT_PATH = DOT_PATH =
DOTFILE_DIRS = DOTFILE_DIRS =
MSCFILE_DIRS =
DOT_GRAPH_MAX_NODES = 50 DOT_GRAPH_MAX_NODES = 50
MAX_DOT_GRAPH_DEPTH = 1000 MAX_DOT_GRAPH_DEPTH = 1000
DOT_TRANSPARENT = NO DOT_TRANSPARENT = NO

1
src/lib/openjp2/invert.h
View File

@ -45,6 +45,7 @@ The function in INVERT.H compute a matrix inversion with a LUP method
* *
* @param pSrcMatrix the matrix to invert. * @param pSrcMatrix the matrix to invert.
* @param pDestMatrix data to store the inverted matrix. * @param pDestMatrix data to store the inverted matrix.
* @param n size of the matrix
* @return OPJ_TRUE if the inversion is successful, OPJ_FALSE if the matrix is singular. * @return OPJ_TRUE if the inversion is successful, OPJ_FALSE if the matrix is singular.
*/ */
opj_bool opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix, opj_bool opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix,

4
src/lib/openjp2/mct.h
View File

@ -110,9 +110,9 @@ opj_bool opj_mct_encode_custom(
FIXME DOC FIXME DOC
@param pDecodingData MCT data @param pDecodingData MCT data
@param n size of components @param n size of components
@param pDataa components @param pData components
@param pNbComp nb of components (i.e. size of p_data) @param pNbComp nb of components (i.e. size of p_data)
@param isSigneda tells if the data is signed @param isSigned tells if the data is signed
@return OPJ_FALSE if function encounter a problem, OPJ_TRUE otherwise @return OPJ_FALSE if function encounter a problem, OPJ_TRUE otherwise
*/ */
opj_bool opj_mct_decode_custom( opj_bool opj_mct_decode_custom(

17
src/lib/openjp2/pi.c
View File

@ -98,6 +98,7 @@ static void opj_pi_update_encode_poc_and_final ( opj_cp_t *p_cp,
* Updates the coding parameters if the encoding is not used with Progression order changes and final (and cinema parameters are used). * Updates the coding parameters if the encoding is not used with Progression order changes and final (and cinema parameters are used).
* *
* @param p_cp the coding parameters to modify * @param p_cp the coding parameters to modify
* @param p_num_comps the number of components
* @param p_tileno the tile index being concerned. * @param p_tileno the tile index being concerned.
* @param p_tx0 X0 parameter for the tile * @param p_tx0 X0 parameter for the tile
* @param p_tx1 X1 parameter for the tile * @param p_tx1 X1 parameter for the tile
@ -105,8 +106,8 @@ static void opj_pi_update_encode_poc_and_final ( opj_cp_t *p_cp,
* @param p_ty1 Y1 parameter for the tile * @param p_ty1 Y1 parameter for the tile
* @param p_max_prec the maximum precision for all the bands of the tile * @param p_max_prec the maximum precision for all the bands of the tile
* @param p_max_res the maximum number of resolutions for all the poc inside the tile. * @param p_max_res the maximum number of resolutions for all the poc inside the tile.
* @param dx_min the minimum dx of all the components of all the resolutions for the tile. * @param p_dx_min the minimum dx of all the components of all the resolutions for the tile.
* @param dy_min the minimum dy of all the components of all the resolutions for the tile. * @param p_dy_min the minimum dy of all the components of all the resolutions for the tile.
*/ */
static void opj_pi_update_encode_not_poc ( opj_cp_t *p_cp, static void opj_pi_update_encode_not_poc ( opj_cp_t *p_cp,
OPJ_UINT32 p_num_comps, OPJ_UINT32 p_num_comps,
@ -124,15 +125,15 @@ static void opj_pi_update_encode_not_poc ( opj_cp_t *p_cp,
* *
* @param p_image the image being encoded. * @param p_image the image being encoded.
* @param p_cp the coding parameters. * @param p_cp the coding parameters.
* @param p_tileno the tile index of the tile being encoded. * @param tileno the tile index of the tile being encoded.
* @param p_tx0 pointer that will hold the X0 parameter for the tile * @param p_tx0 pointer that will hold the X0 parameter for the tile
* @param p_tx1 pointer that will hold the X1 parameter for the tile * @param p_tx1 pointer that will hold the X1 parameter for the tile
* @param p_ty0 pointer that will hold the Y0 parameter for the tile * @param p_ty0 pointer that will hold the Y0 parameter for the tile
* @param p_ty1 pointer that will hold the Y1 parameter for the tile * @param p_ty1 pointer that will hold the Y1 parameter for the tile
* @param p_max_prec pointer that will hold the the maximum precision for all the bands of the tile * @param p_max_prec pointer that will hold the the maximum precision for all the bands of the tile
* @param p_max_res pointer that will hold the the maximum number of resolutions for all the poc inside the tile. * @param p_max_res pointer that will hold the the maximum number of resolutions for all the poc inside the tile.
* @param dx_min pointer that will hold the the minimum dx of all the components of all the resolutions for the tile. * @param p_dx_min pointer that will hold the the minimum dx of all the components of all the resolutions for the tile.
* @param dy_min pointer that will hold the the minimum dy of all the components of all the resolutions for the tile. * @param p_dy_min pointer that will hold the the minimum dy of all the components of all the resolutions for the tile.
*/ */
static void opj_get_encoding_parameters(const opj_image_t *p_image, static void opj_get_encoding_parameters(const opj_image_t *p_image,
const opj_cp_t *p_cp, const opj_cp_t *p_cp,
@ -184,10 +185,10 @@ static void opj_get_all_encoding_parameters(const opj_image_t *p_image,
* *
* @param p_image the image used to initialize the packet iterator (in fact only the number of components is relevant. * @param p_image the image used to initialize the packet iterator (in fact only the number of components is relevant.
* @param p_cp the coding parameters. * @param p_cp the coding parameters.
* @param p_tile_no the index of the tile from which creating the packet iterator. * @param tileno the index of the tile from which creating the packet iterator.
*/ */
static opj_pi_iterator_t * opj_pi_create( const opj_image_t *image, static opj_pi_iterator_t * opj_pi_create( const opj_image_t *p_image,
const opj_cp_t *cp, const opj_cp_t *p_cp,
OPJ_UINT32 tileno ); OPJ_UINT32 tileno );
/** /**
* FIXME DOC * FIXME DOC

68
src/lib/openjp2/pi.h
View File

@ -65,40 +65,40 @@ typedef struct opj_pi_comp {
Packet iterator Packet iterator
*/ */
typedef struct opj_pi_iterator { typedef struct opj_pi_iterator {
/** Enabling Tile part generation*/ /** Enabling Tile part generation*/
OPJ_BYTE tp_on; OPJ_BYTE tp_on;
/** precise if the packet has been already used (usefull for progression order change) */ /** precise if the packet has been already used (usefull for progression order change) */
OPJ_INT16 *include; OPJ_INT16 *include;
/** layer step used to localize the packet in the include vector */ /** layer step used to localize the packet in the include vector */
OPJ_UINT32 step_l; OPJ_UINT32 step_l;
/** resolution step used to localize the packet in the include vector */ /** resolution step used to localize the packet in the include vector */
OPJ_UINT32 step_r; OPJ_UINT32 step_r;
/** component step used to localize the packet in the include vector */ /** component step used to localize the packet in the include vector */
OPJ_UINT32 step_c; OPJ_UINT32 step_c;
/** precinct step used to localize the packet in the include vector */ /** precinct step used to localize the packet in the include vector */
OPJ_UINT32 step_p; OPJ_UINT32 step_p;
/** component that identify the packet */ /** component that identify the packet */
OPJ_UINT32 compno; OPJ_UINT32 compno;
/** resolution that identify the packet */ /** resolution that identify the packet */
OPJ_UINT32 resno; OPJ_UINT32 resno;
/** precinct that identify the packet */ /** precinct that identify the packet */
OPJ_UINT32 precno; OPJ_UINT32 precno;
/** layer that identify the packet */ /** layer that identify the packet */
OPJ_UINT32 layno; OPJ_UINT32 layno;
/** 0 if the first packet TODO MSD xhange to opj_bool*/ /** 0 if the first packet */
int first; opj_bool first;
/** progression order change information */ /** progression order change information */
opj_poc_t poc; opj_poc_t poc;
/** number of components in the image */ /** number of components in the image */
OPJ_UINT32 numcomps; OPJ_UINT32 numcomps;
/** Components*/ /** Components*/
opj_pi_comp_t *comps; opj_pi_comp_t *comps;
/** FIXME DOC*/ /** FIXME DOC*/
OPJ_INT32 tx0, ty0, tx1, ty1; OPJ_INT32 tx0, ty0, tx1, ty1;
/** FIXME DOC*/ /** FIXME DOC*/
OPJ_INT32 x, y; OPJ_INT32 x, y;
/** FIXME DOC*/ /** FIXME DOC*/
OPJ_UINT32 dx, dy; OPJ_UINT32 dx, dy;
} opj_pi_iterator_t; } opj_pi_iterator_t;
/** @name Exported functions */ /** @name Exported functions */

2
src/lib/openjpip/dec_clientmsg_handler.h
View File

@ -95,6 +95,8 @@ void handle_dstCIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist)
* handle SIZ request message * handle SIZ request message
* *
* @param[in] connected_socket socket descriptor * @param[in] connected_socket socket descriptor
* @param[in] jpipstream address of caching jpipstream pointer
* @param[in] msgqueue message queue pointer
* @param[in,out] cachelist cache list pointer * @param[in,out] cachelist cache list pointer
*/ */
void handle_SIZreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_param_t *msgqueue, cachelist_param_t *cachelist); void handle_SIZreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_param_t *msgqueue, cachelist_param_t *cachelist);

18
src/lib/openjpip/imgreg_manager.h
View File

@ -68,13 +68,13 @@ imgreg_param_t map_viewin2imgreg( const int fx, const int fy,
* Note: only round-down implemented * Note: only round-down implemented
* *
* @param[in] maxlev maximum decomposition level * @param[in] maxlev maximum decomposition level
* @param[in/out] lev decomposition level pointer * @param[in,out] lev decomposition level pointer
* @param[in/out] fx horizontal frame size pointer * @param[in,out] fx horizontal frame size pointer
* @param[in/out] fy vertical frame size pointer * @param[in,out] fy vertical frame size pointer
* @param[in/out] xmin horizontal image offset pointer * @param[in,out] xmin horizontal image offset pointer
* @param[in/out] ymin vertical image offset pointer * @param[in,out] ymin vertical image offset pointer
* @param[in/out] xmax horizontal image size pointer * @param[in,out] xmax horizontal image size pointer
* @param[in/out] ymax vertical image size pointer * @param[in,out] ymax vertical image size pointer
*/ */
void find_level( int maxlev, int *lev, int *fx, int *fy, int *xmin, int *ymin, int *xmax, int *ymax); void find_level( int maxlev, int *lev, int *fx, int *fy, int *xmin, int *ymin, int *xmax, int *ymax);
@ -82,8 +82,8 @@ void find_level( int maxlev, int *lev, int *fx, int *fy, int *xmin, int *ymin, i
* compute decomposition level (only to get the level * compute decomposition level (only to get the level
* use find_level for all parameters * use find_level for all parameters
* *
* @param[in] fx horizontal frame size * @param[in] fw horizontal frame size
* @param[in] fy vertical frame size * @param[in] fh vertical frame size
* @param[in] Xsiz image width * @param[in] Xsiz image width
* @param[in] Ysiz image height * @param[in] Ysiz image height
* @return decomposition level * @return decomposition level

1
src/lib/openjpip/marker_manager.h
View File

@ -60,7 +60,6 @@ marker_param_t set_marker( codestream_param_t cs, Byte2_t code, OPJ_OFF_T offset
* *
* @param[in] marker marker structure * @param[in] marker marker structure
* @param[in] offset start Byte position in marker * @param[in] offset start Byte position in marker
* @param[in] size Byte length
* @return fetched code * @return fetched code
*/ */
Byte_t fetch_marker1byte( marker_param_t marker, OPJ_OFF_T offset); Byte_t fetch_marker1byte( marker_param_t marker, OPJ_OFF_T offset);

2
src/lib/openjpip/metadata_manager.h
View File

@ -115,7 +115,7 @@ void print_metadata( metadata_param_t *metadata);
/** /**
* print all metadata parameters * print all metadata parameters
* *
* @param[in] metadatalist metadata list pointer * @param[in] list metadata list pointer
*/ */
void print_allmetadata( metadatalist_param_t *list); void print_allmetadata( metadatalist_param_t *list);

2
src/lib/openjpip/query_parser.h
View File

@ -54,7 +54,7 @@ typedef struct query_param{
bool *comps; /**< components (dynamic array) for jpp-stream, null means all components */ bool *comps; /**< components (dynamic array) for jpp-stream, null means all components */
char *cid; /**< channel identifier */ char *cid; /**< channel identifier */
cnew_transport_t cnew; /**< transport name if there is new channel request, else non */ cnew_transport_t cnew; /**< transport name if there is new channel request, else non */
char *cclose; /**< list of closing channel identifiers, separated by '\0' */ char *cclose; /**< list of closing channel identifiers, separated by '\\0' */
int numOfcclose; /**< number of closing channels */ int numOfcclose; /**< number of closing channels */
char box_type[MAX_NUMOFBOX][4]; /**< interested box-types */ char box_type[MAX_NUMOFBOX][4]; /**< interested box-types */
int limit[MAX_NUMOFBOX]; /**< limit value, -1: skeleton request "r", 0: entire contents */ int limit[MAX_NUMOFBOX]; /**< limit value, -1: skeleton request "r", 0: entire contents */