Fix Doxygen warnings (patch derived from Winfried's doxygen-dif.txt.zip, #849)

diff --git a/doc/openjpip.dox.in b/doc/openjpip.dox.in
index 0c84ccbbc8fac0b1094e7052af6af2c7b67ce593..fd06ee0e010a828304824aa2e0a203640512ac25 100644 (file)
--- a/doc/openjpip.dox.in
+++ b/doc/openjpip.dox.in
@@ -30,7 +30,7 @@
 
 /*! \page openjpippage OpenJPIP v@OPENJPEG_VERSION@ Documentation
  *
- * \section intro Introduction
+ * \section Introduction
  * This manual documents the low-level OpenJPIP C API.\n
  * OpenJPIP software is an implementation of JPEG 2000 Part9: Interactivity tools, APIs and protocols (JPIP).\n
  * ( For more info about JPIP, check the website: http://www.jpeg.org/jpeg2000/j2kpart9.html)\n
@@ -42,7 +42,7 @@
  * - opj_jpip_transcode.c  To Convert JPT/JPP-stream to JP2 or J2K
  * - opj_jpip_test.c       To test index code format of a JP2 file
  *
- * \section license License
+ * \section License
  * This software is released under the BSD license, anybody can use or modify the library, even for commercial applications.\n
  * The only restriction is to retain the copyright in the sources or the binaries documentation.\n
  * Neither the author, nor the university accept any responsibility for any kind of error or data loss which may occur during usage.

diff --git a/src/lib/openjp2/function_list.h b/src/lib/openjp2/function_list.h
index e669695d17c0bdd6027f1478969b010de821ad12..1a4046e1d538543a0627919209c366e2ecde9c09 100644 (file)
--- a/src/lib/openjp2/function_list.h
+++ b/src/lib/openjp2/function_list.h
@@ -91,6 +91,7 @@ void  opj_procedure_list_destroy(opj_procedure_list_t * p_list);
  *
  * @param   p_validation_list the list of procedure to modify.
  * @param   p_procedure     the procedure to add.
+ * @param   p_manager the user event manager.
  *
  * @return  OPJ_TRUE if the procedure could be added.
  */

diff --git a/src/lib/openjp2/invert.h b/src/lib/openjp2/invert.h
index d1c560c5e47e34388a52b6971f0f7a3c2704646f..f444d7fb22df2ba5ef7b58d04935acc63ded646c 100644 (file)
--- a/src/lib/openjp2/invert.h
+++ b/src/lib/openjp2/invert.h
@@ -50,7 +50,7 @@ The function in INVERT.H compute a matrix inversion with a LUP method
  *
  * @param pSrcMatrix    the matrix to invert.
  * @param pDestMatrix   data to store the inverted matrix.
- * @param n size of the matrix
+ * @param nb_compo      size of the matrix
  * @return OPJ_TRUE if the inversion is successful, OPJ_FALSE if the matrix is singular.
  */
 OPJ_BOOL opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix,

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 66e058a261ebc72daca1d513c349603ec3ac1391..6bc704e221c277397ef5baecaefcd1ab248b98a4 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -268,8 +268,9 @@ static OPJ_BOOL opj_jp2_write_jp(opj_jp2_t *jp2,
 
 /**
 Apply collected palette data
-@param color Collector for profile, cdef and pclr data
-@param image
+@param image Image.
+@param color Collector for profile, cdef and pclr data.
+@param p_manager the user event manager.
 @return true in case of success
 */
 static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image,

diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
index d57947d2206205b6f5996e1cc1e8c41e59e1a94b..0aea383b6884ace068cd31174a9ca003c6103237 100644 (file)
--- a/src/lib/openjp2/openjpeg.h
+++ b/src/lib/openjp2/openjpeg.h
@@ -1477,7 +1477,7 @@ OPJ_API OPJ_BOOL OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec,
 /**
  * Start to compress the current image.
  * @param p_codec       Compressor handle
- * @param image         Input filled image
+ * @param p_image       Input filled image
  * @param p_stream      Input stgream
  */
 OPJ_API OPJ_BOOL OPJ_CALLCONV opj_start_compress(opj_codec_t *p_codec,

diff --git a/src/lib/openjp2/opj_malloc.h b/src/lib/openjp2/opj_malloc.h
index 7503c28d2a4f18ab5ec588418edd5fef62ae7181..87c0e605bd41b52e8df5d5a224568209bdc36761 100644 (file)
--- a/src/lib/openjp2/opj_malloc.h
+++ b/src/lib/openjp2/opj_malloc.h
@@ -56,8 +56,8 @@ void * opj_malloc(size_t size);
 
 /**
 Allocate a memory block with elements initialized to 0
-@param num Blocks to allocate
-@param size Bytes per block to allocate
+@param numOfElements  Blocks to allocate
+@param sizeOfElements Bytes per block to allocate
 @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
 */
 void * opj_calloc(size_t numOfElements, size_t sizeOfElements);

diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c
index 9ab7af30fa87bff1272b4d523da7eca5c5608d45..800b6ed4cb4ce70da731b546f8f3b91fbac62f3d 100644 (file)
--- a/src/lib/openjp2/t1.c
+++ b/src/lib/openjp2/t1.c
@@ -184,6 +184,9 @@ Decode 1 code-block
 @param orient
 @param roishift Region of interest shifting value
 @param cblksty Code-block style
+@param p_manager the event manager
+@param p_manager_mutex mutex for the event manager
+@param check_pterm whether PTERM correct termination should be checked
 */
 static OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1,
                                    opj_tcd_cblk_dec_t* cblk,

diff --git a/src/lib/openjp2/t1.h b/src/lib/openjp2/t1.h
index 9cfdfc111b2c54b469811152c5b65995fcd8d900..9d755b74c652216767464ec30257c976260183a8 100644 (file)
--- a/src/lib/openjp2/t1.h
+++ b/src/lib/openjp2/t1.h
@@ -75,7 +75,7 @@ in T1.C are used by some function in TCD.C.
  *  a single 32-bit flags word to hold the state of 4 data points.  This corresponds
  *  to the 4-point-high columns that the data is processed in.
  *
- *  These #defines declare the layout of a 32-bit flags word.
+ *  These \#defines declare the layout of a 32-bit flags word.
  *
  *  This is currently done for encoding only.
  *  The values must NOT be changed, otherwise this is going to break a lot of
@@ -134,7 +134,7 @@ in T1.C are used by some function in TCD.C.
  *  word right by 3 bits and look at the same bit positions to see the
  *  values for data point 1.
  *
- *  The #defines below help a bit with this; say you have a flags word
+ *  The \#defines below help a bit with this; say you have a flags word
  *  f, you can do things like
  *
  *  (f & T1_SIGMA_THIS)
@@ -226,6 +226,9 @@ Decode the code-blocks of a tile
 @param pret Pointer to return value
 @param tilec The tile to decode
 @param tccp Tile coding parameters
+@param p_manager the event manager
+@param p_manager_mutex mutex for the event manager
+@param check_pterm whether PTERM correct termination should be checked
 */
 void opj_t1_decode_cblks(opj_thread_pool_t* tp,
                          volatile OPJ_BOOL* pret,

diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
index 2b546cca4f5f2c691b94c91cb050a9425ed6aa26..93b77ef0a3bd09aa717ff9fc4860cdbf7bee7d77 100644 (file)
--- a/src/lib/openjp2/t2.c
+++ b/src/lib/openjp2/t2.c
@@ -89,6 +89,7 @@ Decode a packet of a tile from a source buffer
 @param data_read   FIXME DOC
 @param max_length  FIXME DOC
 @param pack_info Packet information
+@param p_manager the user event manager
 
 @return  FIXME DOC
 */

diff --git a/src/lib/openjp2/t2.h b/src/lib/openjp2/t2.h
index b80891b7a33d1d02e8bf3f1efea2a17a26df442f..63f7a21f5e13ff08a1a9272ff93dea4c65e08bb9 100644 (file)
--- a/src/lib/openjp2/t2.h
+++ b/src/lib/openjp2/t2.h
@@ -99,6 +99,7 @@ Decode the packets of a tile from a source buffer
 @param p_data_read the source buffer
 @param len length of the source buffer
 @param cstr_info   FIXME DOC
+@param p_manager the user event manager
 
 @return FIXME DOC
  */

diff --git a/src/lib/openjp2/tgt.c b/src/lib/openjp2/tgt.c
index 25b202356e9541252c6981c275df999dc7e85a58..0cbad12c42ef5e187f9553c12fffb33f8add009d 100644 (file)
--- a/src/lib/openjp2/tgt.c
+++ b/src/lib/openjp2/tgt.c
@@ -46,7 +46,7 @@
 */
 
 opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv,
-                               opj_event_mgr_t *manager)
+                               opj_event_mgr_t *p_manager)
 {
     OPJ_INT32 nplh[32];
     OPJ_INT32 nplv[32];
@@ -61,7 +61,7 @@ opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv,
 
     tree = (opj_tgt_tree_t *) opj_calloc(1, sizeof(opj_tgt_tree_t));
     if (!tree) {
-        opj_event_msg(manager, EVT_ERROR, "Not enough memory to create Tag-tree\n");
+        opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to create Tag-tree\n");
         return 00;
     }
 
@@ -89,7 +89,7 @@ opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv,
     tree->nodes = (opj_tgt_node_t*) opj_calloc(tree->numnodes,
                   sizeof(opj_tgt_node_t));
     if (!tree->nodes) {
-        opj_event_msg(manager, EVT_ERROR,
+        opj_event_msg(p_manager, EVT_ERROR,
                       "Not enough memory to create Tag-tree nodes\n");
         opj_free(tree);
         return 00;

diff --git a/src/lib/openjp2/tgt.h b/src/lib/openjp2/tgt.h
index 0ed0e65851f5df6a15f0e4724a02c7401071acf7..acc817ddea25e7311d6dbbf6fb9e44c87fac7b85 100644 (file)
--- a/src/lib/openjp2/tgt.h
+++ b/src/lib/openjp2/tgt.h
@@ -80,10 +80,11 @@ typedef struct opj_tgt_tree {
 Create a tag-tree
 @param numleafsh Width of the array of leafs of the tree
 @param numleafsv Height of the array of leafs of the tree
+@param p_manager the event manager
 @return Returns a new tag-tree if successful, returns NULL otherwise
 */
 opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv,
-                               opj_event_mgr_t *manager);
+                               opj_event_mgr_t *p_manager);
 
 /**
  * Reinitialises a tag-tree from an exixting one.