processed all c/h files through astyle with opj_astyle.cfgcodingstyle

1 files changed, 105 insertions, 101 deletions

diff --git a/src/lib/openmj2/jpt.c b/src/lib/openmj2/jpt.c
index c31c87b4..a75e439c 100644
--- a/src/lib/openmj2/jpt.c
+++ b/src/lib/openmj2/jpt.c
@@ -1,6 +1,6 @@
 /*
- * 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 
+ * 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.
  *
@@ -39,33 +39,35 @@
  * Store information (7 bits) in value
  *
  */
-static unsigned int jpt_read_VBAS_info(opj_cio_t *cio, unsigned int value) {
-	unsigned char elmt;
-
-	elmt = cio_read(cio, 1);
-	while ((elmt >> 7) == 1) {
-		value = (value << 7);
-		value |= (elmt & 0x7f);
-		elmt = cio_read(cio, 1);
-	}
-	value = (value << 7);
-	value |= (elmt & 0x7f);
-
-	return value;
+static unsigned int jpt_read_VBAS_info(opj_cio_t *cio, unsigned int value)
+{
+    unsigned char elmt;
+
+    elmt = cio_read(cio, 1);
+    while ((elmt >> 7) == 1) {
+        value = (value << 7);
+        value |= (elmt & 0x7f);
+        elmt = cio_read(cio, 1);
+    }
+    value = (value << 7);
+    value |= (elmt & 0x7f);
+
+    return value;
 }
 
 /*
- * Initialize the value of the message header structure 
+ * Initialize the value of the message header structure
  *
  */
-void jpt_init_msg_header(opj_jpt_msg_header_t * header) {
-	header->Id = 0;		/* In-class Identifier    */
-	header->last_byte = 0;	/* Last byte information  */
-	header->Class_Id = 0;		/* Class Identifier       */
-	header->CSn_Id = 0;		/* CSn : index identifier */
-	header->Msg_offset = 0;	/* Message offset         */
-	header->Msg_length = 0;	/* Message length         */
-	header->Layer_nb = 0;		/* Auxiliary for JPP case */
+void jpt_init_msg_header(opj_jpt_msg_header_t * header)
+{
+    header->Id = 0;		/* In-class Identifier    */
+    header->last_byte = 0;	/* Last byte information  */
+    header->Class_Id = 0;		/* Class Identifier       */
+    header->CSn_Id = 0;		/* CSn : index identifier */
+    header->Msg_offset = 0;	/* Message offset         */
+    header->Msg_length = 0;	/* Message length         */
+    header->Layer_nb = 0;		/* Auxiliary for JPP case */
 }
 
 /*
@@ -74,87 +76,89 @@ void jpt_init_msg_header(opj_jpt_msg_header_t * header) {
  * Only parameters always present in message header
  *
  */
-static void jpt_reinit_msg_header(opj_jpt_msg_header_t * header) {
-	header->Id = 0;		/* In-class Identifier    */
-	header->last_byte = 0;	/* Last byte information  */
-	header->Msg_offset = 0;	/* Message offset         */
-	header->Msg_length = 0;	/* Message length         */
+static void jpt_reinit_msg_header(opj_jpt_msg_header_t * header)
+{
+    header->Id = 0;		/* In-class Identifier    */
+    header->last_byte = 0;	/* Last byte information  */
+    header->Msg_offset = 0;	/* Message offset         */
+    header->Msg_length = 0;	/* Message length         */
 }
 
 /*
  * Read the message header for a JPP/JPT - stream
  *
  */
-void jpt_read_msg_header(opj_common_ptr cinfo, opj_cio_t *cio, opj_jpt_msg_header_t *header) {
-	unsigned char elmt, Class = 0, CSn = 0;
-	jpt_reinit_msg_header(header);
-
-	/* ------------- */
-	/* VBAS : Bin-ID */
-	/* ------------- */
-	elmt = cio_read(cio, 1);
-
-	/* See for Class and CSn */
-	switch ((elmt >> 5) & 0x03) {
-		case 0:
-			opj_event_msg(cinfo, EVT_ERROR, "Forbidden value encounter in message header !!\n");
-			break;
-		case 1:
-			Class = 0;
-			CSn = 0;
-			break;
-		case 2:
-			Class = 1;
-			CSn = 0;
-			break;
-		case 3:
-			Class = 1;
-			CSn = 1;
-			break;
-		default:
-			break;
-	}
-
-	/* see information on bits 'c' [p 10 : A.2.1 general, ISO/IEC FCD 15444-9] */
-	if (((elmt >> 4) & 0x01) == 1)
-		header->last_byte = 1;
-
-	/* In-class identifier */
-	header->Id |= (elmt & 0x0f);
-	if ((elmt >> 7) == 1)
-		header->Id = jpt_read_VBAS_info(cio, header->Id);
-
-	/* ------------ */
-	/* VBAS : Class */
-	/* ------------ */
-	if (Class == 1) {
-		header->Class_Id = 0;
-		header->Class_Id = jpt_read_VBAS_info(cio, header->Class_Id);
-	}
-
-	/* ---------- */
-	/* VBAS : CSn */
-	/* ---------- */
-	if (CSn == 1) {
-		header->CSn_Id = 0;
-		header->CSn_Id = jpt_read_VBAS_info(cio, header->CSn_Id);
-	}
-
-	/* ----------------- */
-	/* VBAS : Msg_offset */
-	/* ----------------- */
-	header->Msg_offset = jpt_read_VBAS_info(cio, header->Msg_offset);
-
-	/* ----------------- */
-	/* VBAS : Msg_length */
-	/* ----------------- */
-	header->Msg_length = jpt_read_VBAS_info(cio, header->Msg_length);
-
-	/* ---------- */
-	/* VBAS : Aux */
-	/* ---------- */
-	if ((header->Class_Id & 0x01) == 1) {
-		header->Layer_nb = 0;
-		header->Layer_nb = jpt_read_VBAS_info(cio, header->Layer_nb);
-	}
+void jpt_read_msg_header(opj_common_ptr cinfo, opj_cio_t *cio, opj_jpt_msg_header_t *header)
+{
+    unsigned char elmt, Class = 0, CSn = 0;
+    jpt_reinit_msg_header(header);
+
+    /* ------------- */
+    /* VBAS : Bin-ID */
+    /* ------------- */
+    elmt = cio_read(cio, 1);
+
+    /* See for Class and CSn */
+    switch ((elmt >> 5) & 0x03) {
+    case 0:
+        opj_event_msg(cinfo, EVT_ERROR, "Forbidden value encounter in message header !!\n");
+        break;
+    case 1:
+        Class = 0;
+        CSn = 0;
+        break;
+    case 2:
+        Class = 1;
+        CSn = 0;
+        break;
+    case 3:
+        Class = 1;
+        CSn = 1;
+        break;
+    default:
+        break;
+    }
+
+    /* see information on bits 'c' [p 10 : A.2.1 general, ISO/IEC FCD 15444-9] */
+    if (((elmt >> 4) & 0x01) == 1)
+        header->last_byte = 1;
+
+    /* In-class identifier */
+    header->Id |= (elmt & 0x0f);
+    if ((elmt >> 7) == 1)
+        header->Id = jpt_read_VBAS_info(cio, header->Id);
+
+    /* ------------ */
+    /* VBAS : Class */
+    /* ------------ */
+    if (Class == 1) {
+        header->Class_Id = 0;
+        header->Class_Id = jpt_read_VBAS_info(cio, header->Class_Id);
+    }
+
+    /* ---------- */
+    /* VBAS : CSn */
+    /* ---------- */
+    if (CSn == 1) {
+        header->CSn_Id = 0;
+        header->CSn_Id = jpt_read_VBAS_info(cio, header->CSn_Id);
+    }
+
+    /* ----------------- */
+    /* VBAS : Msg_offset */
+    /* ----------------- */
+    header->Msg_offset = jpt_read_VBAS_info(cio, header->Msg_offset);
+
+    /* ----------------- */
+    /* VBAS : Msg_length */
+    /* ----------------- */
+    header->Msg_length = jpt_read_VBAS_info(cio, header->Msg_length);
+
+    /* ---------- */
+    /* VBAS : Aux */
+    /* ---------- */
+    if ((header->Class_Id & 0x01) == 1) {
+        header->Layer_nb = 0;
+        header->Layer_nb = jpt_read_VBAS_info(cio, header->Layer_nb);
+    }
 }