Update for version 0.8

1 files changed, 19 insertions, 67 deletions

diff --git a/libopenjpeg/raw.c b/libopenjpeg/raw.c
index bdfe6242..180a1dec 100644
--- a/libopenjpeg/raw.c
+++ b/libopenjpeg/raw.c
@@ -27,76 +27,28 @@
 #include "raw.h"
 
 
-unsigned char raw_c;
-unsigned int raw_ct, raw_lenmax, raw_len;
-unsigned char *raw_bp;
-unsigned char *raw_start;
-unsigned char *raw_end;
+unsigned char raw_c;       /* temporary buffer where bits are coded or decoded */
+unsigned int raw_ct;       /* number of bits already read or free to write */
+unsigned int raw_lenmax;   /* maximum length to decode */
+unsigned int raw_len;      /* length decoded */
+unsigned char *raw_bp;     /* pointer to the current position in the buffer */
+unsigned char *raw_start;  /* pointer to the start of the buffer */
+unsigned char *raw_end;    /* pointer to the end of the buffer */
 
-/* <summary> */
-/* Return the number of bytes already encoded. */
-/* </summary> */
+/*
+ * Return the number of bytes already encoded.
+ */
 int raw_numbytes()
 {
 	return raw_bp - raw_start;
 }
 
-/* <summary> */
-/* Initialize raw-encoder. */
-/* </summary> */
-/* <param name="bp">Output buffer.</param> */
-void raw_init_enc(unsigned char *bp)
-{
-	raw_bp = bp - 1;
-	raw_c = 0;
-	raw_ct = 7;
-	raw_start = bp;
-}
-
-/* <summary> */
-/* Encode a symbol using the RAW-coder. */
-/* </summary> */
-/* <param name="d"> The symbol to be encoded (0 or 1).</param> */
-void raw_encode(int d)
-{
-	/*  raw_c+=d; */
-
-	raw_ct--;
-	raw_c += (d << raw_ct);
-
-	if (raw_ct == 0) {
-		raw_bp++;
-		*raw_bp = raw_c;
-		raw_ct = 7;
-		if (raw_c == 0xff) {
-			raw_ct = 6;
-		}
-		raw_c = 0;
-	}
-	/*else 
-	   {
-	   raw_ct--;
-	   raw_c<<=1;
-	   } */
-}
-
-/* <summary> */
-/* Flush encoded data. */
-/* </summary> */
-void raw_flush()
-{
-	char first = 1;
-	int prev = 1;
-	while (raw_ct != 7) {
-		raw_encode(first ? 0 : !(prev));
-		prev = first ? 0 : !(prev);
-		first = 0;
-	}
-}
-
-/* <summary> */
-/* Initialize raw-decoder. */
-/* </summary> */
+/*
+ * Initialize raw-decoder.
+ *
+ * bp  : pointer to the start of the buffer from which the bytes will be read
+ * len : length of the input buffer
+ */
 void raw_init_dec(unsigned char *bp, int len)
 {
 	raw_start = bp;
@@ -106,9 +58,9 @@ void raw_init_dec(unsigned char *bp, int len)
 	raw_ct = 0;
 }
 
-/* <summary> */
-/* Decode a symbol using raw-decoder. Cfr p.506 TAUBMAN */
-/* </summary> */
+/*
+ * Decode a symbol using raw-decoder. Cfr p.506 TAUBMAN
+ */
 int raw_decode()
 {
 	int d;