Inline opj_raw_decode()

[openjpeg.git] / src / lib / openjpip / marker_manager.h

diff --git a/src/lib/openjpip/marker_manager.h b/src/lib/openjpip/marker_manager.h
index 68ea2a8bc408840702580faa79608037b9e7772e..e532af54b77da6a20b1f6e26f97e88ab947ab5e0 100644 (file)
--- a/src/lib/openjpip/marker_manager.h
+++ b/src/lib/openjpip/marker_manager.h
@@ -1,8 +1,8 @@
 /*
- * $Id: marker_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2010-2011, Kaori Hagihara
  * All rights reserved.
  *
@@ -28,18 +28,18 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef        MARKER_MANAGER_H_
-# define       MARKER_MANAGER_H_
+#ifndef     MARKER_MANAGER_H_
+# define    MARKER_MANAGER_H_
 
 #include "codestream_manager.h"
 
 
 /** Marker parameters*/
-typedef struct marker_param{
-  codestream_param_t cs; /**< corresponding codestream*/
-  Byte2_t code;          /**< marker code*/
-  OPJ_OFF_T offset;        /**< offset relative to the start of the codestream ( including the length parameter but not the marker itself)*/
-  Byte2_t length;        /**< marker segment length*/
+typedef struct marker_param {
+    codestream_param_t cs; /**< corresponding codestream*/
+    Byte2_t code;          /**< marker code*/
+    OPJ_OFF_T offset;        /**< offset relative to the start of the codestream ( including the length parameter but not the marker itself)*/
+    Byte2_t length;        /**< marker segment length*/
 } marker_param_t;
 
 
@@ -52,7 +52,8 @@ typedef struct marker_param{
  * @param[in] length marker segment length
  * @return           structure of generated marker parameters
  */
-marker_param_t set_marker( codestream_param_t cs, Byte2_t code, OPJ_OFF_T offset, Byte2_t length);
+marker_param_t set_marker(codestream_param_t cs, Byte2_t code, OPJ_OFF_T offset,
+                          Byte2_t length);
 
 
 /**
@@ -60,10 +61,9 @@ 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);
+Byte_t fetch_marker1byte(marker_param_t marker, OPJ_OFF_T offset);
 
 /**
  * fetch marker content 2-byte big endian Byte codes in file stream
@@ -72,7 +72,7 @@ Byte_t fetch_marker1byte( marker_param_t marker, OPJ_OFF_T offset);
  * @param[in] offset start Byte position in marker
  * @return           fetched code
  */
-Byte2_t fetch_marker2bytebigendian( marker_param_t marker, OPJ_OFF_T offset);
+Byte2_t fetch_marker2bytebigendian(marker_param_t marker, OPJ_OFF_T offset);
 
 /**
  * fetch marker content 4-byte big endian Byte codes in file stream
@@ -81,7 +81,7 @@ Byte2_t fetch_marker2bytebigendian( marker_param_t marker, OPJ_OFF_T offset);
  * @param[in] offset start Byte position in marker
  * @return           fetched code
  */
-Byte4_t fetch_marker4bytebigendian( marker_param_t marker, OPJ_OFF_T offset);
+Byte4_t fetch_marker4bytebigendian(marker_param_t marker, OPJ_OFF_T offset);
 
 
-#endif             /* !MARKER_MANAGER_H_ */
+#endif      /* !MARKER_MANAGER_H_ */