diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-29 14:35:11 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-29 14:35:11 +0000 |
| commit | 759be64115508e4589c098c5e777d03a1a04bb25 (patch) | |
| tree | 6f55159975fc03114e6c2eecf88a641f3c0fa534 /src/lib/openjpip | |
| parent | ece2a2d6c231aa60409a75a2787b349d342b99eb (diff) | |
[trunk] Fix remainings issues with doxygen doc
Convert DOS files to UNIX eol
Diffstat (limited to 'src/lib/openjpip')
| -rw-r--r-- | src/lib/openjpip/dec_clientmsg_handler.h | 2 | ||||
| -rw-r--r-- | src/lib/openjpip/imgreg_manager.h | 18 | ||||
| -rw-r--r-- | src/lib/openjpip/marker_manager.h | 1 | ||||
| -rw-r--r-- | src/lib/openjpip/metadata_manager.h | 2 | ||||
| -rw-r--r-- | src/lib/openjpip/query_parser.h | 2 |
5 files changed, 13 insertions, 12 deletions
diff --git a/src/lib/openjpip/dec_clientmsg_handler.h b/src/lib/openjpip/dec_clientmsg_handler.h index 7929207a..f875a359 100644 --- a/src/lib/openjpip/dec_clientmsg_handler.h +++ b/src/lib/openjpip/dec_clientmsg_handler.h @@ -95,6 +95,8 @@ void handle_dstCIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist) * handle SIZ request message * * @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 */ void handle_SIZreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_param_t *msgqueue, cachelist_param_t *cachelist); diff --git a/src/lib/openjpip/imgreg_manager.h b/src/lib/openjpip/imgreg_manager.h index cca4df17..8cd73e34 100644 --- a/src/lib/openjpip/imgreg_manager.h +++ b/src/lib/openjpip/imgreg_manager.h @@ -68,13 +68,13 @@ imgreg_param_t map_viewin2imgreg( const int fx, const int fy, * Note: only round-down implemented * * @param[in] maxlev maximum decomposition level - * @param[in/out] lev decomposition level pointer - * @param[in/out] fx horizontal frame size pointer - * @param[in/out] fy vertical frame size pointer - * @param[in/out] xmin horizontal image offset pointer - * @param[in/out] ymin vertical image offset pointer - * @param[in/out] xmax horizontal image size pointer - * @param[in/out] ymax vertical image size pointer + * @param[in,out] lev decomposition level pointer + * @param[in,out] fx horizontal frame size pointer + * @param[in,out] fy vertical frame size pointer + * @param[in,out] xmin horizontal image offset pointer + * @param[in,out] ymin vertical image offset pointer + * @param[in,out] xmax horizontal 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); @@ -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 * use find_level for all parameters * - * @param[in] fx horizontal frame size - * @param[in] fy vertical frame size + * @param[in] fw horizontal frame size + * @param[in] fh vertical frame size * @param[in] Xsiz image width * @param[in] Ysiz image height * @return decomposition level diff --git a/src/lib/openjpip/marker_manager.h b/src/lib/openjpip/marker_manager.h index 4d01e353..9fad2c98 100644 --- a/src/lib/openjpip/marker_manager.h +++ b/src/lib/openjpip/marker_manager.h @@ -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] offset start Byte position in marker - * @param[in] size Byte length * @return fetched code */ Byte_t fetch_marker1byte( marker_param_t marker, OPJ_OFF_T offset); diff --git a/src/lib/openjpip/metadata_manager.h b/src/lib/openjpip/metadata_manager.h index 3bed8d0e..1b0988c9 100644 --- a/src/lib/openjpip/metadata_manager.h +++ b/src/lib/openjpip/metadata_manager.h @@ -115,7 +115,7 @@ void print_metadata( metadata_param_t *metadata); /** * print all metadata parameters * - * @param[in] metadatalist metadata list pointer + * @param[in] list metadata list pointer */ void print_allmetadata( metadatalist_param_t *list); diff --git a/src/lib/openjpip/query_parser.h b/src/lib/openjpip/query_parser.h index cea9ed23..112bc59a 100644 --- a/src/lib/openjpip/query_parser.h +++ b/src/lib/openjpip/query_parser.h @@ -54,7 +54,7 @@ typedef struct query_param{ bool *comps; /**< components (dynamic array) for jpp-stream, null means all components */ char *cid; /**< channel identifier */ 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 */ char box_type[MAX_NUMOFBOX][4]; /**< interested box-types */ int limit[MAX_NUMOFBOX]; /**< limit value, -1: skeleton request "r", 0: entire contents */ |
