/*
- * Copyright (c) 2002-2003, Antonin Descampe
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "raw.h"
+#include "opj_includes.h"
+/*
+==========================================================
+ local functions
+==========================================================
+*/
-unsigned char raw_c;
-unsigned int raw_ct, raw_lenmax, raw_len;
-unsigned char *raw_bp;
-unsigned char *raw_start;
-unsigned char *raw_end;
-/* <summary> */
-/* Return the number of bytes already encoded. */
-/* </summary> */
-int raw_numbytes()
-{
- return raw_bp - raw_start;
-}
+/*
+==========================================================
+ RAW encoding interface
+==========================================================
+*/
-/* <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;
+opj_raw_t* raw_create(void) {
+ opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t));
+ return raw;
}
-/* <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;
+void raw_destroy(opj_raw_t *raw) {
+ if(raw) {
+ opj_free(raw);
}
- /*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;
- }
+int raw_numbytes(opj_raw_t *raw) {
+ return raw->bp - raw->start;
}
-/* <summary> */
-/* Initialize raw-decoder. */
-/* </summary> */
-void raw_init_dec(unsigned char *bp, int len)
-{
- raw_start = bp;
- raw_lenmax = len;
- raw_len = 0;
- raw_c = 0;
- raw_ct = 0;
+void raw_init_dec(opj_raw_t *raw, unsigned char *bp, int len) {
+ raw->start = bp;
+ raw->lenmax = len;
+ raw->len = 0;
+ raw->c = 0;
+ raw->ct = 0;
}
-/* <summary> */
-/* Decode a symbol using raw-decoder. Cfr p.506 TAUBMAN */
-/* </summary> */
-int raw_decode()
-{
+int raw_decode(opj_raw_t *raw) {
int d;
- if (raw_ct == 0) {
- raw_ct = 8;
- if (raw_len == raw_lenmax)
- raw_c = 0xff;
- else {
- if (raw_c == 0xff)
- raw_ct = 7;
- raw_c = *(raw_start + raw_len);
- raw_len++;
+ if (raw->ct == 0) {
+ raw->ct = 8;
+ if (raw->len == raw->lenmax) {
+ raw->c = 0xff;
+ } else {
+ if (raw->c == 0xff) {
+ raw->ct = 7;
+ }
+ raw->c = *(raw->start + raw->len);
+ raw->len++;
}
}
- raw_ct--;
- d = (raw_c >> raw_ct) & 0x01;
+ raw->ct--;
+ d = (raw->c >> raw->ct) & 0x01;
+
return d;
}
+