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

44 files changed, 13434 insertions, 13237 deletions

diff --git a/src/lib/openmj2/bio.c b/src/lib/openmj2/bio.c
index a4f983d3..6d5c2252 100644
--- a/src/lib/openmj2/bio.c
+++ b/src/lib/openmj2/bio.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -72,122 +72,135 @@ static int bio_bytein(opj_bio_t *bio);
 
 /*@}*/
 
-/* 
+/*
 ==========================================================
    local functions
 ==========================================================
 */
 
-static int bio_byteout(opj_bio_t *bio) {
-	bio->buf = (bio->buf << 8) & 0xffff;
-	bio->ct = bio->buf == 0xff00 ? 7 : 8;
-	if (bio->bp >= bio->end) {
-		return 1;
-	}
-	*bio->bp++ = bio->buf >> 8;
-	return 0;
+static int bio_byteout(opj_bio_t *bio)
+{
+    bio->buf = (bio->buf << 8) & 0xffff;
+    bio->ct = bio->buf == 0xff00 ? 7 : 8;
+    if (bio->bp >= bio->end) {
+        return 1;
+    }
+    *bio->bp++ = bio->buf >> 8;
+    return 0;
 }
 
-static int bio_bytein(opj_bio_t *bio) {
-	bio->buf = (bio->buf << 8) & 0xffff;
-	bio->ct = bio->buf == 0xff00 ? 7 : 8;
-	if (bio->bp >= bio->end) {
-		return 1;
-	}
-	bio->buf |= *bio->bp++;
-	return 0;
+static int bio_bytein(opj_bio_t *bio)
+{
+    bio->buf = (bio->buf << 8) & 0xffff;
+    bio->ct = bio->buf == 0xff00 ? 7 : 8;
+    if (bio->bp >= bio->end) {
+        return 1;
+    }
+    bio->buf |= *bio->bp++;
+    return 0;
 }
 
-static void bio_putbit(opj_bio_t *bio, int b) {
-	if (bio->ct == 0) {
-		bio_byteout(bio);
-	}
-	bio->ct--;
-	bio->buf |= b << bio->ct;
+static void bio_putbit(opj_bio_t *bio, int b)
+{
+    if (bio->ct == 0) {
+        bio_byteout(bio);
+    }
+    bio->ct--;
+    bio->buf |= b << bio->ct;
 }
 
-static int bio_getbit(opj_bio_t *bio) {
-	if (bio->ct == 0) {
-		bio_bytein(bio);
-	}
-	bio->ct--;
-	return (bio->buf >> bio->ct) & 1;
+static int bio_getbit(opj_bio_t *bio)
+{
+    if (bio->ct == 0) {
+        bio_bytein(bio);
+    }
+    bio->ct--;
+    return (bio->buf >> bio->ct) & 1;
 }
 
-/* 
+/*
 ==========================================================
    Bit Input/Output interface
 ==========================================================
 */
 
-opj_bio_t* bio_create(void) {
-	opj_bio_t *bio = (opj_bio_t*)opj_malloc(sizeof(opj_bio_t));
-	return bio;
+opj_bio_t* bio_create(void)
+{
+    opj_bio_t *bio = (opj_bio_t*)opj_malloc(sizeof(opj_bio_t));
+    return bio;
 }
 
-void bio_destroy(opj_bio_t *bio) {
-	if(bio) {
-		opj_free(bio);
-	}
+void bio_destroy(opj_bio_t *bio)
+{
+    if(bio) {
+        opj_free(bio);
+    }
 }
 
-int bio_numbytes(opj_bio_t *bio) {
-	return (bio->bp - bio->start);
+int bio_numbytes(opj_bio_t *bio)
+{
+    return (bio->bp - bio->start);
 }
 
-void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len) {
-	bio->start = bp;
-	bio->end = bp + len;
-	bio->bp = bp;
-	bio->buf = 0;
-	bio->ct = 8;
+void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len)
+{
+    bio->start = bp;
+    bio->end = bp + len;
+    bio->bp = bp;
+    bio->buf = 0;
+    bio->ct = 8;
 }
 
-void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len) {
-	bio->start = bp;
-	bio->end = bp + len;
-	bio->bp = bp;
-	bio->buf = 0;
-	bio->ct = 0;
+void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len)
+{
+    bio->start = bp;
+    bio->end = bp + len;
+    bio->bp = bp;
+    bio->buf = 0;
+    bio->ct = 0;
 }
 
-void bio_write(opj_bio_t *bio, int v, int n) {
-	int i;
-	for (i = n - 1; i >= 0; i--) {
-		bio_putbit(bio, (v >> i) & 1);
-	}
+void bio_write(opj_bio_t *bio, int v, int n)
+{
+    int i;
+    for (i = n - 1; i >= 0; i--) {
+        bio_putbit(bio, (v >> i) & 1);
+    }
 }
 
-int bio_read(opj_bio_t *bio, int n) {
-	int i, v;
-	v = 0;
-	for (i = n - 1; i >= 0; i--) {
-		v += bio_getbit(bio) << i;
-	}
-	return v;
+int bio_read(opj_bio_t *bio, int n)
+{
+    int i, v;
+    v = 0;
+    for (i = n - 1; i >= 0; i--) {
+        v += bio_getbit(bio) << i;
+    }
+    return v;
 }
 
-int bio_flush(opj_bio_t *bio) {
-	bio->ct = 0;
-	if (bio_byteout(bio)) {
-		return 1;
-	}
-	if (bio->ct == 7) {
-		bio->ct = 0;
-		if (bio_byteout(bio)) {
-			return 1;
-		}
-	}
-	return 0;
+int bio_flush(opj_bio_t *bio)
+{
+    bio->ct = 0;
+    if (bio_byteout(bio)) {
+        return 1;
+    }
+    if (bio->ct == 7) {
+        bio->ct = 0;
+        if (bio_byteout(bio)) {
+            return 1;
+        }
+    }
+    return 0;
 }
 
-int bio_inalign(opj_bio_t *bio) {
-	bio->ct = 0;
-	if ((bio->buf & 0xff) == 0xff) {
-		if (bio_bytein(bio)) {
-			return 1;
-		}
-		bio->ct = 0;
-	}
-	return 0;
+int bio_inalign(opj_bio_t *bio)
+{
+    bio->ct = 0;
+    if ((bio->buf & 0xff) == 0xff) {
+        if (bio_bytein(bio)) {
+            return 1;
+        }
+        bio->ct = 0;
+    }
+    return 0;
 }
diff --git a/src/lib/openmj2/bio.h b/src/lib/openmj2/bio.h
index ea7a73de..48de33b4 100644
--- a/src/lib/openmj2/bio.h
+++ b/src/lib/openmj2/bio.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -37,7 +37,7 @@
 
 #ifndef __BIO_H
 #define __BIO_H
-/** 
+/**
 @file bio.h
 @brief Implementation of an individual bit input-output (BIO)
 
@@ -51,23 +51,23 @@ The functions in BIO.C have for goal to realize an individual bit input - output
 Individual bit input-output stream (BIO)
 */
 typedef struct opj_bio {
-	/** pointer to the start of the buffer */
-	unsigned char *start;
-	/** pointer to the end of the buffer */
-	unsigned char *end;
-	/** pointer to the present position in the buffer */
-	unsigned char *bp;
-	/** temporary place where each byte is read or written */
-	unsigned int buf;
-	/** coder : number of bits free to write. decoder : number of bits read */
-	int ct;
+    /** pointer to the start of the buffer */
+    unsigned char *start;
+    /** pointer to the end of the buffer */
+    unsigned char *end;
+    /** pointer to the present position in the buffer */
+    unsigned char *bp;
+    /** temporary place where each byte is read or written */
+    unsigned int buf;
+    /** coder : number of bits free to write. decoder : number of bits read */
+    int ct;
 } opj_bio_t;
 
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
-Create a new BIO handle 
+Create a new BIO handle
 @return Returns a new BIO handle if successful, returns NULL otherwise
 */
 opj_bio_t* bio_create(void);
@@ -86,14 +86,14 @@ int bio_numbytes(opj_bio_t *bio);
 Init encoder
 @param bio BIO handle
 @param bp Output buffer
-@param len Output buffer length 
+@param len Output buffer length
 */
 void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len);
 /**
 Init decoder
 @param bio BIO handle
 @param bp Input buffer
-@param len Input buffer length 
+@param len Input buffer length
 */
 void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len);
 /**
@@ -106,7 +106,7 @@ void bio_write(opj_bio_t *bio, int v, int n);
 /**
 Read bits
 @param bio BIO handle
-@param n Number of bits to read 
+@param n Number of bits to read
 @return Returns the corresponding read number
 */
 int bio_read(opj_bio_t *bio, int n);
diff --git a/src/lib/openmj2/cio.c b/src/lib/openmj2/cio.c
index 51ea135d..1d49773f 100644
--- a/src/lib/openmj2/cio.c
+++ b/src/lib/openmj2/cio.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -39,61 +39,61 @@
 
 /* ----------------------------------------------------------------------- */
 
-opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length) {
-	opj_cp_t *cp = NULL;
-	opj_cio_t *cio = (opj_cio_t*)opj_malloc(sizeof(opj_cio_t));
-	if(!cio) return NULL;
-	cio->cinfo = cinfo;
-	if(buffer && length) {
-		/* wrap a user buffer containing the encoded image */
-		cio->openmode = OPJ_STREAM_READ;
-		cio->buffer = buffer;
-		cio->length = length;
-	}
-	else if(!buffer && !length && cinfo) {
-		/* allocate a buffer for the encoded image */
-		cio->openmode = OPJ_STREAM_WRITE;
-		switch(cinfo->codec_format) {
-			case CODEC_J2K:
-				cp = ((opj_j2k_t*)cinfo->j2k_handle)->cp;
-				break;
-			case CODEC_JP2:
-				cp = ((opj_jp2_t*)cinfo->jp2_handle)->j2k->cp;
-				break;
-			default:
-				opj_free(cio);
-				return NULL;
-		}
-		cio->length = (unsigned int) (0.1625 * cp->img_size + 2000); /* 0.1625 = 1.3/8 and 2000 bytes as a minimum for headers */
-		cio->buffer = (unsigned char *)opj_malloc(cio->length);
-		if(!cio->buffer) {
-			opj_event_msg(cio->cinfo, EVT_ERROR, "Error allocating memory for compressed bitstream\n");
-			opj_free(cio);
-			return NULL;
-		}
-	}
-	else {
-		opj_free(cio);
-		return NULL;
-	}
-
-	/* Initialize byte IO */
-	cio->start = cio->buffer;
-	cio->end = cio->buffer + cio->length;
-	cio->bp = cio->buffer;
-
-	return cio;
+opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length)
+{
+    opj_cp_t *cp = NULL;
+    opj_cio_t *cio = (opj_cio_t*)opj_malloc(sizeof(opj_cio_t));
+    if(!cio) return NULL;
+    cio->cinfo = cinfo;
+    if(buffer && length) {
+        /* wrap a user buffer containing the encoded image */
+        cio->openmode = OPJ_STREAM_READ;
+        cio->buffer = buffer;
+        cio->length = length;
+    } else if(!buffer && !length && cinfo) {
+        /* allocate a buffer for the encoded image */
+        cio->openmode = OPJ_STREAM_WRITE;
+        switch(cinfo->codec_format) {
+        case CODEC_J2K:
+            cp = ((opj_j2k_t*)cinfo->j2k_handle)->cp;
+            break;
+        case CODEC_JP2:
+            cp = ((opj_jp2_t*)cinfo->jp2_handle)->j2k->cp;
+            break;
+        default:
+            opj_free(cio);
+            return NULL;
+        }
+        cio->length = (unsigned int) (0.1625 * cp->img_size + 2000); /* 0.1625 = 1.3/8 and 2000 bytes as a minimum for headers */
+        cio->buffer = (unsigned char *)opj_malloc(cio->length);
+        if(!cio->buffer) {
+            opj_event_msg(cio->cinfo, EVT_ERROR, "Error allocating memory for compressed bitstream\n");
+            opj_free(cio);
+            return NULL;
+        }
+    } else {
+        opj_free(cio);
+        return NULL;
+    }
+
+    /* Initialize byte IO */
+    cio->start = cio->buffer;
+    cio->end = cio->buffer + cio->length;
+    cio->bp = cio->buffer;
+
+    return cio;
 }
 
-void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio) {
-	if(cio) {
-		if(cio->openmode == OPJ_STREAM_WRITE) {
-			/* destroy the allocated buffer */
-			opj_free(cio->buffer);
-		}
-		/* destroy the cio */
-		opj_free(cio);
-	}
+void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio)
+{
+    if(cio) {
+        if(cio->openmode == OPJ_STREAM_WRITE) {
+            /* destroy the allocated buffer */
+            opj_free(cio->buffer);
+        }
+        /* destroy the cio */
+        opj_free(cio);
+    }
 }
 
 
@@ -102,8 +102,9 @@ void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio) {
 /*
  * Get position in byte stream.
  */
-int OPJ_CALLCONV cio_tell(opj_cio_t *cio) {
-	return cio->bp - cio->start;
+int OPJ_CALLCONV cio_tell(opj_cio_t *cio)
+{
+    return cio->bp - cio->start;
 }
 
 /*
@@ -111,45 +112,50 @@ int OPJ_CALLCONV cio_tell(opj_cio_t *cio) {
  *
  * pos : position, in number of bytes, from the beginning of the stream
  */
-void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos) {
-	cio->bp = cio->start + pos;
+void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos)
+{
+    cio->bp = cio->start + pos;
 }
 
 /*
  * Number of bytes left before the end of the stream.
  */
-int cio_numbytesleft(opj_cio_t *cio) {
-	return cio->end - cio->bp;
+int cio_numbytesleft(opj_cio_t *cio)
+{
+    return cio->end - cio->bp;
 }
 
 /*
  * Get pointer to the current position in the stream.
  */
-unsigned char *cio_getbp(opj_cio_t *cio) {
-	return cio->bp;
+unsigned char *cio_getbp(opj_cio_t *cio)
+{
+    return cio->bp;
 }
 
 /*
  * Write a byte.
  */
-opj_bool cio_byteout(opj_cio_t *cio, unsigned char v) {
-	if (cio->bp >= cio->end) {
-		opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
-		return OPJ_FALSE;
-	}
-	*cio->bp++ = v;
-	return OPJ_TRUE;
+opj_bool cio_byteout(opj_cio_t *cio, unsigned char v)
+{
+    if (cio->bp >= cio->end) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
+        return OPJ_FALSE;
+    }
+    *cio->bp++ = v;
+    return OPJ_TRUE;
 }
 
 /*
  * Read a byte.
  */
-unsigned char cio_bytein(opj_cio_t *cio) {
-	if (cio->bp >= cio->end) {
-		opj_event_msg(cio->cinfo, EVT_ERROR, "read error: passed the end of the codestream (start = %d, current = %d, end = %d\n", cio->start, cio->bp, cio->end);
-		return 0;
-	}
-	return *cio->bp++;
+unsigned char cio_bytein(opj_cio_t *cio)
+{
+    if (cio->bp >= cio->end) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "read error: passed the end of the codestream (start = %d, current = %d, end = %d\n", cio->start, cio->bp, cio->end);
+        return 0;
+    }
+    return *cio->bp++;
 }
 
 /*
@@ -158,13 +164,14 @@ unsigned char cio_bytein(opj_cio_t *cio) {
  * v : value to write
  * n : number of bytes to write
  */
-unsigned int OPJ_CALLCONV cio_write(opj_cio_t *cio, unsigned int64 v, int n) {
-	int i;
-	for (i = n - 1; i >= 0; i--) {
-		if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )
-			return 0;
-	}
-	return n;
+unsigned int OPJ_CALLCONV cio_write(opj_cio_t *cio, unsigned int64 v, int n)
+{
+    int i;
+    for (i = n - 1; i >= 0; i--) {
+        if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )
+            return 0;
+    }
+    return n;
 }
 
 /*
@@ -174,23 +181,25 @@ unsigned int OPJ_CALLCONV cio_write(opj_cio_t *cio, unsigned int64 v, int n) {
  *
  * return : value of the n bytes read
  */
-unsigned int OPJ_CALLCONV cio_read(opj_cio_t *cio, int n) {
-	int i;
-	unsigned int v;
-	v = 0;
-	for (i = n - 1; i >= 0; i--) {
-		v += cio_bytein(cio) << (i << 3);
-	}
-	return v;
+unsigned int OPJ_CALLCONV cio_read(opj_cio_t *cio, int n)
+{
+    int i;
+    unsigned int v;
+    v = 0;
+    for (i = n - 1; i >= 0; i--) {
+        v += cio_bytein(cio) << (i << 3);
+    }
+    return v;
 }
 
-/* 
+/*
  * Skip some bytes.
  *
  * n : number of bytes to skip
  */
-void OPJ_CALLCONV cio_skip(opj_cio_t *cio, int n) {
-	cio->bp += n;
+void OPJ_CALLCONV cio_skip(opj_cio_t *cio, int n)
+{
+    cio->bp += n;
 }
 
 
diff --git a/src/lib/openmj2/cio.h b/src/lib/openmj2/cio.h
index 3cae708e..1d4ad684 100644
--- a/src/lib/openmj2/cio.h
+++ b/src/lib/openmj2/cio.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
diff --git a/src/lib/openmj2/dwt.c b/src/lib/openmj2/dwt.c
index 178e4d02..9a04251a 100644
--- a/src/lib/openmj2/dwt.c
+++ b/src/lib/openmj2/dwt.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2007, Jonathan Ballard <dzonatas@dzonux.net>
@@ -53,21 +53,21 @@
 /*@{*/
 
 typedef struct dwt_local {
-	int* mem;
-	int dn;
-	int sn;
-	int cas;
+    int* mem;
+    int dn;
+    int sn;
+    int cas;
 } dwt_t;
 
 typedef union {
-	float	f[4];
+    float	f[4];
 } v4;
 
 typedef struct v4dwt_local {
-	v4*	wavelet ;
-	int		dn ;
-	int		sn ;
-	int		cas ;
+    v4*	wavelet ;
+    int		dn ;
+    int		sn ;
+    int		cas ;
 } v4dwt_t ;
 
 static const float dwt_alpha =  1.586134342f; /*  12994 */
@@ -82,7 +82,7 @@ static const float c13318 = 1.625732422f;
 /*@}*/
 
 /**
-Virtual function type for wavelet transform in 1-D 
+Virtual function type for wavelet transform in 1-D
 */
 typedef void (*DWT1DFN)(dwt_t* v);
 
@@ -118,7 +118,7 @@ Forward 9-7 wavelet transform in 1-D
 */
 static void dwt_encode_1_real(int *a, int dn, int sn, int cas);
 /**
-Explicit calculation of the Quantization Stepsizes 
+Explicit calculation of the Quantization Stepsizes
 */
 static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize);
 /**
@@ -142,23 +142,23 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int i, DWT1DFN fn);
 /* This table contains the norms of the 5-3 wavelets for different bands. */
 /* </summary>                                                             */
 static const double dwt_norms[4][10] = {
-	{1.000, 1.500, 2.750, 5.375, 10.68, 21.34, 42.67, 85.33, 170.7, 341.3},
-	{1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
-	{1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
-	{.7186, .9218, 1.586, 3.043, 6.019, 12.01, 24.00, 47.97, 95.93}
+    {1.000, 1.500, 2.750, 5.375, 10.68, 21.34, 42.67, 85.33, 170.7, 341.3},
+    {1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
+    {1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
+    {.7186, .9218, 1.586, 3.043, 6.019, 12.01, 24.00, 47.97, 95.93}
 };
 
 /* <summary>                                                              */
 /* This table contains the norms of the 9-7 wavelets for different bands. */
 /* </summary>                                                             */
 static const double dwt_norms_real[4][10] = {
-	{1.000, 1.965, 4.177, 8.403, 16.90, 33.84, 67.69, 135.3, 270.6, 540.9},
-	{2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-	{2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-	{2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2}
+    {1.000, 1.965, 4.177, 8.403, 16.90, 33.84, 67.69, 135.3, 270.6, 540.9},
+    {2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
+    {2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
+    {2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2}
 };
 
-/* 
+/*
 ==========================================================
    local functions
 ==========================================================
@@ -166,17 +166,19 @@ static const double dwt_norms_real[4][10] = {
 
 /* <summary>			                 */
 /* Forward lazy transform (horizontal).  */
-/* </summary>                            */ 
-static void dwt_deinterleave_h(int *a, int *b, int dn, int sn, int cas) {
-	int i;
+/* </summary>                            */
+static void dwt_deinterleave_h(int *a, int *b, int dn, int sn, int cas)
+{
+    int i;
     for (i=0; i<sn; i++) b[i]=a[2*i+cas];
     for (i=0; i<dn; i++) b[sn+i]=a[(2*i+1-cas)];
 }
 
-/* <summary>                             */  
+/* <summary>                             */
 /* Forward lazy transform (vertical).    */
-/* </summary>                            */ 
-static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas) {
+/* </summary>                            */
+static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas)
+{
     int i;
     for (i=0; i<sn; i++) b[i*x]=a[2*i+cas];
     for (i=0; i<dn; i++) b[(sn+i)*x]=a[(2*i+1-cas)];
@@ -185,42 +187,44 @@ static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas) {
 /* <summary>                             */
 /* Inverse lazy transform (horizontal).  */
 /* </summary>                            */
-static void dwt_interleave_h(dwt_t* h, int *a) {
+static void dwt_interleave_h(dwt_t* h, int *a)
+{
     int *ai = a;
     int *bi = h->mem + h->cas;
     int  i	= h->sn;
     while( i-- ) {
-      *bi = *(ai++);
-	  bi += 2;
+        *bi = *(ai++);
+        bi += 2;
     }
     ai	= a + h->sn;
     bi	= h->mem + 1 - h->cas;
     i	= h->dn ;
     while( i-- ) {
-      *bi = *(ai++);
-	  bi += 2;
+        *bi = *(ai++);
+        bi += 2;
     }
 }
 
-/* <summary>                             */  
+/* <summary>                             */
 /* Inverse lazy transform (vertical).    */
-/* </summary>                            */ 
-static void dwt_interleave_v(dwt_t* v, int *a, int x) {
+/* </summary>                            */
+static void dwt_interleave_v(dwt_t* v, int *a, int x)
+{
     int *ai = a;
     int *bi = v->mem + v->cas;
     int  i = v->sn;
     while( i-- ) {
-      *bi = *ai;
-	  bi += 2;
-	  ai += x;
+        *bi = *ai;
+        bi += 2;
+        ai += x;
     }
     ai = a + (v->sn * x);
     bi = v->mem + 1 - v->cas;
     i = v->dn ;
     while( i-- ) {
-      *bi = *ai;
-	  bi += 2;  
-	  ai += x;
+        *bi = *ai;
+        bi += 2;
+        ai += x;
     }
 }
 
@@ -228,99 +232,104 @@ static void dwt_interleave_v(dwt_t* v, int *a, int x) {
 /* <summary>                            */
 /* Forward 5-3 wavelet transform in 1-D. */
 /* </summary>                           */
-static void dwt_encode_1(int *a, int dn, int sn, int cas) {
-	int i;
-	
-	if (!cas) {
-		if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < dn; i++) D(i) -= (S_(i) + S_(i + 1)) >> 1;
-			for (i = 0; i < sn; i++) S(i) += (D_(i - 1) + D_(i) + 2) >> 2;
-		}
-	} else {
-		if (!sn && dn == 1)		    /* NEW :  CASE ONE ELEMENT */
-			S(0) *= 2;
-		else {
-			for (i = 0; i < dn; i++) S(i) -= (DD_(i) + DD_(i - 1)) >> 1;
-			for (i = 0; i < sn; i++) D(i) += (SS_(i) + SS_(i + 1) + 2) >> 2;
-		}
-	}
+static void dwt_encode_1(int *a, int dn, int sn, int cas)
+{
+    int i;
+
+    if (!cas) {
+        if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+            for (i = 0; i < dn; i++) D(i) -= (S_(i) + S_(i + 1)) >> 1;
+            for (i = 0; i < sn; i++) S(i) += (D_(i - 1) + D_(i) + 2) >> 2;
+        }
+    } else {
+        if (!sn && dn == 1)		    /* NEW :  CASE ONE ELEMENT */
+            S(0) *= 2;
+        else {
+            for (i = 0; i < dn; i++) S(i) -= (DD_(i) + DD_(i - 1)) >> 1;
+            for (i = 0; i < sn; i++) D(i) += (SS_(i) + SS_(i + 1) + 2) >> 2;
+        }
+    }
 }
 
 /* <summary>                            */
 /* Inverse 5-3 wavelet transform in 1-D. */
-/* </summary>                           */ 
-static void dwt_decode_1_(int *a, int dn, int sn, int cas) {
-	int i;
-	
-	if (!cas) {
-		if ((dn > 0) || (sn > 1)) { /* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < sn; i++) S(i) -= (D_(i - 1) + D_(i) + 2) >> 2;
-			for (i = 0; i < dn; i++) D(i) += (S_(i) + S_(i + 1)) >> 1;
-		}
-	} else {
-		if (!sn  && dn == 1)          /* NEW :  CASE ONE ELEMENT */
-			S(0) /= 2;
-		else {
-			for (i = 0; i < sn; i++) D(i) -= (SS_(i) + SS_(i + 1) + 2) >> 2;
-			for (i = 0; i < dn; i++) S(i) += (DD_(i) + DD_(i - 1)) >> 1;
-		}
-	}
+/* </summary>                           */
+static void dwt_decode_1_(int *a, int dn, int sn, int cas)
+{
+    int i;
+
+    if (!cas) {
+        if ((dn > 0) || (sn > 1)) { /* NEW :  CASE ONE ELEMENT */
+            for (i = 0; i < sn; i++) S(i) -= (D_(i - 1) + D_(i) + 2) >> 2;
+            for (i = 0; i < dn; i++) D(i) += (S_(i) + S_(i + 1)) >> 1;
+        }
+    } else {
+        if (!sn  && dn == 1)          /* NEW :  CASE ONE ELEMENT */
+            S(0) /= 2;
+        else {
+            for (i = 0; i < sn; i++) D(i) -= (SS_(i) + SS_(i + 1) + 2) >> 2;
+            for (i = 0; i < dn; i++) S(i) += (DD_(i) + DD_(i - 1)) >> 1;
+        }
+    }
 }
 
 /* <summary>                            */
 /* Inverse 5-3 wavelet transform in 1-D. */
-/* </summary>                           */ 
-static void dwt_decode_1(dwt_t *v) {
-	dwt_decode_1_(v->mem, v->dn, v->sn, v->cas);
+/* </summary>                           */
+static void dwt_decode_1(dwt_t *v)
+{
+    dwt_decode_1_(v->mem, v->dn, v->sn, v->cas);
 }
 
 /* <summary>                             */
 /* Forward 9-7 wavelet transform in 1-D. */
 /* </summary>                            */
-static void dwt_encode_1_real(int *a, int dn, int sn, int cas) {
-	int i;
-	if (!cas) {
-		if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < dn; i++)
-				D(i) -= fix_mul(S_(i) + S_(i + 1), 12993);
-			for (i = 0; i < sn; i++)
-				S(i) -= fix_mul(D_(i - 1) + D_(i), 434);
-			for (i = 0; i < dn; i++)
-				D(i) += fix_mul(S_(i) + S_(i + 1), 7233);
-			for (i = 0; i < sn; i++)
-				S(i) += fix_mul(D_(i - 1) + D_(i), 3633);
-			for (i = 0; i < dn; i++)
-				D(i) = fix_mul(D(i), 5038);	/*5038 */
-			for (i = 0; i < sn; i++)
-				S(i) = fix_mul(S(i), 6659);	/*6660 */
-		}
-	} else {
-		if ((sn > 0) || (dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < dn; i++)
-				S(i) -= fix_mul(DD_(i) + DD_(i - 1), 12993);
-			for (i = 0; i < sn; i++)
-				D(i) -= fix_mul(SS_(i) + SS_(i + 1), 434);
-			for (i = 0; i < dn; i++)
-				S(i) += fix_mul(DD_(i) + DD_(i - 1), 7233);
-			for (i = 0; i < sn; i++)
-				D(i) += fix_mul(SS_(i) + SS_(i + 1), 3633);
-			for (i = 0; i < dn; i++)
-				S(i) = fix_mul(S(i), 5038);	/*5038 */
-			for (i = 0; i < sn; i++)
-				D(i) = fix_mul(D(i), 6659);	/*6660 */
-		}
-	}
+static void dwt_encode_1_real(int *a, int dn, int sn, int cas)
+{
+    int i;
+    if (!cas) {
+        if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+            for (i = 0; i < dn; i++)
+                D(i) -= fix_mul(S_(i) + S_(i + 1), 12993);
+            for (i = 0; i < sn; i++)
+                S(i) -= fix_mul(D_(i - 1) + D_(i), 434);
+            for (i = 0; i < dn; i++)
+                D(i) += fix_mul(S_(i) + S_(i + 1), 7233);
+            for (i = 0; i < sn; i++)
+                S(i) += fix_mul(D_(i - 1) + D_(i), 3633);
+            for (i = 0; i < dn; i++)
+                D(i) = fix_mul(D(i), 5038);	/*5038 */
+            for (i = 0; i < sn; i++)
+                S(i) = fix_mul(S(i), 6659);	/*6660 */
+        }
+    } else {
+        if ((sn > 0) || (dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+            for (i = 0; i < dn; i++)
+                S(i) -= fix_mul(DD_(i) + DD_(i - 1), 12993);
+            for (i = 0; i < sn; i++)
+                D(i) -= fix_mul(SS_(i) + SS_(i + 1), 434);
+            for (i = 0; i < dn; i++)
+                S(i) += fix_mul(DD_(i) + DD_(i - 1), 7233);
+            for (i = 0; i < sn; i++)
+                D(i) += fix_mul(SS_(i) + SS_(i + 1), 3633);
+            for (i = 0; i < dn; i++)
+                S(i) = fix_mul(S(i), 5038);	/*5038 */
+            for (i = 0; i < sn; i++)
+                D(i) = fix_mul(D(i), 6659);	/*6660 */
+        }
+    }
 }
 
-static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize) {
-	int p, n;
-	p = int_floorlog2(stepsize) - 13;
-	n = 11 - int_floorlog2(stepsize);
-	bandno_stepsize->mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff;
-	bandno_stepsize->expn = numbps - p;
+static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize)
+{
+    int p, n;
+    p = int_floorlog2(stepsize) - 13;
+    n = 11 - int_floorlog2(stepsize);
+    bandno_stepsize->mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff;
+    bandno_stepsize->expn = numbps - p;
 }
 
-/* 
+/*
 ==========================================================
    DWT interface
 ==========================================================
@@ -329,413 +338,429 @@ static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno
 /* <summary>                            */
 /* Forward 5-3 wavelet transform in 2-D. */
 /* </summary>                           */
-void dwt_encode(opj_tcd_tilecomp_t * tilec) {
-	int i, j, k;
-	int *a = NULL;
-	int *aj = NULL;
-	int *bj = NULL;
-	int w, l;
-	
-	w = tilec->x1-tilec->x0;
-	l = tilec->numresolutions-1;
-	a = tilec->data;
-	
-	for (i = 0; i < l; i++) {
-		int rw;			/* width of the resolution level computed                                                           */
-		int rh;			/* height of the resolution level computed                                                          */
-		int rw1;		/* width of the resolution level once lower than computed one                                       */
-		int rh1;		/* height of the resolution level once lower than computed one                                      */
-		int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-		int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-		int dn, sn;
-		
-		rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-		rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-		rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-		rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-		
-		cas_row = tilec->resolutions[l - i].x0 % 2;
-		cas_col = tilec->resolutions[l - i].y0 % 2;
-        
-		sn = rh1;
-		dn = rh - rh1;
-		bj = (int*)opj_malloc(rh * sizeof(int));
-		for (j = 0; j < rw; j++) {
-			aj = a + j;
-			for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
-			dwt_encode_1(bj, dn, sn, cas_col);
-			dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
-		}
-		opj_free(bj);
-		
-		sn = rw1;
-		dn = rw - rw1;
-		bj = (int*)opj_malloc(rw * sizeof(int));
-		for (j = 0; j < rh; j++) {
-			aj = a + j * w;
-			for (k = 0; k < rw; k++)  bj[k] = aj[k];
-			dwt_encode_1(bj, dn, sn, cas_row);
-			dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
-		}
-		opj_free(bj);
-	}
+void dwt_encode(opj_tcd_tilecomp_t * tilec)
+{
+    int i, j, k;
+    int *a = NULL;
+    int *aj = NULL;
+    int *bj = NULL;
+    int w, l;
+
+    w = tilec->x1-tilec->x0;
+    l = tilec->numresolutions-1;
+    a = tilec->data;
+
+    for (i = 0; i < l; i++) {
+        int rw;			/* width of the resolution level computed                                                           */
+        int rh;			/* height of the resolution level computed                                                          */
+        int rw1;		/* width of the resolution level once lower than computed one                                       */
+        int rh1;		/* height of the resolution level once lower than computed one                                      */
+        int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
+        int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
+        int dn, sn;
+
+        rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
+        rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
+        rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
+        rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
+
+        cas_row = tilec->resolutions[l - i].x0 % 2;
+        cas_col = tilec->resolutions[l - i].y0 % 2;
+
+        sn = rh1;
+        dn = rh - rh1;
+        bj = (int*)opj_malloc(rh * sizeof(int));
+        for (j = 0; j < rw; j++) {
+            aj = a + j;
+            for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
+            dwt_encode_1(bj, dn, sn, cas_col);
+            dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
+        }
+        opj_free(bj);
+
+        sn = rw1;
+        dn = rw - rw1;
+        bj = (int*)opj_malloc(rw * sizeof(int));
+        for (j = 0; j < rh; j++) {
+            aj = a + j * w;
+            for (k = 0; k < rw; k++)  bj[k] = aj[k];
+            dwt_encode_1(bj, dn, sn, cas_row);
+            dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
+        }
+        opj_free(bj);
+    }
 }
 
 
 /* <summary>                            */
 /* Inverse 5-3 wavelet transform in 2-D. */
 /* </summary>                           */
-void dwt_decode(opj_tcd_tilecomp_t* tilec, int numres) {
-	dwt_decode_tile(tilec, numres, &dwt_decode_1);
+void dwt_decode(opj_tcd_tilecomp_t* tilec, int numres)
+{
+    dwt_decode_tile(tilec, numres, &dwt_decode_1);
 }
 
 
 /* <summary>                          */
 /* Get gain of 5-3 wavelet transform. */
 /* </summary>                         */
-int dwt_getgain(int orient) {
-	if (orient == 0)
-		return 0;
-	if (orient == 1 || orient == 2)
-		return 1;
-	return 2;
+int dwt_getgain(int orient)
+{
+    if (orient == 0)
+        return 0;
+    if (orient == 1 || orient == 2)
+        return 1;
+    return 2;
 }
 
 /* <summary>                */
 /* Get norm of 5-3 wavelet. */
 /* </summary>               */
-double dwt_getnorm(int level, int orient) {
-	return dwt_norms[orient][level];
+double dwt_getnorm(int level, int orient)
+{
+    return dwt_norms[orient][level];
 }
 
 /* <summary>                             */
 /* Forward 9-7 wavelet transform in 2-D. */
 /* </summary>                            */
 
-void dwt_encode_real(opj_tcd_tilecomp_t * tilec) {
-	int i, j, k;
-	int *a = NULL;
-	int *aj = NULL;
-	int *bj = NULL;
-	int w, l;
-	
-	w = tilec->x1-tilec->x0;
-	l = tilec->numresolutions-1;
-	a = tilec->data;
-	
-	for (i = 0; i < l; i++) {
-		int rw;			/* width of the resolution level computed                                                     */
-		int rh;			/* height of the resolution level computed                                                    */
-		int rw1;		/* width of the resolution level once lower than computed one                                 */
-		int rh1;		/* height of the resolution level once lower than computed one                                */
-		int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-		int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-		int dn, sn;
-		
-		rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-		rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-		rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-		rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-		
-		cas_row = tilec->resolutions[l - i].x0 % 2;
-		cas_col = tilec->resolutions[l - i].y0 % 2;
-		
-		sn = rh1;
-		dn = rh - rh1;
-		bj = (int*)opj_malloc(rh * sizeof(int));
-		for (j = 0; j < rw; j++) {
-			aj = a + j;
-			for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
-			dwt_encode_1_real(bj, dn, sn, cas_col);
-			dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
-		}
-		opj_free(bj);
-		
-		sn = rw1;
-		dn = rw - rw1;
-		bj = (int*)opj_malloc(rw * sizeof(int));
-		for (j = 0; j < rh; j++) {
-			aj = a + j * w;
-			for (k = 0; k < rw; k++)  bj[k] = aj[k];
-			dwt_encode_1_real(bj, dn, sn, cas_row);
-			dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
-		}
-		opj_free(bj);
-	}
+void dwt_encode_real(opj_tcd_tilecomp_t * tilec)
+{
+    int i, j, k;
+    int *a = NULL;
+    int *aj = NULL;
+    int *bj = NULL;
+    int w, l;
+
+    w = tilec->x1-tilec->x0;
+    l = tilec->numresolutions-1;
+    a = tilec->data;
+
+    for (i = 0; i < l; i++) {
+        int rw;			/* width of the resolution level computed                                                     */
+        int rh;			/* height of the resolution level computed                                                    */
+        int rw1;		/* width of the resolution level once lower than computed one                                 */
+        int rh1;		/* height of the resolution level once lower than computed one                                */
+        int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
+        int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
+        int dn, sn;
+
+        rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
+        rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
+        rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
+        rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
+
+        cas_row = tilec->resolutions[l - i].x0 % 2;
+        cas_col = tilec->resolutions[l - i].y0 % 2;
+
+        sn = rh1;
+        dn = rh - rh1;
+        bj = (int*)opj_malloc(rh * sizeof(int));
+        for (j = 0; j < rw; j++) {
+            aj = a + j;
+            for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
+            dwt_encode_1_real(bj, dn, sn, cas_col);
+            dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
+        }
+        opj_free(bj);
+
+        sn = rw1;
+        dn = rw - rw1;
+        bj = (int*)opj_malloc(rw * sizeof(int));
+        for (j = 0; j < rh; j++) {
+            aj = a + j * w;
+            for (k = 0; k < rw; k++)  bj[k] = aj[k];
+            dwt_encode_1_real(bj, dn, sn, cas_row);
+            dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
+        }
+        opj_free(bj);
+    }
 }
 
 
 /* <summary>                          */
 /* Get gain of 9-7 wavelet transform. */
 /* </summary>                         */
-int dwt_getgain_real(int orient) {
-	(void)orient;
-	return 0;
+int dwt_getgain_real(int orient)
+{
+    (void)orient;
+    return 0;
 }
 
 /* <summary>                */
 /* Get norm of 9-7 wavelet. */
 /* </summary>               */
-double dwt_getnorm_real(int level, int orient) {
-	return dwt_norms_real[orient][level];
+double dwt_getnorm_real(int level, int orient)
+{
+    return dwt_norms_real[orient][level];
 }
 
-void dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, int prec) {
-	int numbands, bandno;
-	numbands = 3 * tccp->numresolutions - 2;
-	for (bandno = 0; bandno < numbands; bandno++) {
-		double stepsize;
-		int resno, level, orient, gain;
-
-		resno = (bandno == 0) ? 0 : ((bandno - 1) / 3 + 1);
-		orient = (bandno == 0) ? 0 : ((bandno - 1) % 3 + 1);
-		level = tccp->numresolutions - 1 - resno;
-		gain = (tccp->qmfbid == 0) ? 0 : ((orient == 0) ? 0 : (((orient == 1) || (orient == 2)) ? 1 : 2));
-		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-			stepsize = 1.0;
-		} else {
-			double norm = dwt_norms_real[orient][level];
-			stepsize = (1 << (gain)) / norm;
-		}
-		dwt_encode_stepsize((int) floor(stepsize * 8192.0), prec + gain, &tccp->stepsizes[bandno]);
-	}
+void dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, int prec)
+{
+    int numbands, bandno;
+    numbands = 3 * tccp->numresolutions - 2;
+    for (bandno = 0; bandno < numbands; bandno++) {
+        double stepsize;
+        int resno, level, orient, gain;
+
+        resno = (bandno == 0) ? 0 : ((bandno - 1) / 3 + 1);
+        orient = (bandno == 0) ? 0 : ((bandno - 1) % 3 + 1);
+        level = tccp->numresolutions - 1 - resno;
+        gain = (tccp->qmfbid == 0) ? 0 : ((orient == 0) ? 0 : (((orient == 1) || (orient == 2)) ? 1 : 2));
+        if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
+            stepsize = 1.0;
+        } else {
+            double norm = dwt_norms_real[orient][level];
+            stepsize = (1 << (gain)) / norm;
+        }
+        dwt_encode_stepsize((int) floor(stepsize * 8192.0), prec + gain, &tccp->stepsizes[bandno]);
+    }
 }
 
 
 /* <summary>                             */
 /* Determine maximum computed resolution level for inverse wavelet transform */
 /* </summary>                            */
-static int dwt_decode_max_resolution(opj_tcd_resolution_t* restrict r, int i) {
-	int mr	= 1;
-	int w;
-	while( --i ) {
-		r++;
-		if( mr < ( w = r->x1 - r->x0 ) )
-			mr = w ;
-		if( mr < ( w = r->y1 - r->y0 ) )
-			mr = w ;
-	}
-	return mr ;
+static int dwt_decode_max_resolution(opj_tcd_resolution_t* restrict r, int i)
+{
+    int mr	= 1;
+    int w;
+    while( --i ) {
+        r++;
+        if( mr < ( w = r->x1 - r->x0 ) )
+            mr = w ;
+        if( mr < ( w = r->y1 - r->y0 ) )
+            mr = w ;
+    }
+    return mr ;
 }
 
 
 /* <summary>                            */
 /* Inverse wavelet transform in 2-D.     */
 /* </summary>                           */
-static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1D) {
-	dwt_t h;
-	dwt_t v;
+static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1D)
+{
+    dwt_t h;
+    dwt_t v;
 
-	opj_tcd_resolution_t* tr = tilec->resolutions;
+    opj_tcd_resolution_t* tr = tilec->resolutions;
 
-	int rw = tr->x1 - tr->x0;	/* width of the resolution level computed */
-	int rh = tr->y1 - tr->y0;	/* height of the resolution level computed */
+    int rw = tr->x1 - tr->x0;	/* width of the resolution level computed */
+    int rh = tr->y1 - tr->y0;	/* height of the resolution level computed */
 
-	int w = tilec->x1 - tilec->x0;
+    int w = tilec->x1 - tilec->x0;
 
-	h.mem = (int*)opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
-	v.mem = h.mem;
+    h.mem = (int*)opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
+    v.mem = h.mem;
 
-	while( --numres) {
-		int * restrict tiledp = tilec->data;
-		int j;
+    while( --numres) {
+        int * restrict tiledp = tilec->data;
+        int j;
 
-		++tr;
-		h.sn = rw;
-		v.sn = rh;
+        ++tr;
+        h.sn = rw;
+        v.sn = rh;
 
-		rw = tr->x1 - tr->x0;
-		rh = tr->y1 - tr->y0;
+        rw = tr->x1 - tr->x0;
+        rh = tr->y1 - tr->y0;
 
-		h.dn = rw - h.sn;
-		h.cas = tr->x0 % 2;
+        h.dn = rw - h.sn;
+        h.cas = tr->x0 % 2;
 
-		for(j = 0; j < rh; ++j) {
-			dwt_interleave_h(&h, &tiledp[j*w]);
-			(dwt_1D)(&h);
-			memcpy(&tiledp[j*w], h.mem, rw * sizeof(int));
-		}
+        for(j = 0; j < rh; ++j) {
+            dwt_interleave_h(&h, &tiledp[j*w]);
+            (dwt_1D)(&h);
+            memcpy(&tiledp[j*w], h.mem, rw * sizeof(int));
+        }
 
-		v.dn = rh - v.sn;
-		v.cas = tr->y0 % 2;
+        v.dn = rh - v.sn;
+        v.cas = tr->y0 % 2;
 
-		for(j = 0; j < rw; ++j){
-			int k;
-			dwt_interleave_v(&v, &tiledp[j], w);
-			(dwt_1D)(&v);
-			for(k = 0; k < rh; ++k) {
-				tiledp[k * w + j] = v.mem[k];
-			}
-		}
-	}
-	opj_aligned_free(h.mem);
+        for(j = 0; j < rw; ++j) {
+            int k;
+            dwt_interleave_v(&v, &tiledp[j], w);
+            (dwt_1D)(&v);
+            for(k = 0; k < rh; ++k) {
+                tiledp[k * w + j] = v.mem[k];
+            }
+        }
+    }
+    opj_aligned_free(h.mem);
 }
 
-static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, int size){
-	float* restrict bi = (float*) (w->wavelet + w->cas);
-	int count = w->sn;
-	int i, k;
-	for(k = 0; k < 2; ++k){
-		if (count + 3 * x < size && ((size_t) a & 0x0f) == 0 && ((size_t) bi & 0x0f) == 0 && (x & 0x0f) == 0) {
-			/* Fast code path */
-			for(i = 0; i < count; ++i){
-				int j = i;
-				bi[i*8    ] = a[j];
-				j += x;
-				bi[i*8 + 1] = a[j];
-				j += x;
-				bi[i*8 + 2] = a[j];
-				j += x;
-				bi[i*8 + 3] = a[j];
-			}
-		} else {
-			/* Slow code path */
-		for(i = 0; i < count; ++i){
-			int j = i;
-			bi[i*8    ] = a[j];
-			j += x;
-			if(j > size) continue;
-			bi[i*8 + 1] = a[j];
-			j += x;
-			if(j > size) continue;
-			bi[i*8 + 2] = a[j];
-			j += x;
-			if(j > size) continue;
-			bi[i*8 + 3] = a[j];
-		}
-		}
-		bi = (float*) (w->wavelet + 1 - w->cas);
-		a += w->sn;
-		size -= w->sn;
-		count = w->dn;
-	}
+static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, int size)
+{
+    float* restrict bi = (float*) (w->wavelet + w->cas);
+    int count = w->sn;
+    int i, k;
+    for(k = 0; k < 2; ++k) {
+        if (count + 3 * x < size && ((size_t) a & 0x0f) == 0 && ((size_t) bi & 0x0f) == 0 && (x & 0x0f) == 0) {
+            /* Fast code path */
+            for(i = 0; i < count; ++i) {
+                int j = i;
+                bi[i*8    ] = a[j];
+                j += x;
+                bi[i*8 + 1] = a[j];
+                j += x;
+                bi[i*8 + 2] = a[j];
+                j += x;
+                bi[i*8 + 3] = a[j];
+            }
+        } else {
+            /* Slow code path */
+            for(i = 0; i < count; ++i) {
+                int j = i;
+                bi[i*8    ] = a[j];
+                j += x;
+                if(j > size) continue;
+                bi[i*8 + 1] = a[j];
+                j += x;
+                if(j > size) continue;
+                bi[i*8 + 2] = a[j];
+                j += x;
+                if(j > size) continue;
+                bi[i*8 + 3] = a[j];
+            }
+        }
+        bi = (float*) (w->wavelet + 1 - w->cas);
+        a += w->sn;
+        size -= w->sn;
+        count = w->dn;
+    }
 }
 
-static void v4dwt_interleave_v(v4dwt_t* restrict v , float* restrict a , int x){
-	v4* restrict bi = v->wavelet + v->cas;
-	int i;
-	for(i = 0; i < v->sn; ++i){
-		memcpy(&bi[i*2], &a[i*x], 4 * sizeof(float));
-	}
-	a += v->sn * x;
-	bi = v->wavelet + 1 - v->cas;
-	for(i = 0; i < v->dn; ++i){
-		memcpy(&bi[i*2], &a[i*x], 4 * sizeof(float));
-	}
+static void v4dwt_interleave_v(v4dwt_t* restrict v , float* restrict a , int x)
+{
+    v4* restrict bi = v->wavelet + v->cas;
+    int i;
+    for(i = 0; i < v->sn; ++i) {
+        memcpy(&bi[i*2], &a[i*x], 4 * sizeof(float));
+    }
+    a += v->sn * x;
+    bi = v->wavelet + 1 - v->cas;
+    for(i = 0; i < v->dn; ++i) {
+        memcpy(&bi[i*2], &a[i*x], 4 * sizeof(float));
+    }
 }
 
 #ifdef __SSE__
 
-static void v4dwt_decode_step1_sse(v4* w, int count, const __m128 c){
-	__m128* restrict vw = (__m128*) w;
-	int i;
-	/* 4x unrolled loop */
-	for(i = 0; i < count >> 2; ++i){
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-	}
-	count &= 3;
-	for(i = 0; i < count; ++i){
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-	}
+static void v4dwt_decode_step1_sse(v4* w, int count, const __m128 c)
+{
+    __m128* restrict vw = (__m128*) w;
+    int i;
+    /* 4x unrolled loop */
+    for(i = 0; i < count >> 2; ++i) {
+        *vw = _mm_mul_ps(*vw, c);
+        vw += 2;
+        *vw = _mm_mul_ps(*vw, c);
+        vw += 2;
+        *vw = _mm_mul_ps(*vw, c);
+        vw += 2;
+        *vw = _mm_mul_ps(*vw, c);
+        vw += 2;
+    }
+    count &= 3;
+    for(i = 0; i < count; ++i) {
+        *vw = _mm_mul_ps(*vw, c);
+        vw += 2;
+    }
 }
 
-static void v4dwt_decode_step2_sse(v4* l, v4* w, int k, int m, __m128 c){
-	__m128* restrict vl = (__m128*) l;
-	__m128* restrict vw = (__m128*) w;
-	int i;
-	__m128 tmp1, tmp2, tmp3;
-	tmp1 = vl[0];
-	for(i = 0; i < m; ++i){
-		tmp2 = vw[-1];
-		tmp3 = vw[ 0];
-		vw[-1] = _mm_add_ps(tmp2, _mm_mul_ps(_mm_add_ps(tmp1, tmp3), c));
-		tmp1 = tmp3;
-		vw += 2;
-	}
-	vl = vw - 2;
-	if(m >= k){
-		return;
-	}
-	c = _mm_add_ps(c, c);
-	c = _mm_mul_ps(c, vl[0]);
-	for(; m < k; ++m){
-		__m128 tmp = vw[-1];
-		vw[-1] = _mm_add_ps(tmp, c);
-		vw += 2;
-	}
+static void v4dwt_decode_step2_sse(v4* l, v4* w, int k, int m, __m128 c)
+{
+    __m128* restrict vl = (__m128*) l;
+    __m128* restrict vw = (__m128*) w;
+    int i;
+    __m128 tmp1, tmp2, tmp3;
+    tmp1 = vl[0];
+    for(i = 0; i < m; ++i) {
+        tmp2 = vw[-1];
+        tmp3 = vw[ 0];
+        vw[-1] = _mm_add_ps(tmp2, _mm_mul_ps(_mm_add_ps(tmp1, tmp3), c));
+        tmp1 = tmp3;
+        vw += 2;
+    }
+    vl = vw - 2;
+    if(m >= k) {
+        return;
+    }
+    c = _mm_add_ps(c, c);
+    c = _mm_mul_ps(c, vl[0]);
+    for(; m < k; ++m) {
+        __m128 tmp = vw[-1];
+        vw[-1] = _mm_add_ps(tmp, c);
+        vw += 2;
+    }
 }
 
 #else
 
-static void v4dwt_decode_step1(v4* w, int count, const float c){
-	float* restrict fw = (float*) w;
-	int i;
-	for(i = 0; i < count; ++i){
-		float tmp1 = fw[i*8    ];
-		float tmp2 = fw[i*8 + 1];
-		float tmp3 = fw[i*8 + 2];
-		float tmp4 = fw[i*8 + 3];
-		fw[i*8    ] = tmp1 * c;
-		fw[i*8 + 1] = tmp2 * c;
-		fw[i*8 + 2] = tmp3 * c;
-		fw[i*8 + 3] = tmp4 * c;
-	}
+static void v4dwt_decode_step1(v4* w, int count, const float c)
+{
+    float* restrict fw = (float*) w;
+    int i;
+    for(i = 0; i < count; ++i) {
+        float tmp1 = fw[i*8    ];
+        float tmp2 = fw[i*8 + 1];
+        float tmp3 = fw[i*8 + 2];
+        float tmp4 = fw[i*8 + 3];
+        fw[i*8    ] = tmp1 * c;
+        fw[i*8 + 1] = tmp2 * c;
+        fw[i*8 + 2] = tmp3 * c;
+        fw[i*8 + 3] = tmp4 * c;
+    }
 }
 
-static void v4dwt_decode_step2(v4* l, v4* w, int k, int m, float c){
-	float* restrict fl = (float*) l;
-	float* restrict fw = (float*) w;
-	int i;
-	for(i = 0; i < m; ++i){
-		float tmp1_1 = fl[0];
-		float tmp1_2 = fl[1];
-		float tmp1_3 = fl[2];
-		float tmp1_4 = fl[3];
-		float tmp2_1 = fw[-4];
-		float tmp2_2 = fw[-3];
-		float tmp2_3 = fw[-2];
-		float tmp2_4 = fw[-1];
-		float tmp3_1 = fw[0];
-		float tmp3_2 = fw[1];
-		float tmp3_3 = fw[2];
-		float tmp3_4 = fw[3];
-		fw[-4] = tmp2_1 + ((tmp1_1 + tmp3_1) * c);
-		fw[-3] = tmp2_2 + ((tmp1_2 + tmp3_2) * c);
-		fw[-2] = tmp2_3 + ((tmp1_3 + tmp3_3) * c);
-		fw[-1] = tmp2_4 + ((tmp1_4 + tmp3_4) * c);
-		fl = fw;
-		fw += 8;
-	}
-	if(m < k){
-		float c1;
-		float c2;
-		float c3;
-		float c4;
-		c += c;
-		c1 = fl[0] * c;
-		c2 = fl[1] * c;
-		c3 = fl[2] * c;
-		c4 = fl[3] * c;
-		for(; m < k; ++m){
-			float tmp1 = fw[-4];
-			float tmp2 = fw[-3];
-			float tmp3 = fw[-2];
-			float tmp4 = fw[-1];
-			fw[-4] = tmp1 + c1;
-			fw[-3] = tmp2 + c2;
-			fw[-2] = tmp3 + c3;
-			fw[-1] = tmp4 + c4;
-			fw += 8;
-		}
-	}
+static void v4dwt_decode_step2(v4* l, v4* w, int k, int m, float c)
+{
+    float* restrict fl = (float*) l;
+    float* restrict fw = (float*) w;
+    int i;
+    for(i = 0; i < m; ++i) {
+        float tmp1_1 = fl[0];
+        float tmp1_2 = fl[1];
+        float tmp1_3 = fl[2];
+        float tmp1_4 = fl[3];
+        float tmp2_1 = fw[-4];
+        float tmp2_2 = fw[-3];
+        float tmp2_3 = fw[-2];
+        float tmp2_4 = fw[-1];
+        float tmp3_1 = fw[0];
+        float tmp3_2 = fw[1];
+        float tmp3_3 = fw[2];
+        float tmp3_4 = fw[3];
+        fw[-4] = tmp2_1 + ((tmp1_1 + tmp3_1) * c);
+        fw[-3] = tmp2_2 + ((tmp1_2 + tmp3_2) * c);
+        fw[-2] = tmp2_3 + ((tmp1_3 + tmp3_3) * c);
+        fw[-1] = tmp2_4 + ((tmp1_4 + tmp3_4) * c);
+        fl = fw;
+        fw += 8;
+    }
+    if(m < k) {
+        float c1;
+        float c2;
+        float c3;
+        float c4;
+        c += c;
+        c1 = fl[0] * c;
+        c2 = fl[1] * c;
+        c3 = fl[2] * c;
+        c4 = fl[3] * c;
+        for(; m < k; ++m) {
+            float tmp1 = fw[-4];
+            float tmp2 = fw[-3];
+            float tmp3 = fw[-2];
+            float tmp4 = fw[-1];
+            fw[-4] = tmp1 + c1;
+            fw[-3] = tmp2 + c2;
+            fw[-2] = tmp3 + c3;
+            fw[-1] = tmp4 + c4;
+            fw += 8;
+        }
+    }
 }
 
 #endif
@@ -743,122 +768,127 @@ static void v4dwt_decode_step2(v4* l, v4* w, int k, int m, float c){
 /* <summary>                             */
 /* Inverse 9-7 wavelet transform in 1-D. */
 /* </summary>                            */
-static void v4dwt_decode(v4dwt_t* restrict dwt){
-	int a, b;
-	if(dwt->cas == 0) {
-		if(!((dwt->dn > 0) || (dwt->sn > 1))){
-			return;
-		}
-		a = 0;
-		b = 1;
-	}else{
-		if(!((dwt->sn > 0) || (dwt->dn > 1))) {
-			return;
-		}
-		a = 1;
-		b = 0;
-	}
+static void v4dwt_decode(v4dwt_t* restrict dwt)
+{
+    int a, b;
+    if(dwt->cas == 0) {
+        if(!((dwt->dn > 0) || (dwt->sn > 1))) {
+            return;
+        }
+        a = 0;
+        b = 1;
+    } else {
+        if(!((dwt->sn > 0) || (dwt->dn > 1))) {
+            return;
+        }
+        a = 1;
+        b = 0;
+    }
 #ifdef __SSE__
-	v4dwt_decode_step1_sse(dwt->wavelet+a, dwt->sn, _mm_set1_ps(K));
-	v4dwt_decode_step1_sse(dwt->wavelet+b, dwt->dn, _mm_set1_ps(c13318));
-	v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(dwt_delta));
-	v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(dwt_gamma));
-	v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(dwt_beta));
-	v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(dwt_alpha));
+    v4dwt_decode_step1_sse(dwt->wavelet+a, dwt->sn, _mm_set1_ps(K));
+    v4dwt_decode_step1_sse(dwt->wavelet+b, dwt->dn, _mm_set1_ps(c13318));
+    v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(dwt_delta));
+    v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(dwt_gamma));
+    v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(dwt_beta));
+    v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(dwt_alpha));
 #else
-	v4dwt_decode_step1(dwt->wavelet+a, dwt->sn, K);
-	v4dwt_decode_step1(dwt->wavelet+b, dwt->dn, c13318);
-	v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), dwt_delta);
-	v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), dwt_gamma);
-	v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), dwt_beta);
-	v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), dwt_alpha);
+    v4dwt_decode_step1(dwt->wavelet+a, dwt->sn, K);
+    v4dwt_decode_step1(dwt->wavelet+b, dwt->dn, c13318);
+    v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), dwt_delta);
+    v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), dwt_gamma);
+    v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), dwt_beta);
+    v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), dwt_alpha);
 #endif
 }
 
 /* <summary>                             */
 /* Inverse 9-7 wavelet transform in 2-D. */
 /* </summary>                            */
-void dwt_decode_real(opj_tcd_tilecomp_t* restrict tilec, int numres){
-	v4dwt_t h;
-	v4dwt_t v;
-
-	opj_tcd_resolution_t* res = tilec->resolutions;
-
-	int rw = res->x1 - res->x0;	/* width of the resolution level computed */
-	int rh = res->y1 - res->y0;	/* height of the resolution level computed */
-
-	int w = tilec->x1 - tilec->x0;
-
-	h.wavelet = (v4*) opj_aligned_malloc((dwt_decode_max_resolution(res, numres)+5) * sizeof(v4));
-	v.wavelet = h.wavelet;
-
-	while( --numres) {
-		float * restrict aj = (float*) tilec->data;
-		int bufsize = (tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0);
-		int j;
-
-		h.sn = rw;
-		v.sn = rh;
-
-		++res;
-
-		rw = res->x1 - res->x0;	/* width of the resolution level computed */
-		rh = res->y1 - res->y0;	/* height of the resolution level computed */
-
-		h.dn = rw - h.sn;
-		h.cas = res->x0 % 2;
-
-		for(j = rh; j > 3; j -= 4){
-			int k;
-			v4dwt_interleave_h(&h, aj, w, bufsize);
-			v4dwt_decode(&h);
-				for(k = rw; --k >= 0;){
-					aj[k    ] = h.wavelet[k].f[0];
-					aj[k+w  ] = h.wavelet[k].f[1];
-					aj[k+w*2] = h.wavelet[k].f[2];
-					aj[k+w*3] = h.wavelet[k].f[3];
-				}
-			aj += w*4;
-			bufsize -= w*4;
-		}
-		if (rh & 0x03) {
-				int k;
-			j = rh & 0x03;
-			v4dwt_interleave_h(&h, aj, w, bufsize);
-			v4dwt_decode(&h);
-				for(k = rw; --k >= 0;){
-					switch(j) {
-						case 3: aj[k+w*2] = h.wavelet[k].f[2];
-						case 2: aj[k+w  ] = h.wavelet[k].f[1];
-						case 1: aj[k    ] = h.wavelet[k].f[0];
-					}
-				}
-			}
-
-		v.dn = rh - v.sn;
-		v.cas = res->y0 % 2;
-
-		aj = (float*) tilec->data;
-		for(j = rw; j > 3; j -= 4){
-			int k;
-			v4dwt_interleave_v(&v, aj, w);
-			v4dwt_decode(&v);
-				for(k = 0; k < rh; ++k){
-					memcpy(&aj[k*w], &v.wavelet[k], 4 * sizeof(float));
-				}
-			aj += 4;
-		}
-		if (rw & 0x03){
-				int k;
-			j = rw & 0x03;
-			v4dwt_interleave_v(&v, aj, w);
-			v4dwt_decode(&v);
-				for(k = 0; k < rh; ++k){
-					memcpy(&aj[k*w], &v.wavelet[k], j * sizeof(float));
-				}
-			}
-	}
-
-	opj_aligned_free(h.wavelet);
+void dwt_decode_real(opj_tcd_tilecomp_t* restrict tilec, int numres)
+{
+    v4dwt_t h;
+    v4dwt_t v;
+
+    opj_tcd_resolution_t* res = tilec->resolutions;
+
+    int rw = res->x1 - res->x0;	/* width of the resolution level computed */
+    int rh = res->y1 - res->y0;	/* height of the resolution level computed */
+
+    int w = tilec->x1 - tilec->x0;
+
+    h.wavelet = (v4*) opj_aligned_malloc((dwt_decode_max_resolution(res, numres)+5) * sizeof(v4));
+    v.wavelet = h.wavelet;
+
+    while( --numres) {
+        float * restrict aj = (float*) tilec->data;
+        int bufsize = (tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0);
+        int j;
+
+        h.sn = rw;
+        v.sn = rh;
+
+        ++res;
+
+        rw = res->x1 - res->x0;	/* width of the resolution level computed */
+        rh = res->y1 - res->y0;	/* height of the resolution level computed */
+
+        h.dn = rw - h.sn;
+        h.cas = res->x0 % 2;
+
+        for(j = rh; j > 3; j -= 4) {
+            int k;
+            v4dwt_interleave_h(&h, aj, w, bufsize);
+            v4dwt_decode(&h);
+            for(k = rw; --k >= 0;) {
+                aj[k    ] = h.wavelet[k].f[0];
+                aj[k+w  ] = h.wavelet[k].f[1];
+                aj[k+w*2] = h.wavelet[k].f[2];
+                aj[k+w*3] = h.wavelet[k].f[3];
+            }
+            aj += w*4;
+            bufsize -= w*4;
+        }
+        if (rh & 0x03) {
+            int k;
+            j = rh & 0x03;
+            v4dwt_interleave_h(&h, aj, w, bufsize);
+            v4dwt_decode(&h);
+            for(k = rw; --k >= 0;) {
+                switch(j) {
+                case 3:
+                    aj[k+w*2] = h.wavelet[k].f[2];
+                case 2:
+                    aj[k+w  ] = h.wavelet[k].f[1];
+                case 1:
+                    aj[k    ] = h.wavelet[k].f[0];
+                }
+            }
+        }
+
+        v.dn = rh - v.sn;
+        v.cas = res->y0 % 2;
+
+        aj = (float*) tilec->data;
+        for(j = rw; j > 3; j -= 4) {
+            int k;
+            v4dwt_interleave_v(&v, aj, w);
+            v4dwt_decode(&v);
+            for(k = 0; k < rh; ++k) {
+                memcpy(&aj[k*w], &v.wavelet[k], 4 * sizeof(float));
+            }
+            aj += 4;
+        }
+        if (rw & 0x03) {
+            int k;
+            j = rw & 0x03;
+            v4dwt_interleave_v(&v, aj, w);
+            v4dwt_decode(&v);
+            for(k = 0; k < rh; ++k) {
+                memcpy(&aj[k*w], &v.wavelet[k], j * sizeof(float));
+            }
+        }
+    }
+
+    opj_aligned_free(h.wavelet);
 }
 
diff --git a/src/lib/openmj2/dwt.h b/src/lib/openmj2/dwt.h
index 5b9645bf..50bd3d02 100644
--- a/src/lib/openmj2/dwt.h
+++ b/src/lib/openmj2/dwt.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -80,13 +80,13 @@ Get the norm of a wavelet function of a subband at a specified level for the rev
 */
 double dwt_getnorm(int level, int orient);
 /**
-Forward 9-7 wavelet transform in 2-D. 
+Forward 9-7 wavelet transform in 2-D.
 Apply an irreversible DWT transform to a component of an image.
 @param tilec Tile component information (current tile)
 */
 void dwt_encode_real(opj_tcd_tilecomp_t * tilec);
 /**
-Inverse 9-7 wavelet transform in 2-D. 
+Inverse 9-7 wavelet transform in 2-D.
 Apply an irreversible inverse DWT transform to a component of an image.
 @param tilec Tile component information (current tile)
 @param numres Number of resolution levels to decode
@@ -106,7 +106,7 @@ Get the norm of a wavelet function of a subband at a specified level for the irr
 */
 double dwt_getnorm_real(int level, int orient);
 /**
-Explicit calculation of the Quantization Stepsizes 
+Explicit calculation of the Quantization Stepsizes
 @param tccp Tile-component coding parameters
 @param prec Precint analyzed
 */
diff --git a/src/lib/openmj2/event.c b/src/lib/openmj2/event.c
index 0210ed68..2a9b1824 100644
--- a/src/lib/openmj2/event.c
+++ b/src/lib/openmj2/event.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.
  *
@@ -38,14 +38,15 @@
 #ifdef OPJ_CODE_NOT_USED
 #ifndef _WIN32
 static char*
-i2a(unsigned i, char *a, unsigned r) {
-	if (i/r > 0) a = i2a(i/r,a,r);
-	*a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i%r];
-	return a+1;
+i2a(unsigned i, char *a, unsigned r)
+{
+    if (i/r > 0) a = i2a(i/r,a,r);
+    *a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i%r];
+    return a+1;
 }
 
-/** 
- Transforms integer i into an ascii string and stores the result in a; 
+/**
+ Transforms integer i into an ascii string and stores the result in a;
  string is encoded in the base indicated by r.
  @param i Number to be converted
  @param a String result
@@ -53,74 +54,76 @@ i2a(unsigned i, char *a, unsigned r) {
  @return Returns a
 */
 static char *
-_itoa(int i, char *a, int r) {
-	r = ((r < 2) || (r > 36)) ? 10 : r;
-	if(i < 0) {
-		*a = '-';
-		*i2a(-i, a+1, r) = 0;
-	}
-	else *i2a(i, a, r) = 0;
-	return a;
+_itoa(int i, char *a, int r)
+{
+    r = ((r < 2) || (r > 36)) ? 10 : r;
+    if(i < 0) {
+        *a = '-';
+        *i2a(-i, a+1, r) = 0;
+    } else *i2a(i, a, r) = 0;
+    return a;
 }
 
 #endif /* !_WIN32 */
 #endif
 /* ----------------------------------------------------------------------- */
 
-opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) {
-	if(cinfo) {
-		opj_event_mgr_t *previous = cinfo->event_mgr;
-		cinfo->event_mgr = event_mgr;
-		cinfo->client_data = context;
-		return previous;
-	}
+opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context)
+{
+    if(cinfo) {
+        opj_event_mgr_t *previous = cinfo->event_mgr;
+        cinfo->event_mgr = event_mgr;
+        cinfo->client_data = context;
+        return previous;
+    }
 
-	return NULL;
+    return NULL;
 }
 
-opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...) {
+opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...)
+{
 #define MSG_SIZE 512 /* 512 bytes should be more than enough for a short message */
-	opj_msg_callback msg_handler = NULL;
+    opj_msg_callback msg_handler = NULL;
 
-	opj_event_mgr_t *event_mgr = cinfo->event_mgr;
-	if(event_mgr != NULL) {
-		switch(event_type) {
-			case EVT_ERROR:
-				msg_handler = event_mgr->error_handler;
-				break;
-			case EVT_WARNING:
-				msg_handler = event_mgr->warning_handler;
-				break;
-			case EVT_INFO:
-				msg_handler = event_mgr->info_handler;
-				break;
-			default:
-				break;
-		}
-		if(msg_handler == NULL) {
-			return OPJ_FALSE;
-		}
-	} else {
-		return OPJ_FALSE;
-	}
+    opj_event_mgr_t *event_mgr = cinfo->event_mgr;
+    if(event_mgr != NULL) {
+        switch(event_type) {
+        case EVT_ERROR:
+            msg_handler = event_mgr->error_handler;
+            break;
+        case EVT_WARNING:
+            msg_handler = event_mgr->warning_handler;
+            break;
+        case EVT_INFO:
+            msg_handler = event_mgr->info_handler;
+            break;
+        default:
+            break;
+        }
+        if(msg_handler == NULL) {
+            return OPJ_FALSE;
+        }
+    } else {
+        return OPJ_FALSE;
+    }
 
-	if ((fmt != NULL) && (event_mgr != NULL)) {
-		va_list arg;
-		int str_length/*, i, j*/; /* UniPG */
-		char message[MSG_SIZE];
-		/* initialize the optional parameter list */
-		va_start(arg, fmt);
-		/* parse the format string and put the result in 'message' */
-		str_length = vsnprintf(message, MSG_SIZE, fmt, arg); /* UniPG */
-		/* deinitialize the optional parameter list */
-		va_end(arg);
+    if ((fmt != NULL) && (event_mgr != NULL)) {
+        va_list arg;
+        int str_length/*, i, j*/; /* UniPG */
+        char message[MSG_SIZE];
+        /* initialize the optional parameter list */
+        va_start(arg, fmt);
+        /* parse the format string and put the result in 'message' */
+        str_length = vsnprintf(message, MSG_SIZE, fmt, arg); /* UniPG */
+        /* deinitialize the optional parameter list */
+        va_end(arg);
 
-		/* output the message to the user program */
-    if( str_length > -1 && str_length < MSG_SIZE )
-      msg_handler(message, cinfo->client_data);
-    else return OPJ_FALSE;
-	}
+        /* output the message to the user program */
+        if( str_length > -1 && str_length < MSG_SIZE )
+            msg_handler(message, cinfo->client_data);
+        else return OPJ_FALSE;
+    }
 
-	return OPJ_TRUE;
+    return OPJ_TRUE;
 }
 
diff --git a/src/lib/openmj2/event.h b/src/lib/openmj2/event.h
index d0a73edf..72ef3e12 100644
--- a/src/lib/openmj2/event.h
+++ b/src/lib/openmj2/event.h
@@ -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.
  *
@@ -48,7 +48,7 @@ The functions in EVENT.C have for goal to send output messages (errors, warnings
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
-Write formatted data to a string and send the string to a user callback. 
+Write formatted data to a string and send the string to a user callback.
 @param cinfo Codec context info
 @param event_type Event type or callback to use to send the message
 @param fmt Format-control string (plus optionnal arguments)
diff --git a/src/lib/openmj2/fix.h b/src/lib/openmj2/fix.h
index f6a76a7e..990641b5 100644
--- a/src/lib/openmj2/fix.h
+++ b/src/lib/openmj2/fix.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -59,7 +59,8 @@ Multiply two fixed-precision rational numbers.
 @param b
 @return Returns a * b
 */
-static INLINE int fix_mul(int a, int b) {
+static INLINE int fix_mul(int a, int b)
+{
     int64 temp = (int64) a * (int64) b ;
     temp += temp & 4096;
     return (int) (temp >> 13) ;
diff --git a/src/lib/openmj2/image.c b/src/lib/openmj2/image.c
index 18d0cac4..b04d6f44 100644
--- a/src/lib/openmj2/image.c
+++ b/src/lib/openmj2/image.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.
  *
@@ -31,64 +31,67 @@
 
 #include "opj_includes.h"
 
-opj_image_t* opj_image_create0(void) {
-	opj_image_t *image = (opj_image_t*)opj_calloc(1, sizeof(opj_image_t));
-	return image;
+opj_image_t* opj_image_create0(void)
+{
+    opj_image_t *image = (opj_image_t*)opj_calloc(1, sizeof(opj_image_t));
+    return image;
 }
 
-opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
-	int compno;
-	opj_image_t *image = NULL;
+opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc)
+{
+    int compno;
+    opj_image_t *image = NULL;
 
-	image = (opj_image_t*) opj_calloc(1, sizeof(opj_image_t));
-	if(image) {
-		image->color_space = clrspc;
-		image->numcomps = numcmpts;
-		/* allocate memory for the per-component information */
-		image->comps = (opj_image_comp_t*)opj_malloc(image->numcomps * sizeof(opj_image_comp_t));
-		if(!image->comps) {
-			fprintf(stderr,"Unable to allocate memory for image.\n");
-			opj_image_destroy(image);
-			return NULL;
-		}
-		/* create the individual image components */
-		for(compno = 0; compno < numcmpts; compno++) {
-			opj_image_comp_t *comp = &image->comps[compno];
-			comp->dx = cmptparms[compno].dx;
-			comp->dy = cmptparms[compno].dy;
-			comp->w = cmptparms[compno].w;
-			comp->h = cmptparms[compno].h;
-			comp->x0 = cmptparms[compno].x0;
-			comp->y0 = cmptparms[compno].y0;
-			comp->prec = cmptparms[compno].prec;
-			comp->bpp = cmptparms[compno].bpp;
-			comp->sgnd = cmptparms[compno].sgnd;
-			comp->data = (int*) opj_calloc(comp->w * comp->h, sizeof(int));
-			if(!comp->data) {
-				fprintf(stderr,"Unable to allocate memory for image.\n");
-				opj_image_destroy(image);
-				return NULL;
-			}
-		}
-	}
+    image = (opj_image_t*) opj_calloc(1, sizeof(opj_image_t));
+    if(image) {
+        image->color_space = clrspc;
+        image->numcomps = numcmpts;
+        /* allocate memory for the per-component information */
+        image->comps = (opj_image_comp_t*)opj_malloc(image->numcomps * sizeof(opj_image_comp_t));
+        if(!image->comps) {
+            fprintf(stderr,"Unable to allocate memory for image.\n");
+            opj_image_destroy(image);
+            return NULL;
+        }
+        /* create the individual image components */
+        for(compno = 0; compno < numcmpts; compno++) {
+            opj_image_comp_t *comp = &image->comps[compno];
+            comp->dx = cmptparms[compno].dx;
+            comp->dy = cmptparms[compno].dy;
+            comp->w = cmptparms[compno].w;
+            comp->h = cmptparms[compno].h;
+            comp->x0 = cmptparms[compno].x0;
+            comp->y0 = cmptparms[compno].y0;
+            comp->prec = cmptparms[compno].prec;
+            comp->bpp = cmptparms[compno].bpp;
+            comp->sgnd = cmptparms[compno].sgnd;
+            comp->data = (int*) opj_calloc(comp->w * comp->h, sizeof(int));
+            if(!comp->data) {
+                fprintf(stderr,"Unable to allocate memory for image.\n");
+                opj_image_destroy(image);
+                return NULL;
+            }
+        }
+    }
 
-	return image;
+    return image;
 }
 
-void OPJ_CALLCONV opj_image_destroy(opj_image_t *image) {
-	int i;
-	if(image) {
-		if(image->comps) {
-			/* image components */
-			for(i = 0; i < image->numcomps; i++) {
-				opj_image_comp_t *image_comp = &image->comps[i];
-				if(image_comp->data) {
-					opj_free(image_comp->data);
-				}
-			}
-			opj_free(image->comps);
-		}
-		opj_free(image);
-	}
+void OPJ_CALLCONV opj_image_destroy(opj_image_t *image)
+{
+    int i;
+    if(image) {
+        if(image->comps) {
+            /* image components */
+            for(i = 0; i < image->numcomps; i++) {
+                opj_image_comp_t *image_comp = &image->comps[i];
+                if(image_comp->data) {
+                    opj_free(image_comp->data);
+                }
+            }
+            opj_free(image->comps);
+        }
+        opj_free(image);
+    }
 }
 
diff --git a/src/lib/openmj2/image.h b/src/lib/openmj2/image.h
index 074a26d3..dd432150 100644
--- a/src/lib/openmj2/image.h
+++ b/src/lib/openmj2/image.h
@@ -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.
  *
diff --git a/src/lib/openmj2/int.h b/src/lib/openmj2/int.h
index 07f60c31..9a9ce787 100644
--- a/src/lib/openmj2/int.h
+++ b/src/lib/openmj2/int.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -53,15 +53,17 @@ The functions in INT.H have for goal to realize operations on integers.
 Get the minimum of two integers
 @return Returns a if a < b else b
 */
-static INLINE int int_min(int a, int b) {
-	return a < b ? a : b;
+static INLINE int int_min(int a, int b)
+{
+    return a < b ? a : b;
 }
 /**
 Get the maximum of two integers
 @return Returns a if a > b else b
 */
-static INLINE int int_max(int a, int b) {
-	return (a > b) ? a : b;
+static INLINE int int_max(int a, int b)
+{
+    return (a > b) ? a : b;
 }
 /**
 Clamp an integer inside an interval
@@ -69,53 +71,59 @@ Clamp an integer inside an interval
 <ul>
 <li>Returns a if (min < a < max)
 <li>Returns max if (a > max)
-<li>Returns min if (a < min) 
+<li>Returns min if (a < min)
 </ul>
 */
-static INLINE int int_clamp(int a, int min, int max) {
-	if (a < min)
-		return min;
-	if (a > max)
-		return max;
-	return a;
+static INLINE int int_clamp(int a, int min, int max)
+{
+    if (a < min)
+        return min;
+    if (a > max)
+        return max;
+    return a;
 }
 /**
 @return Get absolute value of integer
 */
-static INLINE int int_abs(int a) {
-	return a < 0 ? -a : a;
+static INLINE int int_abs(int a)
+{
+    return a < 0 ? -a : a;
 }
 /**
 Divide an integer and round upwards
 @return Returns a divided by b
 */
-static INLINE int int_ceildiv(int a, int b) {
-	return (a + b - 1) / b;
+static INLINE int int_ceildiv(int a, int b)
+{
+    return (a + b - 1) / b;
 }
 /**
 Divide an integer by a power of 2 and round upwards
 @return Returns a divided by 2^b
 */
-static INLINE int int_ceildivpow2(int a, int b) {
-	return (a + (1 << b) - 1) >> b;
+static INLINE int int_ceildivpow2(int a, int b)
+{
+    return (a + (1 << b) - 1) >> b;
 }
 /**
 Divide an integer by a power of 2 and round downwards
 @return Returns a divided by 2^b
 */
-static INLINE int int_floordivpow2(int a, int b) {
-	return a >> b;
+static INLINE int int_floordivpow2(int a, int b)
+{
+    return a >> b;
 }
 /**
 Get logarithm of an integer and round downwards
 @return Returns log2(a)
 */
-static INLINE int int_floorlog2(int a) {
-	int l;
-	for (l = 0; a > 1; l++) {
-		a >>= 1;
-	}
-	return l;
+static INLINE int int_floorlog2(int a)
+{
+    int l;
+    for (l = 0; a > 1; l++) {
+        a >>= 1;
+    }
+    return l;
 }
 /* ----------------------------------------------------------------------- */
 /*@}*/
diff --git a/src/lib/openmj2/j2k.c b/src/lib/openmj2/j2k.c
index f31937a4..f8a7a04a 100644
--- a/src/lib/openmj2/j2k.c
+++ b/src/lib/openmj2/j2k.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2006-2007, Parvatha Elangovan
@@ -258,1518 +258,1552 @@ static void j2k_add_tlmarker( int tileno, opj_codestream_info_t *cstr_info, unsi
 /*@}*/
 
 /* ----------------------------------------------------------------------- */
-typedef struct j2k_prog_order{
-	OPJ_PROG_ORDER enum_prog;
-	char str_prog[5];
-}j2k_prog_order_t;
+typedef struct j2k_prog_order {
+    OPJ_PROG_ORDER enum_prog;
+    char str_prog[5];
+} j2k_prog_order_t;
 
 j2k_prog_order_t j2k_prog_order_list[] = {
-	{CPRL, "CPRL"},
-	{LRCP, "LRCP"},
-	{PCRL, "PCRL"},
-	{RLCP, "RLCP"},
-	{RPCL, "RPCL"},
-	{(OPJ_PROG_ORDER)-1, ""}
+    {CPRL, "CPRL"},
+    {LRCP, "LRCP"},
+    {PCRL, "PCRL"},
+    {RLCP, "RLCP"},
+    {RPCL, "RPCL"},
+    {(OPJ_PROG_ORDER)-1, ""}
 };
 
-char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order){
-	j2k_prog_order_t *po;
-	for(po = j2k_prog_order_list; po->enum_prog != -1; po++ ){
-		if(po->enum_prog == prg_order){
-			break;
-		}
-	}
-	return po->str_prog;
+char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order)
+{
+    j2k_prog_order_t *po;
+    for(po = j2k_prog_order_list; po->enum_prog != -1; po++ ) {
+        if(po->enum_prog == prg_order) {
+            break;
+        }
+    }
+    return po->str_prog;
 }
 
 /* ----------------------------------------------------------------------- */
-static int j2k_get_num_tp(opj_cp_t *cp,int pino,int tileno){
-	char *prog;
-	int i;
-	int tpnum=1,tpend=0;
-	opj_tcp_t *tcp = &cp->tcps[tileno];
-	prog = j2k_convert_progression_order(tcp->prg);
-	
-	if(cp->tp_on == 1){
-		for(i=0;i<4;i++){
-			if(tpend!=1){
-				if( cp->tp_flag == prog[i] ){
-					tpend=1;cp->tp_pos=i;
-				}
-				switch(prog[i]){
-				case 'C':
-					tpnum= tpnum * tcp->pocs[pino].compE;
-					break;
-				case 'R':
-					tpnum= tpnum * tcp->pocs[pino].resE;
-					break;
-				case 'P':
-					tpnum= tpnum * tcp->pocs[pino].prcE;
-					break;
-				case 'L':
-					tpnum= tpnum * tcp->pocs[pino].layE;
-					break;
-				}
-			}
-		}
-	}else{
-		tpnum=1;
-	}
-	return tpnum;
+static int j2k_get_num_tp(opj_cp_t *cp,int pino,int tileno)
+{
+    char *prog;
+    int i;
+    int tpnum=1,tpend=0;
+    opj_tcp_t *tcp = &cp->tcps[tileno];
+    prog = j2k_convert_progression_order(tcp->prg);
+
+    if(cp->tp_on == 1) {
+        for(i=0; i<4; i++) {
+            if(tpend!=1) {
+                if( cp->tp_flag == prog[i] ) {
+                    tpend=1;
+                    cp->tp_pos=i;
+                }
+                switch(prog[i]) {
+                case 'C':
+                    tpnum= tpnum * tcp->pocs[pino].compE;
+                    break;
+                case 'R':
+                    tpnum= tpnum * tcp->pocs[pino].resE;
+                    break;
+                case 'P':
+                    tpnum= tpnum * tcp->pocs[pino].prcE;
+                    break;
+                case 'L':
+                    tpnum= tpnum * tcp->pocs[pino].layE;
+                    break;
+                }
+            }
+        }
+    } else {
+        tpnum=1;
+    }
+    return tpnum;
 }
 
 /**	mem allocation for TLM marker*/
-static int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){
-	int pino,tileno,totnum_tp=0;
-
-	OPJ_ARG_NOT_USED(img_numcomp);
-
-	j2k->cur_totnum_tp = (int *) opj_malloc(cp->tw * cp->th * sizeof(int));
-	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
-		int cur_totnum_tp = 0;
-		opj_tcp_t *tcp = &cp->tcps[tileno];
-		for(pino = 0; pino <= tcp->numpocs; pino++) {
-			int tp_num=0;
-			opj_pi_iterator_t *pi = pi_initialise_encode(image, cp, tileno,FINAL_PASS);
-			if(!pi) { return -1;}
-			tp_num = j2k_get_num_tp(cp,pino,tileno);
-			totnum_tp = totnum_tp + tp_num;
-			cur_totnum_tp = cur_totnum_tp + tp_num;
-			pi_destroy(pi, cp, tileno);
-		}
-		j2k->cur_totnum_tp[tileno] = cur_totnum_tp;
-		/* INDEX >> */
-		if (j2k->cstr_info) {
-			j2k->cstr_info->tile[tileno].num_tps = cur_totnum_tp;
-			j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(cur_totnum_tp * sizeof(opj_tp_info_t));
-		}
-		/* << INDEX */
-	}
-	return totnum_tp;
+static int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k )
+{
+    int pino,tileno,totnum_tp=0;
+
+    OPJ_ARG_NOT_USED(img_numcomp);
+
+    j2k->cur_totnum_tp = (int *) opj_malloc(cp->tw * cp->th * sizeof(int));
+    for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+        int cur_totnum_tp = 0;
+        opj_tcp_t *tcp = &cp->tcps[tileno];
+        for(pino = 0; pino <= tcp->numpocs; pino++) {
+            int tp_num=0;
+            opj_pi_iterator_t *pi = pi_initialise_encode(image, cp, tileno,FINAL_PASS);
+            if(!pi) {
+                return -1;
+            }
+            tp_num = j2k_get_num_tp(cp,pino,tileno);
+            totnum_tp = totnum_tp + tp_num;
+            cur_totnum_tp = cur_totnum_tp + tp_num;
+            pi_destroy(pi, cp, tileno);
+        }
+        j2k->cur_totnum_tp[tileno] = cur_totnum_tp;
+        /* INDEX >> */
+        if (j2k->cstr_info) {
+            j2k->cstr_info->tile[tileno].num_tps = cur_totnum_tp;
+            j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(cur_totnum_tp * sizeof(opj_tp_info_t));
+        }
+        /* << INDEX */
+    }
+    return totnum_tp;
 }
 
-static void j2k_write_soc(opj_j2k_t *j2k) {
-	opj_cio_t *cio = j2k->cio;
-	cio_write(cio, J2K_MS_SOC, 2);
+static void j2k_write_soc(opj_j2k_t *j2k)
+{
+    opj_cio_t *cio = j2k->cio;
+    cio_write(cio, J2K_MS_SOC, 2);
 
-	if(j2k->cstr_info)
-	  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio), 0);
+    if(j2k->cstr_info)
+        j2k_add_mhmarker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio), 0);
 
-/* UniPG>> */
+    /* UniPG>> */
 #ifdef USE_JPWL
 
-	/* update markers struct */
-	j2k_add_marker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio) - 2, 2);
+    /* update markers struct */
+    j2k_add_marker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio) - 2, 2);
 #endif /* USE_JPWL */
-/* <<UniPG */
+    /* <<UniPG */
 }
 
-static void j2k_read_soc(opj_j2k_t *j2k) {	
-	j2k->state = J2K_STATE_MHSIZ;
-	/* Index */
-	if (j2k->cstr_info) {
-		j2k->cstr_info->main_head_start = cio_tell(j2k->cio) - 2;
-		j2k->cstr_info->codestream_size = cio_numbytesleft(j2k->cio) + 2 - j2k->cstr_info->main_head_start;
-	}
+static void j2k_read_soc(opj_j2k_t *j2k)
+{
+    j2k->state = J2K_STATE_MHSIZ;
+    /* Index */
+    if (j2k->cstr_info) {
+        j2k->cstr_info->main_head_start = cio_tell(j2k->cio) - 2;
+        j2k->cstr_info->codestream_size = cio_numbytesleft(j2k->cio) + 2 - j2k->cstr_info->main_head_start;
+    }
 }
 
-static void j2k_write_siz(opj_j2k_t *j2k) {
-	int i;
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-	opj_image_t *image = j2k->image;
-	opj_cp_t *cp = j2k->cp;
-
-	cio_write(cio, J2K_MS_SIZ, 2);	/* SIZ */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	cio_write(cio, cp->rsiz, 2);			/* Rsiz (capabilities) */
-	cio_write(cio, image->x1, 4);	/* Xsiz */
-	cio_write(cio, image->y1, 4);	/* Ysiz */
-	cio_write(cio, image->x0, 4);	/* X0siz */
-	cio_write(cio, image->y0, 4);	/* Y0siz */
-	cio_write(cio, cp->tdx, 4);		/* XTsiz */
-	cio_write(cio, cp->tdy, 4);		/* YTsiz */
-	cio_write(cio, cp->tx0, 4);		/* XT0siz */
-	cio_write(cio, cp->ty0, 4);		/* YT0siz */
-	cio_write(cio, image->numcomps, 2);	/* Csiz */
-	for (i = 0; i < image->numcomps; i++) {
-		cio_write(cio, image->comps[i].prec - 1 + (image->comps[i].sgnd << 7), 1);	/* Ssiz_i */
-		cio_write(cio, image->comps[i].dx, 1);	/* XRsiz_i */
-		cio_write(cio, image->comps[i].dy, 1);	/* YRsiz_i */
-	}
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);		/* Lsiz */
-	cio_seek(cio, lenp + len);
-	
-	if(j2k->cstr_info)
-	  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_SIZ, lenp, len);
+static void j2k_write_siz(opj_j2k_t *j2k)
+{
+    int i;
+    int lenp, len;
+
+    opj_cio_t *cio = j2k->cio;
+    opj_image_t *image = j2k->image;
+    opj_cp_t *cp = j2k->cp;
+
+    cio_write(cio, J2K_MS_SIZ, 2);	/* SIZ */
+    lenp = cio_tell(cio);
+    cio_skip(cio, 2);
+    cio_write(cio, cp->rsiz, 2);			/* Rsiz (capabilities) */
+    cio_write(cio, image->x1, 4);	/* Xsiz */
+    cio_write(cio, image->y1, 4);	/* Ysiz */
+    cio_write(cio, image->x0, 4);	/* X0siz */
+    cio_write(cio, image->y0, 4);	/* Y0siz */
+    cio_write(cio, cp->tdx, 4);		/* XTsiz */
+    cio_write(cio, cp->tdy, 4);		/* YTsiz */
+    cio_write(cio, cp->tx0, 4);		/* XT0siz */
+    cio_write(cio, cp->ty0, 4);		/* YT0siz */
+    cio_write(cio, image->numcomps, 2);	/* Csiz */
+    for (i = 0; i < image->numcomps; i++) {
+        cio_write(cio, image->comps[i].prec - 1 + (image->comps[i].sgnd << 7), 1);	/* Ssiz_i */
+        cio_write(cio, image->comps[i].dx, 1);	/* XRsiz_i */
+        cio_write(cio, image->comps[i].dy, 1);	/* YRsiz_i */
+    }
+    len = cio_tell(cio) - lenp;
+    cio_seek(cio, lenp);
+    cio_write(cio, len, 2);		/* Lsiz */
+    cio_seek(cio, lenp + len);
+
+    if(j2k->cstr_info)
+        j2k_add_mhmarker(j2k->cstr_info, J2K_MS_SIZ, lenp, len);
 }
 
-static void j2k_read_siz(opj_j2k_t *j2k) {
-	int len, i;
-	
-	opj_cio_t *cio = j2k->cio;
-	opj_image_t *image = j2k->image;
-	opj_cp_t *cp = j2k->cp;
-	
-	len = cio_read(cio, 2);			/* Lsiz */
-	cio_read(cio, 2);				/* Rsiz (capabilities) */
-	image->x1 = cio_read(cio, 4);	/* Xsiz */
-	image->y1 = cio_read(cio, 4);	/* Ysiz */
-	image->x0 = cio_read(cio, 4);	/* X0siz */
-	image->y0 = cio_read(cio, 4);	/* Y0siz */
-	cp->tdx = cio_read(cio, 4);		/* XTsiz */
-	cp->tdy = cio_read(cio, 4);		/* YTsiz */
-	cp->tx0 = cio_read(cio, 4);		/* XT0siz */
-	cp->ty0 = cio_read(cio, 4);		/* YT0siz */
-	
-	if ((image->x0<0)||(image->x1<0)||(image->y0<0)||(image->y1<0)) {
-		opj_event_msg(j2k->cinfo, EVT_ERROR,
-									"%s: invalid image size (x0:%d, x1:%d, y0:%d, y1:%d)\n",
-									image->x0,image->x1,image->y0,image->y1);
-		return;
-	}
-	
-	image->numcomps = cio_read(cio, 2);	/* Csiz */
+static void j2k_read_siz(opj_j2k_t *j2k)
+{
+    int len, i;
+
+    opj_cio_t *cio = j2k->cio;
+    opj_image_t *image = j2k->image;
+    opj_cp_t *cp = j2k->cp;
+
+    len = cio_read(cio, 2);			/* Lsiz */
+    cio_read(cio, 2);				/* Rsiz (capabilities) */
+    image->x1 = cio_read(cio, 4);	/* Xsiz */
+    image->y1 = cio_read(cio, 4);	/* Ysiz */
+    image->x0 = cio_read(cio, 4);	/* X0siz */
+    image->y0 = cio_read(cio, 4);	/* Y0siz */
+    cp->tdx = cio_read(cio, 4);		/* XTsiz */
+    cp->tdy = cio_read(cio, 4);		/* YTsiz */
+    cp->tx0 = cio_read(cio, 4);		/* XT0siz */
+    cp->ty0 = cio_read(cio, 4);		/* YT0siz */
+
+    if ((image->x0<0)||(image->x1<0)||(image->y0<0)||(image->y1<0)) {
+        opj_event_msg(j2k->cinfo, EVT_ERROR,
+                      "%s: invalid image size (x0:%d, x1:%d, y0:%d, y1:%d)\n",
+                      image->x0,image->x1,image->y0,image->y1);
+        return;
+    }
 
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-		  too much the SIZ parameters */
-		if (!(image->x1 * image->y1)) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad image size (%d x %d)\n",
-				image->x1, image->y1);
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-		}
-		if (image->numcomps != ((len - 38) / 3)) {
-			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: Csiz is %d => space in SIZ only for %d comps.!!!\n",
-				image->numcomps, ((len - 38) / 3));
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n");
-			if (image->numcomps < ((len - 38) / 3)) {
-				len = 38 + 3 * image->numcomps;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting Lsiz to %d => HYPOTHESIS!!!\n",
-					len);				
-			} else {
-				image->numcomps = ((len - 38) / 3);
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting Csiz to %d => HYPOTHESIS!!!\n",
-					image->numcomps);				
-			}
-		}
-
-		/* update components number in the jpwl_exp_comps filed */
-		cp->exp_comps = image->numcomps;
-	}
-#endif /* USE_JPWL */
+    image->numcomps = cio_read(cio, 2);	/* Csiz */
 
-  /* prevent division by zero */
-  if (!(cp->tdx * cp->tdy)) {
-    opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: invalid tile size (tdx: %d, tdy: %d)\n", cp->tdx, cp->tdy);
-    return;
-  }
-
-	image->comps = (opj_image_comp_t*) opj_calloc(image->numcomps, sizeof(opj_image_comp_t));
-	for (i = 0; i < image->numcomps; i++) {
-		int tmp, w, h;
-		tmp = cio_read(cio, 1);		/* Ssiz_i */
-		image->comps[i].prec = (tmp & 0x7f) + 1;
-		image->comps[i].sgnd = tmp >> 7;
-		image->comps[i].dx = cio_read(cio, 1);	/* XRsiz_i */
-		image->comps[i].dy = cio_read(cio, 1);	/* YRsiz_i */
-		
 #ifdef USE_JPWL
-		if (j2k->cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-			too much the SIZ parameters, again */
-			if (!(image->comps[i].dx * image->comps[i].dy)) {
-				opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-					"JPWL: bad XRsiz_%d/YRsiz_%d (%d x %d)\n",
-					i, i, image->comps[i].dx, image->comps[i].dy);
-				if (!JPWL_ASSUME) {
-					opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-					return;
-				}
-				/* we try to correct */
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
-				if (!image->comps[i].dx) {
-					image->comps[i].dx = 1;
-					opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting XRsiz_%d to %d => HYPOTHESIS!!!\n",
-						i, image->comps[i].dx);
-				}
-				if (!image->comps[i].dy) {
-					image->comps[i].dy = 1;
-					opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting YRsiz_%d to %d => HYPOTHESIS!!!\n",
-						i, image->comps[i].dy);
-				}
-			}
-			
-		}
+    if (j2k->cp->correct) {
+        /* if JPWL is on, we check whether TX errors have damaged
+          too much the SIZ parameters */
+        if (!(image->x1 * image->y1)) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "JPWL: bad image size (%d x %d)\n",
+                          image->x1, image->y1);
+            if (!JPWL_ASSUME || JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+        }
+        if (image->numcomps != ((len - 38) / 3)) {
+            opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+                          "JPWL: Csiz is %d => space in SIZ only for %d comps.!!!\n",
+                          image->numcomps, ((len - 38) / 3));
+            if (!JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+            /* we try to correct */
+            opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n");
+            if (image->numcomps < ((len - 38) / 3)) {
+                len = 38 + 3 * image->numcomps;
+                opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting Lsiz to %d => HYPOTHESIS!!!\n",
+                              len);
+            } else {
+                image->numcomps = ((len - 38) / 3);
+                opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting Csiz to %d => HYPOTHESIS!!!\n",
+                              image->numcomps);
+            }
+        }
+
+        /* update components number in the jpwl_exp_comps filed */
+        cp->exp_comps = image->numcomps;
+    }
 #endif /* USE_JPWL */
 
     /* prevent division by zero */
-    if (!(image->comps[i].dx * image->comps[i].dy)) {
-      opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: invalid component size (dx: %d, dy: %d)\n", image->comps[i].dx, image->comps[i].dy);
-      return;
+    if (!(cp->tdx * cp->tdy)) {
+        opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: invalid tile size (tdx: %d, tdy: %d)\n", cp->tdx, cp->tdy);
+        return;
     }
 
-		/* TODO: unused ? */
-		w = int_ceildiv(image->x1 - image->x0, image->comps[i].dx);
-		h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);
+    image->comps = (opj_image_comp_t*) opj_calloc(image->numcomps, sizeof(opj_image_comp_t));
+    for (i = 0; i < image->numcomps; i++) {
+        int tmp, w, h;
+        tmp = cio_read(cio, 1);		/* Ssiz_i */
+        image->comps[i].prec = (tmp & 0x7f) + 1;
+        image->comps[i].sgnd = tmp >> 7;
+        image->comps[i].dx = cio_read(cio, 1);	/* XRsiz_i */
+        image->comps[i].dy = cio_read(cio, 1);	/* YRsiz_i */
+
+#ifdef USE_JPWL
+        if (j2k->cp->correct) {
+            /* if JPWL is on, we check whether TX errors have damaged
+            	too much the SIZ parameters, again */
+            if (!(image->comps[i].dx * image->comps[i].dy)) {
+                opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+                              "JPWL: bad XRsiz_%d/YRsiz_%d (%d x %d)\n",
+                              i, i, image->comps[i].dx, image->comps[i].dy);
+                if (!JPWL_ASSUME) {
+                    opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                    return;
+                }
+                /* we try to correct */
+                opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
+                if (!image->comps[i].dx) {
+                    image->comps[i].dx = 1;
+                    opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting XRsiz_%d to %d => HYPOTHESIS!!!\n",
+                                  i, image->comps[i].dx);
+                }
+                if (!image->comps[i].dy) {
+                    image->comps[i].dy = 1;
+                    opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting YRsiz_%d to %d => HYPOTHESIS!!!\n",
+                                  i, image->comps[i].dy);
+                }
+            }
+
+        }
+#endif /* USE_JPWL */
+
+        /* prevent division by zero */
+        if (!(image->comps[i].dx * image->comps[i].dy)) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: invalid component size (dx: %d, dy: %d)\n", image->comps[i].dx, image->comps[i].dy);
+            return;
+        }
+
+        /* TODO: unused ? */
+        w = int_ceildiv(image->x1 - image->x0, image->comps[i].dx);
+        h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);
 
-		image->comps[i].resno_decoded = 0;	/* number of resolution decoded */
-		image->comps[i].factor = cp->reduce; /* reducing factor per component */
-	}
-	
-	cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
-	cp->th = int_ceildiv(image->y1 - cp->ty0, cp->tdy);
+        image->comps[i].resno_decoded = 0;	/* number of resolution decoded */
+        image->comps[i].factor = cp->reduce; /* reducing factor per component */
+    }
+
+    cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
+    cp->th = int_ceildiv(image->y1 - cp->ty0, cp->tdy);
 
 #ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-		  too much the SIZ parameters */
-		if ((cp->tw < 1) || (cp->th < 1) || (cp->tw > cp->max_tiles) || (cp->th > cp->max_tiles)) {
-			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: bad number of tiles (%d x %d)\n",
-				cp->tw, cp->th);
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
-			if (cp->tw < 1) {
-				cp->tw= 1;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting %d tiles in x => HYPOTHESIS!!!\n",
-					cp->tw);
-			}
-			if (cp->tw > cp->max_tiles) {
-				cp->tw= 1;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- too large x, increase expectance of %d\n"
-					"- setting %d tiles in x => HYPOTHESIS!!!\n",
-					cp->max_tiles, cp->tw);
-			}
-			if (cp->th < 1) {
-				cp->th= 1;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting %d tiles in y => HYPOTHESIS!!!\n",
-					cp->th);
-			}
-			if (cp->th > cp->max_tiles) {
-				cp->th= 1;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- too large y, increase expectance of %d to continue\n",
-					"- setting %d tiles in y => HYPOTHESIS!!!\n",
-					cp->max_tiles, cp->th);
-			}
-		}
-	}
+    if (j2k->cp->correct) {
+        /* if JPWL is on, we check whether TX errors have damaged
+          too much the SIZ parameters */
+        if ((cp->tw < 1) || (cp->th < 1) || (cp->tw > cp->max_tiles) || (cp->th > cp->max_tiles)) {
+            opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+                          "JPWL: bad number of tiles (%d x %d)\n",
+                          cp->tw, cp->th);
+            if (!JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+            /* we try to correct */
+            opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
+            if (cp->tw < 1) {
+                cp->tw= 1;
+                opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting %d tiles in x => HYPOTHESIS!!!\n",
+                              cp->tw);
+            }
+            if (cp->tw > cp->max_tiles) {
+                cp->tw= 1;
+                opj_event_msg(j2k->cinfo, EVT_WARNING, "- too large x, increase expectance of %d\n"
+                              "- setting %d tiles in x => HYPOTHESIS!!!\n",
+                              cp->max_tiles, cp->tw);
+            }
+            if (cp->th < 1) {
+                cp->th= 1;
+                opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting %d tiles in y => HYPOTHESIS!!!\n",
+                              cp->th);
+            }
+            if (cp->th > cp->max_tiles) {
+                cp->th= 1;
+                opj_event_msg(j2k->cinfo, EVT_WARNING, "- too large y, increase expectance of %d to continue\n",
+                              "- setting %d tiles in y => HYPOTHESIS!!!\n",
+                              cp->max_tiles, cp->th);
+            }
+        }
+    }
 #endif /* USE_JPWL */
 
-	cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
-    if (cp->tcps == NULL)
-    {
+    cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
+    if (cp->tcps == NULL) {
         opj_event_msg(j2k->cinfo, EVT_ERROR, "Out of memory\n");
         return;
     }
-	cp->tileno = (int*) opj_malloc(cp->tw * cp->th * sizeof(int));
-    if (cp->tileno == NULL)
-    {
+    cp->tileno = (int*) opj_malloc(cp->tw * cp->th * sizeof(int));
+    if (cp->tileno == NULL) {
         opj_event_msg(j2k->cinfo, EVT_ERROR, "Out of memory\n");
         return;
     }
-	cp->tileno_size = 0;
-	
+    cp->tileno_size = 0;
+
 #ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		if (!cp->tcps) {
-			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: could not alloc tcps field of cp\n");
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-		}
-	}
+    if (j2k->cp->correct) {
+        if (!cp->tcps) {
+            opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+                          "JPWL: could not alloc tcps field of cp\n");
+            if (!JPWL_ASSUME || JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+        }
+    }
 #endif /* USE_JPWL */
 
-	for (i = 0; i < cp->tw * cp->th; i++) {
-		cp->tcps[i].POC = 0;
-		cp->tcps[i].numpocs = 0;
-		cp->tcps[i].first = 1;
-	}
-	
-	/* Initialization for PPM marker */
-	cp->ppm = 0;
-	cp->ppm_data = NULL;
-	cp->ppm_data_first = NULL;
-	cp->ppm_previous = 0;
-	cp->ppm_store = 0;
-
-	j2k->default_tcp->tccps = (opj_tccp_t*) opj_calloc(image->numcomps, sizeof(opj_tccp_t));
-	for (i = 0; i < cp->tw * cp->th; i++) {
-		cp->tcps[i].tccps = (opj_tccp_t*) opj_malloc(image->numcomps * sizeof(opj_tccp_t));
-	}	
-	j2k->tile_data = (unsigned char**) opj_calloc(cp->tw * cp->th, sizeof(unsigned char*));
-	j2k->tile_len = (int*) opj_calloc(cp->tw * cp->th, sizeof(int));
-	j2k->state = J2K_STATE_MH;
-
-	/* Index */
-	if (j2k->cstr_info) {
-		opj_codestream_info_t *cstr_info = j2k->cstr_info;
-		cstr_info->image_w = image->x1 - image->x0;
-		cstr_info->image_h = image->y1 - image->y0;
-		cstr_info->numcomps = image->numcomps;
-		cstr_info->tw = cp->tw;
-		cstr_info->th = cp->th;
-		cstr_info->tile_x = cp->tdx;	
-		cstr_info->tile_y = cp->tdy;	
-		cstr_info->tile_Ox = cp->tx0;	
-		cstr_info->tile_Oy = cp->ty0;			
-		cstr_info->tile = (opj_tile_info_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tile_info_t));		
-	}
+    for (i = 0; i < cp->tw * cp->th; i++) {
+        cp->tcps[i].POC = 0;
+        cp->tcps[i].numpocs = 0;
+        cp->tcps[i].first = 1;
+    }
+
+    /* Initialization for PPM marker */
+    cp->ppm = 0;
+    cp->ppm_data = NULL;
+    cp->ppm_data_first = NULL;
+    cp->ppm_previous = 0;
+    cp->ppm_store = 0;
+
+    j2k->default_tcp->tccps = (opj_tccp_t*) opj_calloc(image->numcomps, sizeof(opj_tccp_t));
+    for (i = 0; i < cp->tw * cp->th; i++) {
+        cp->tcps[i].tccps = (opj_tccp_t*) opj_malloc(image->numcomps * sizeof(opj_tccp_t));
+    }
+    j2k->tile_data = (unsigned char**) opj_calloc(cp->tw * cp->th, sizeof(unsigned char*));
+    j2k->tile_len = (int*) opj_calloc(cp->tw * cp->th, sizeof(int));
+    j2k->state = J2K_STATE_MH;
+
+    /* Index */
+    if (j2k->cstr_info) {
+        opj_codestream_info_t *cstr_info = j2k->cstr_info;
+        cstr_info->image_w = image->x1 - image->x0;
+        cstr_info->image_h = image->y1 - image->y0;
+        cstr_info->numcomps = image->numcomps;
+        cstr_info->tw = cp->tw;
+        cstr_info->th = cp->th;
+        cstr_info->tile_x = cp->tdx;
+        cstr_info->tile_y = cp->tdy;
+        cstr_info->tile_Ox = cp->tx0;
+        cstr_info->tile_Oy = cp->ty0;
+        cstr_info->tile = (opj_tile_info_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tile_info_t));
+    }
 }
 
-static void j2k_write_com(opj_j2k_t *j2k) {
-	unsigned int i;
-	int lenp, len;
-
-	if(j2k->cp->comment) {
-		opj_cio_t *cio = j2k->cio;
-		char *comment = j2k->cp->comment;
-
-		cio_write(cio, J2K_MS_COM, 2);
-		lenp = cio_tell(cio);
-		cio_skip(cio, 2);
-		cio_write(cio, 1, 2);		/* General use (IS 8859-15:1999 (Latin) values) */
-		for (i = 0; i < strlen(comment); i++) {
-			cio_write(cio, comment[i], 1);
-		}
-		len = cio_tell(cio) - lenp;
-		cio_seek(cio, lenp);
-		cio_write(cio, len, 2);
-		cio_seek(cio, lenp + len);
-
-		
-		if(j2k->cstr_info)
-		  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_COM, lenp, len);
-
-	}
+static void j2k_write_com(opj_j2k_t *j2k)
+{
+    unsigned int i;
+    int lenp, len;
+
+    if(j2k->cp->comment) {
+        opj_cio_t *cio = j2k->cio;
+        char *comment = j2k->cp->comment;
+
+        cio_write(cio, J2K_MS_COM, 2);
+        lenp = cio_tell(cio);
+        cio_skip(cio, 2);
+        cio_write(cio, 1, 2);		/* General use (IS 8859-15:1999 (Latin) values) */
+        for (i = 0; i < strlen(comment); i++) {
+            cio_write(cio, comment[i], 1);
+        }
+        len = cio_tell(cio) - lenp;
+        cio_seek(cio, lenp);
+        cio_write(cio, len, 2);
+        cio_seek(cio, lenp + len);
+
+
+        if(j2k->cstr_info)
+            j2k_add_mhmarker(j2k->cstr_info, J2K_MS_COM, lenp, len);
+
+    }
 }
 
-static void j2k_read_com(opj_j2k_t *j2k) {
-	int len;
-	
-	opj_cio_t *cio = j2k->cio;
+static void j2k_read_com(opj_j2k_t *j2k)
+{
+    int len;
+
+    opj_cio_t *cio = j2k->cio;
 
-	len = cio_read(cio, 2);
-	cio_skip(cio, len - 2);  
+    len = cio_read(cio, 2);
+    cio_skip(cio, len - 2);
 }
 
-static void j2k_write_cox(opj_j2k_t *j2k, int compno) {
-	int i;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
-	opj_tccp_t *tccp = &tcp->tccps[compno];
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, tccp->numresolutions - 1, 1);	/* SPcox (D) */
-	cio_write(cio, tccp->cblkw - 2, 1);				/* SPcox (E) */
-	cio_write(cio, tccp->cblkh - 2, 1);				/* SPcox (F) */
-	cio_write(cio, tccp->cblksty, 1);				/* SPcox (G) */
-	cio_write(cio, tccp->qmfbid, 1);				/* SPcox (H) */
-	
-	if (tccp->csty & J2K_CCP_CSTY_PRT) {
-		for (i = 0; i < tccp->numresolutions; i++) {
-			cio_write(cio, tccp->prcw[i] + (tccp->prch[i] << 4), 1);	/* SPcox (I_i) */
-		}
-	}
+static void j2k_write_cox(opj_j2k_t *j2k, int compno)
+{
+    int i;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
+    opj_tccp_t *tccp = &tcp->tccps[compno];
+    opj_cio_t *cio = j2k->cio;
+
+    cio_write(cio, tccp->numresolutions - 1, 1);	/* SPcox (D) */
+    cio_write(cio, tccp->cblkw - 2, 1);				/* SPcox (E) */
+    cio_write(cio, tccp->cblkh - 2, 1);				/* SPcox (F) */
+    cio_write(cio, tccp->cblksty, 1);				/* SPcox (G) */
+    cio_write(cio, tccp->qmfbid, 1);				/* SPcox (H) */
+
+    if (tccp->csty & J2K_CCP_CSTY_PRT) {
+        for (i = 0; i < tccp->numresolutions; i++) {
+            cio_write(cio, tccp->prcw[i] + (tccp->prch[i] << 4), 1);	/* SPcox (I_i) */
+        }
+    }
 }
 
-static void j2k_read_cox(opj_j2k_t *j2k, int compno) {
-	int i;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_tccp_t *tccp = &tcp->tccps[compno];
-	opj_cio_t *cio = j2k->cio;
-
-	tccp->numresolutions = cio_read(cio, 1) + 1;	/* SPcox (D) */
-
-	/* If user wants to remove more resolutions than the codestream contains, return error*/
-	if (cp->reduce >= tccp->numresolutions) {
-		opj_event_msg(j2k->cinfo, EVT_ERROR, "Error decoding component %d.\nThe number of resolutions to remove is higher than the number "
-					"of resolutions of this component\nModify the cp_reduce parameter.\n\n", compno);
-		j2k->state |= J2K_STATE_ERR;
-	}
-  if( tccp->numresolutions > J2K_MAXRLVLS ) {
-    opj_event_msg(j2k->cinfo, EVT_ERROR, "Error decoding component %d.\nThe number of resolutions is too big: %d vs max= %d. Truncating.\n\n",
-      compno, tccp->numresolutions, J2K_MAXRLVLS);
-		j2k->state |= J2K_STATE_ERR;
-    tccp->numresolutions = J2K_MAXRLVLS;
- }
-
-	tccp->cblkw = cio_read(cio, 1) + 2;	/* SPcox (E) */
-	tccp->cblkh = cio_read(cio, 1) + 2;	/* SPcox (F) */
-	tccp->cblksty = cio_read(cio, 1);	/* SPcox (G) */
-	tccp->qmfbid = cio_read(cio, 1);	/* SPcox (H) */
-	if (tccp->csty & J2K_CP_CSTY_PRT) {
-		for (i = 0; i < tccp->numresolutions; i++) {
-			int tmp = cio_read(cio, 1);	/* SPcox (I_i) */
-			tccp->prcw[i] = tmp & 0xf;
-			tccp->prch[i] = tmp >> 4;
-		}
-	}
-
-	/* INDEX >> */
-	if(j2k->cstr_info && compno == 0) {
-		for (i = 0; i < tccp->numresolutions; i++) {
-			if (tccp->csty & J2K_CP_CSTY_PRT) {
-				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = tccp->prcw[i];
-				j2k->cstr_info->tile[j2k->curtileno].pdy[i] = tccp->prch[i];
-			}
-			else {
-				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = 15;
-				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = 15;
-			}
-		}
-	}
-	/* << INDEX */
+static void j2k_read_cox(opj_j2k_t *j2k, int compno)
+{
+    int i;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+    opj_tccp_t *tccp = &tcp->tccps[compno];
+    opj_cio_t *cio = j2k->cio;
+
+    tccp->numresolutions = cio_read(cio, 1) + 1;	/* SPcox (D) */
+
+    /* If user wants to remove more resolutions than the codestream contains, return error*/
+    if (cp->reduce >= tccp->numresolutions) {
+        opj_event_msg(j2k->cinfo, EVT_ERROR, "Error decoding component %d.\nThe number of resolutions to remove is higher than the number "
+                      "of resolutions of this component\nModify the cp_reduce parameter.\n\n", compno);
+        j2k->state |= J2K_STATE_ERR;
+    }
+    if( tccp->numresolutions > J2K_MAXRLVLS ) {
+        opj_event_msg(j2k->cinfo, EVT_ERROR, "Error decoding component %d.\nThe number of resolutions is too big: %d vs max= %d. Truncating.\n\n",
+                      compno, tccp->numresolutions, J2K_MAXRLVLS);
+        j2k->state |= J2K_STATE_ERR;
+        tccp->numresolutions = J2K_MAXRLVLS;
+    }
+
+    tccp->cblkw = cio_read(cio, 1) + 2;	/* SPcox (E) */
+    tccp->cblkh = cio_read(cio, 1) + 2;	/* SPcox (F) */
+    tccp->cblksty = cio_read(cio, 1);	/* SPcox (G) */
+    tccp->qmfbid = cio_read(cio, 1);	/* SPcox (H) */
+    if (tccp->csty & J2K_CP_CSTY_PRT) {
+        for (i = 0; i < tccp->numresolutions; i++) {
+            int tmp = cio_read(cio, 1);	/* SPcox (I_i) */
+            tccp->prcw[i] = tmp & 0xf;
+            tccp->prch[i] = tmp >> 4;
+        }
+    }
+
+    /* INDEX >> */
+    if(j2k->cstr_info && compno == 0) {
+        for (i = 0; i < tccp->numresolutions; i++) {
+            if (tccp->csty & J2K_CP_CSTY_PRT) {
+                j2k->cstr_info->tile[j2k->curtileno].pdx[i] = tccp->prcw[i];
+                j2k->cstr_info->tile[j2k->curtileno].pdy[i] = tccp->prch[i];
+            } else {
+                j2k->cstr_info->tile[j2k->curtileno].pdx[i] = 15;
+                j2k->cstr_info->tile[j2k->curtileno].pdx[i] = 15;
+            }
+        }
+    }
+    /* << INDEX */
 }
 
-static void j2k_write_cod(opj_j2k_t *j2k) {
-	opj_cp_t *cp = NULL;
-	opj_tcp_t *tcp = NULL;
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, J2K_MS_COD, 2);	/* COD */
-	
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	
-	cp = j2k->cp;
-	tcp = &cp->tcps[j2k->curtileno];
-
-	cio_write(cio, tcp->csty, 1);		/* Scod */
-	cio_write(cio, tcp->prg, 1);		/* SGcod (A) */
-	cio_write(cio, tcp->numlayers, 2);	/* SGcod (B) */
-	cio_write(cio, tcp->mct, 1);		/* SGcod (C) */
-	
-	j2k_write_cox(j2k, 0);
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);		/* Lcod */
-	cio_seek(cio, lenp + len);
-
-	if(j2k->cstr_info)
-	  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_COD, lenp, len);
+static void j2k_write_cod(opj_j2k_t *j2k)
+{
+    opj_cp_t *cp = NULL;
+    opj_tcp_t *tcp = NULL;
+    int lenp, len;
+
+    opj_cio_t *cio = j2k->cio;
+
+    cio_write(cio, J2K_MS_COD, 2);	/* COD */
+
+    lenp = cio_tell(cio);
+    cio_skip(cio, 2);
+
+    cp = j2k->cp;
+    tcp = &cp->tcps[j2k->curtileno];
+
+    cio_write(cio, tcp->csty, 1);		/* Scod */
+    cio_write(cio, tcp->prg, 1);		/* SGcod (A) */
+    cio_write(cio, tcp->numlayers, 2);	/* SGcod (B) */
+    cio_write(cio, tcp->mct, 1);		/* SGcod (C) */
+
+    j2k_write_cox(j2k, 0);
+    len = cio_tell(cio) - lenp;
+    cio_seek(cio, lenp);
+    cio_write(cio, len, 2);		/* Lcod */
+    cio_seek(cio, lenp + len);
+
+    if(j2k->cstr_info)
+        j2k_add_mhmarker(j2k->cstr_info, J2K_MS_COD, lenp, len);
 
 }
 
-static void j2k_read_cod(opj_j2k_t *j2k) {
-	int len, i, pos;
-	
-	opj_cio_t *cio = j2k->cio;
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_image_t *image = j2k->image;
-	
-	len = cio_read(cio, 2);				/* Lcod */
-	tcp->csty = cio_read(cio, 1);		/* Scod */
-	tcp->prg = (OPJ_PROG_ORDER)cio_read(cio, 1);		/* SGcod (A) */
-	tcp->numlayers = cio_read(cio, 2);	/* SGcod (B) */
-	tcp->mct = cio_read(cio, 1);		/* SGcod (C) */
-	
-	pos = cio_tell(cio);
-	for (i = 0; i < image->numcomps; i++) {
-		tcp->tccps[i].csty = tcp->csty & J2K_CP_CSTY_PRT;
-		cio_seek(cio, pos);
-		j2k_read_cox(j2k, i);
-	}
-
-	/* Index */
-	if (j2k->cstr_info) {
-		opj_codestream_info_t *cstr_info = j2k->cstr_info;
-		cstr_info->prog = tcp->prg;
-		cstr_info->numlayers = tcp->numlayers;
-		cstr_info->numdecompos = (int*) opj_malloc(image->numcomps * sizeof(int));
-		for (i = 0; i < image->numcomps; i++) {
-			cstr_info->numdecompos[i] = tcp->tccps[i].numresolutions - 1;
-		}
-	}
+static void j2k_read_cod(opj_j2k_t *j2k)
+{
+    int len, i, pos;
+
+    opj_cio_t *cio = j2k->cio;
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+    opj_image_t *image = j2k->image;
+
+    len = cio_read(cio, 2);				/* Lcod */
+    tcp->csty = cio_read(cio, 1);		/* Scod */
+    tcp->prg = (OPJ_PROG_ORDER)cio_read(cio, 1);		/* SGcod (A) */
+    tcp->numlayers = cio_read(cio, 2);	/* SGcod (B) */
+    tcp->mct = cio_read(cio, 1);		/* SGcod (C) */
+
+    pos = cio_tell(cio);
+    for (i = 0; i < image->numcomps; i++) {
+        tcp->tccps[i].csty = tcp->csty & J2K_CP_CSTY_PRT;
+        cio_seek(cio, pos);
+        j2k_read_cox(j2k, i);
+    }
+
+    /* Index */
+    if (j2k->cstr_info) {
+        opj_codestream_info_t *cstr_info = j2k->cstr_info;
+        cstr_info->prog = tcp->prg;
+        cstr_info->numlayers = tcp->numlayers;
+        cstr_info->numdecompos = (int*) opj_malloc(image->numcomps * sizeof(int));
+        for (i = 0; i < image->numcomps; i++) {
+            cstr_info->numdecompos[i] = tcp->tccps[i].numresolutions - 1;
+        }
+    }
 }
 
-static void j2k_write_coc(opj_j2k_t *j2k, int compno) {
-	int lenp, len;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
-	opj_image_t *image = j2k->image;
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, J2K_MS_COC, 2);	/* COC */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	cio_write(cio, compno, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
-	cio_write(cio, tcp->tccps[compno].csty, 1);	/* Scoc */
-	j2k_write_cox(j2k, compno);
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);			/* Lcoc */
-	cio_seek(cio, lenp + len);
+static void j2k_write_coc(opj_j2k_t *j2k, int compno)
+{
+    int lenp, len;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
+    opj_image_t *image = j2k->image;
+    opj_cio_t *cio = j2k->cio;
+
+    cio_write(cio, J2K_MS_COC, 2);	/* COC */
+    lenp = cio_tell(cio);
+    cio_skip(cio, 2);
+    cio_write(cio, compno, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
+    cio_write(cio, tcp->tccps[compno].csty, 1);	/* Scoc */
+    j2k_write_cox(j2k, compno);
+    len = cio_tell(cio) - lenp;
+    cio_seek(cio, lenp);
+    cio_write(cio, len, 2);			/* Lcoc */
+    cio_seek(cio, lenp + len);
 }
 
-static void j2k_read_coc(opj_j2k_t *j2k) {
-	int len, compno;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_image_t *image = j2k->image;
-	opj_cio_t *cio = j2k->cio;
-	
-	len = cio_read(cio, 2);		/* Lcoc */
-	compno = cio_read(cio, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
-  if (compno >= image->numcomps) {
-    opj_event_msg(j2k->cinfo, EVT_ERROR,
-      "bad component number in COC (%d out of a maximum of %d)\n",
-      compno, image->numcomps);
-    return;
-  }
-	tcp->tccps[compno].csty = cio_read(cio, 1);	/* Scoc */
-	j2k_read_cox(j2k, compno);
+static void j2k_read_coc(opj_j2k_t *j2k)
+{
+    int len, compno;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+    opj_image_t *image = j2k->image;
+    opj_cio_t *cio = j2k->cio;
+
+    len = cio_read(cio, 2);		/* Lcoc */
+    compno = cio_read(cio, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
+    if (compno >= image->numcomps) {
+        opj_event_msg(j2k->cinfo, EVT_ERROR,
+                      "bad component number in COC (%d out of a maximum of %d)\n",
+                      compno, image->numcomps);
+        return;
+    }
+    tcp->tccps[compno].csty = cio_read(cio, 1);	/* Scoc */
+    j2k_read_cox(j2k, compno);
 }
 
-static void j2k_write_qcx(opj_j2k_t *j2k, int compno) {
-	int bandno, numbands;
-	int expn, mant;
-	
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
-	opj_tccp_t *tccp = &tcp->tccps[compno];
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, tccp->qntsty + (tccp->numgbits << 5), 1);	/* Sqcx */
-	numbands = tccp->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolutions * 3 - 2;
-	
-	for (bandno = 0; bandno < numbands; bandno++) {
-		expn = tccp->stepsizes[bandno].expn;
-		mant = tccp->stepsizes[bandno].mant;
-		
-		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-			cio_write(cio, expn << 3, 1);	/* SPqcx_i */
-		} else {
-			cio_write(cio, (expn << 11) + mant, 2);	/* SPqcx_i */
-		}
-	}
+static void j2k_write_qcx(opj_j2k_t *j2k, int compno)
+{
+    int bandno, numbands;
+    int expn, mant;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
+    opj_tccp_t *tccp = &tcp->tccps[compno];
+    opj_cio_t *cio = j2k->cio;
+
+    cio_write(cio, tccp->qntsty + (tccp->numgbits << 5), 1);	/* Sqcx */
+    numbands = tccp->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolutions * 3 - 2;
+
+    for (bandno = 0; bandno < numbands; bandno++) {
+        expn = tccp->stepsizes[bandno].expn;
+        mant = tccp->stepsizes[bandno].mant;
+
+        if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
+            cio_write(cio, expn << 3, 1);	/* SPqcx_i */
+        } else {
+            cio_write(cio, (expn << 11) + mant, 2);	/* SPqcx_i */
+        }
+    }
 }
 
-static void j2k_read_qcx(opj_j2k_t *j2k, int compno, int len) {
-	int tmp;
-	int bandno, numbands;
+static void j2k_read_qcx(opj_j2k_t *j2k, int compno, int len)
+{
+    int tmp;
+    int bandno, numbands;
 
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_tccp_t *tccp = &tcp->tccps[compno];
-	opj_cio_t *cio = j2k->cio;
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+    opj_tccp_t *tccp = &tcp->tccps[compno];
+    opj_cio_t *cio = j2k->cio;
 
-	tmp = cio_read(cio, 1);		/* Sqcx */
-	tccp->qntsty = tmp & 0x1f;
-	tccp->numgbits = tmp >> 5;
-	numbands = (tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ? 
-		1 : ((tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) ? len - 1 : (len - 1) / 2);
+    tmp = cio_read(cio, 1);		/* Sqcx */
+    tccp->qntsty = tmp & 0x1f;
+    tccp->numgbits = tmp >> 5;
+    numbands = (tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ?
+               1 : ((tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) ? len - 1 : (len - 1) / 2);
 
 #ifdef USE_JPWL
-	if (j2k->cp->correct) {
-
-		/* if JPWL is on, we check whether there are too many subbands */
-		if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) {
-			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: bad number of subbands in Sqcx (%d)\n",
-				numbands);
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			numbands = 1;
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n"
-				"- setting number of bands to %d => HYPOTHESIS!!!\n",
-				numbands);
-		};
-
-	};
+    if (j2k->cp->correct) {
+
+        /* if JPWL is on, we check whether there are too many subbands */
+        if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) {
+            opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+                          "JPWL: bad number of subbands in Sqcx (%d)\n",
+                          numbands);
+            if (!JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+            /* we try to correct */
+            numbands = 1;
+            opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n"
+                          "- setting number of bands to %d => HYPOTHESIS!!!\n",
+                          numbands);
+        };
+
+    };
 
 #else
-	/* We check whether there are too many subbands */
-	if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) {
-		opj_event_msg(j2k->cinfo, EVT_WARNING ,
-					"bad number of subbands in Sqcx (%d) regarding to J2K_MAXBANDS (%d) \n"
-				    "- limiting number of bands to J2K_MAXBANDS and try to move to the next markers\n", numbands, J2K_MAXBANDS);
-	}
+    /* We check whether there are too many subbands */
+    if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) {
+        opj_event_msg(j2k->cinfo, EVT_WARNING ,
+                      "bad number of subbands in Sqcx (%d) regarding to J2K_MAXBANDS (%d) \n"
+                      "- limiting number of bands to J2K_MAXBANDS and try to move to the next markers\n", numbands, J2K_MAXBANDS);
+    }
 
 #endif /* USE_JPWL */
 
-	for (bandno = 0; bandno < numbands; bandno++) {
-		int expn, mant;
-		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-			expn = cio_read(cio, 1) >> 3;	/* SPqcx_i */
-			mant = 0;
-		} else {
-			tmp = cio_read(cio, 2);	/* SPqcx_i */
-			expn = tmp >> 11;
-			mant = tmp & 0x7ff;
-		}
-		if (bandno < J2K_MAXBANDS){
-			tccp->stepsizes[bandno].expn = expn;
-			tccp->stepsizes[bandno].mant = mant;
-		}
-	}
-	
-	/* Add Antonin : if scalar_derived -> compute other stepsizes */
-	if (tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) {
-		for (bandno = 1; bandno < J2K_MAXBANDS; bandno++) {
-			tccp->stepsizes[bandno].expn = 
-				((tccp->stepsizes[0].expn) - ((bandno - 1) / 3) > 0) ? 
-					(tccp->stepsizes[0].expn) - ((bandno - 1) / 3) : 0;
-			tccp->stepsizes[bandno].mant = tccp->stepsizes[0].mant;
-		}
-	}
-	/* ddA */
+    for (bandno = 0; bandno < numbands; bandno++) {
+        int expn, mant;
+        if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
+            expn = cio_read(cio, 1) >> 3;	/* SPqcx_i */
+            mant = 0;
+        } else {
+            tmp = cio_read(cio, 2);	/* SPqcx_i */
+            expn = tmp >> 11;
+            mant = tmp & 0x7ff;
+        }
+        if (bandno < J2K_MAXBANDS) {
+            tccp->stepsizes[bandno].expn = expn;
+            tccp->stepsizes[bandno].mant = mant;
+        }
+    }
+
+    /* Add Antonin : if scalar_derived -> compute other stepsizes */
+    if (tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) {
+        for (bandno = 1; bandno < J2K_MAXBANDS; bandno++) {
+            tccp->stepsizes[bandno].expn =
+                ((tccp->stepsizes[0].expn) - ((bandno - 1) / 3) > 0) ?
+                (tccp->stepsizes[0].expn) - ((bandno - 1) / 3) : 0;
+            tccp->stepsizes[bandno].mant = tccp->stepsizes[0].mant;
+        }
+    }
+    /* ddA */
 }
 
-static void j2k_write_qcd(opj_j2k_t *j2k) {
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, J2K_MS_QCD, 2);	/* QCD */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	j2k_write_qcx(j2k, 0);
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);			/* Lqcd */
-	cio_seek(cio, lenp + len);
-
-	if(j2k->cstr_info)
-	  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_QCD, lenp, len);
+static void j2k_write_qcd(opj_j2k_t *j2k)
+{
+    int lenp, len;
+
+    opj_cio_t *cio = j2k->cio;
+
+    cio_write(cio, J2K_MS_QCD, 2);	/* QCD */
+    lenp = cio_tell(cio);
+    cio_skip(cio, 2);
+    j2k_write_qcx(j2k, 0);
+    len = cio_tell(cio) - lenp;
+    cio_seek(cio, lenp);
+    cio_write(cio, len, 2);			/* Lqcd */
+    cio_seek(cio, lenp + len);
+
+    if(j2k->cstr_info)
+        j2k_add_mhmarker(j2k->cstr_info, J2K_MS_QCD, lenp, len);
 }
 
-static void j2k_read_qcd(opj_j2k_t *j2k) {
-	int len, i, pos;
-
-	opj_cio_t *cio = j2k->cio;
-	opj_image_t *image = j2k->image;
-	
-	len = cio_read(cio, 2);		/* Lqcd */
-	pos = cio_tell(cio);
-	for (i = 0; i < image->numcomps; i++) {
-		cio_seek(cio, pos);
-		j2k_read_qcx(j2k, i, len - 2);
-	}
+static void j2k_read_qcd(opj_j2k_t *j2k)
+{
+    int len, i, pos;
+
+    opj_cio_t *cio = j2k->cio;
+    opj_image_t *image = j2k->image;
+
+    len = cio_read(cio, 2);		/* Lqcd */
+    pos = cio_tell(cio);
+    for (i = 0; i < image->numcomps; i++) {
+        cio_seek(cio, pos);
+        j2k_read_qcx(j2k, i, len - 2);
+    }
 }
 
-static void j2k_write_qcc(opj_j2k_t *j2k, int compno) {
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, J2K_MS_QCC, 2);	/* QCC */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	cio_write(cio, compno, j2k->image->numcomps <= 256 ? 1 : 2);	/* Cqcc */
-	j2k_write_qcx(j2k, compno);
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);			/* Lqcc */
-	cio_seek(cio, lenp + len);
+static void j2k_write_qcc(opj_j2k_t *j2k, int compno)
+{
+    int lenp, len;
+
+    opj_cio_t *cio = j2k->cio;
+
+    cio_write(cio, J2K_MS_QCC, 2);	/* QCC */
+    lenp = cio_tell(cio);
+    cio_skip(cio, 2);
+    cio_write(cio, compno, j2k->image->numcomps <= 256 ? 1 : 2);	/* Cqcc */
+    j2k_write_qcx(j2k, compno);
+    len = cio_tell(cio) - lenp;
+    cio_seek(cio, lenp);
+    cio_write(cio, len, 2);			/* Lqcc */
+    cio_seek(cio, lenp + len);
 }
 
-static void j2k_read_qcc(opj_j2k_t *j2k) {
-	int len, compno;
-	int numcomp = j2k->image->numcomps;
-	opj_cio_t *cio = j2k->cio;
+static void j2k_read_qcc(opj_j2k_t *j2k)
+{
+    int len, compno;
+    int numcomp = j2k->image->numcomps;
+    opj_cio_t *cio = j2k->cio;
 
-	len = cio_read(cio, 2);	/* Lqcc */
-	compno = cio_read(cio, numcomp <= 256 ? 1 : 2);	/* Cqcc */
+    len = cio_read(cio, 2);	/* Lqcc */
+    compno = cio_read(cio, numcomp <= 256 ? 1 : 2);	/* Cqcc */
 
 #ifdef USE_JPWL
-	if (j2k->cp->correct) {
-
-		static int backup_compno = 0;
-
-		/* compno is negative or larger than the number of components!!! */
-		if ((compno < 0) || (compno >= numcomp)) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad component number in QCC (%d out of a maximum of %d)\n",
-				compno, numcomp);
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			compno = backup_compno % numcomp;
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
-				"- setting component number to %d\n",
-				compno);
-		}
-
-		/* keep your private count of tiles */
-		backup_compno++;
-	}
+    if (j2k->cp->correct) {
+
+        static int backup_compno = 0;
+
+        /* compno is negative or larger than the number of components!!! */
+        if ((compno < 0) || (compno >= numcomp)) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "JPWL: bad component number in QCC (%d out of a maximum of %d)\n",
+                          compno, numcomp);
+            if (!JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+            /* we try to correct */
+            compno = backup_compno % numcomp;
+            opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
+                          "- setting component number to %d\n",
+                          compno);
+        }
+
+        /* keep your private count of tiles */
+        backup_compno++;
+    }
 #endif /* USE_JPWL */
 
-  if ((compno < 0) || (compno >= numcomp)) {
-    opj_event_msg(j2k->cinfo, EVT_ERROR,
-      "bad component number in QCC (%d out of a maximum of %d)\n",
-      compno, j2k->image->numcomps);
-    return;
-  }
+    if ((compno < 0) || (compno >= numcomp)) {
+        opj_event_msg(j2k->cinfo, EVT_ERROR,
+                      "bad component number in QCC (%d out of a maximum of %d)\n",
+                      compno, j2k->image->numcomps);
+        return;
+    }
 
-	j2k_read_qcx(j2k, compno, len - 2 - (numcomp <= 256 ? 1 : 2));
+    j2k_read_qcx(j2k, compno, len - 2 - (numcomp <= 256 ? 1 : 2));
 }
 
-static void j2k_write_poc(opj_j2k_t *j2k) {
-	int len, numpchgs, i;
-
-	int numcomps = j2k->image->numcomps;
-	
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
-	opj_tccp_t *tccp = &tcp->tccps[0];
-	opj_cio_t *cio = j2k->cio;
-
-	numpchgs = 1 + tcp->numpocs;
-	cio_write(cio, J2K_MS_POC, 2);	/* POC  */
-	len = 2 + (5 + 2 * (numcomps <= 256 ? 1 : 2)) * numpchgs;
-	cio_write(cio, len, 2);		/* Lpoc */
-	for (i = 0; i < numpchgs; i++) {
-		opj_poc_t *poc = &tcp->pocs[i];
-		cio_write(cio, poc->resno0, 1);	/* RSpoc_i */
-		cio_write(cio, poc->compno0, (numcomps <= 256 ? 1 : 2));	/* CSpoc_i */
-		cio_write(cio, poc->layno1, 2);	/* LYEpoc_i */
-		poc->layno1 = int_min(poc->layno1, tcp->numlayers);
-		cio_write(cio, poc->resno1, 1);	/* REpoc_i */
-		poc->resno1 = int_min(poc->resno1, tccp->numresolutions);
-		cio_write(cio, poc->compno1, (numcomps <= 256 ? 1 : 2));	/* CEpoc_i */
-		poc->compno1 = int_min(poc->compno1, numcomps);
-		cio_write(cio, poc->prg, 1);	/* Ppoc_i */
-	}
+static void j2k_write_poc(opj_j2k_t *j2k)
+{
+    int len, numpchgs, i;
+
+    int numcomps = j2k->image->numcomps;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
+    opj_tccp_t *tccp = &tcp->tccps[0];
+    opj_cio_t *cio = j2k->cio;
+
+    numpchgs = 1 + tcp->numpocs;
+    cio_write(cio, J2K_MS_POC, 2);	/* POC  */
+    len = 2 + (5 + 2 * (numcomps <= 256 ? 1 : 2)) * numpchgs;
+    cio_write(cio, len, 2);		/* Lpoc */
+    for (i = 0; i < numpchgs; i++) {
+        opj_poc_t *poc = &tcp->pocs[i];
+        cio_write(cio, poc->resno0, 1);	/* RSpoc_i */
+        cio_write(cio, poc->compno0, (numcomps <= 256 ? 1 : 2));	/* CSpoc_i */
+        cio_write(cio, poc->layno1, 2);	/* LYEpoc_i */
+        poc->layno1 = int_min(poc->layno1, tcp->numlayers);
+        cio_write(cio, poc->resno1, 1);	/* REpoc_i */
+        poc->resno1 = int_min(poc->resno1, tccp->numresolutions);
+        cio_write(cio, poc->compno1, (numcomps <= 256 ? 1 : 2));	/* CEpoc_i */
+        poc->compno1 = int_min(poc->compno1, numcomps);
+        cio_write(cio, poc->prg, 1);	/* Ppoc_i */
+    }
 }
 
-static void j2k_read_poc(opj_j2k_t *j2k) {
-	int len, numpchgs, i, old_poc;
-
-	int numcomps = j2k->image->numcomps;
-	
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_cio_t *cio = j2k->cio;
-	
-	old_poc = tcp->POC ? tcp->numpocs + 1 : 0;
-	tcp->POC = 1;
-	len = cio_read(cio, 2);		/* Lpoc */
-	numpchgs = (len - 2) / (5 + 2 * (numcomps <= 256 ? 1 : 2));
-	
-	for (i = old_poc; i < numpchgs + old_poc; i++) {
-		opj_poc_t *poc;
-		poc = &tcp->pocs[i];
-		poc->resno0 = cio_read(cio, 1);	/* RSpoc_i */
-		poc->compno0 = cio_read(cio, numcomps <= 256 ? 1 : 2);	/* CSpoc_i */
-		poc->layno1 = cio_read(cio, 2);    /* LYEpoc_i */
-		poc->resno1 = cio_read(cio, 1);    /* REpoc_i */
-		poc->compno1 = int_min(
-			cio_read(cio, numcomps <= 256 ? 1 : 2), (unsigned int) numcomps);	/* CEpoc_i */
-		poc->prg = (OPJ_PROG_ORDER)cio_read(cio, 1);	/* Ppoc_i */
-	}
-	
-	tcp->numpocs = numpchgs + old_poc - 1;
+static void j2k_read_poc(opj_j2k_t *j2k)
+{
+    int len, numpchgs, i, old_poc;
+
+    int numcomps = j2k->image->numcomps;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+    opj_cio_t *cio = j2k->cio;
+
+    old_poc = tcp->POC ? tcp->numpocs + 1 : 0;
+    tcp->POC = 1;
+    len = cio_read(cio, 2);		/* Lpoc */
+    numpchgs = (len - 2) / (5 + 2 * (numcomps <= 256 ? 1 : 2));
+
+    for (i = old_poc; i < numpchgs + old_poc; i++) {
+        opj_poc_t *poc;
+        poc = &tcp->pocs[i];
+        poc->resno0 = cio_read(cio, 1);	/* RSpoc_i */
+        poc->compno0 = cio_read(cio, numcomps <= 256 ? 1 : 2);	/* CSpoc_i */
+        poc->layno1 = cio_read(cio, 2);    /* LYEpoc_i */
+        poc->resno1 = cio_read(cio, 1);    /* REpoc_i */
+        poc->compno1 = int_min(
+                           cio_read(cio, numcomps <= 256 ? 1 : 2), (unsigned int) numcomps);	/* CEpoc_i */
+        poc->prg = (OPJ_PROG_ORDER)cio_read(cio, 1);	/* Ppoc_i */
+    }
+
+    tcp->numpocs = numpchgs + old_poc - 1;
 }
 
-static void j2k_read_crg(opj_j2k_t *j2k) {
-	int len, i, Xcrg_i, Ycrg_i;
-	
-	opj_cio_t *cio = j2k->cio;
-	int numcomps = j2k->image->numcomps;
-	
-	len = cio_read(cio, 2);			/* Lcrg */
-	for (i = 0; i < numcomps; i++) {
-		Xcrg_i = cio_read(cio, 2);	/* Xcrg_i */
-		Ycrg_i = cio_read(cio, 2);	/* Ycrg_i */
-	}
+static void j2k_read_crg(opj_j2k_t *j2k)
+{
+    int len, i, Xcrg_i, Ycrg_i;
+
+    opj_cio_t *cio = j2k->cio;
+    int numcomps = j2k->image->numcomps;
+
+    len = cio_read(cio, 2);			/* Lcrg */
+    for (i = 0; i < numcomps; i++) {
+        Xcrg_i = cio_read(cio, 2);	/* Xcrg_i */
+        Ycrg_i = cio_read(cio, 2);	/* Ycrg_i */
+    }
 }
 
-static void j2k_read_tlm(opj_j2k_t *j2k) {
-	int len, Ztlm, Stlm, ST, SP, tile_tlm, i;
-	long int Ttlm_i, Ptlm_i;
-
-	opj_cio_t *cio = j2k->cio;
-	
-	len = cio_read(cio, 2);		/* Ltlm */
-	Ztlm = cio_read(cio, 1);	/* Ztlm */
-	Stlm = cio_read(cio, 1);	/* Stlm */
-	ST = ((Stlm >> 4) & 0x01) + ((Stlm >> 4) & 0x02);
-	SP = (Stlm >> 6) & 0x01;
-	tile_tlm = (len - 4) / ((SP + 1) * 2 + ST);
-	for (i = 0; i < tile_tlm; i++) {
-		Ttlm_i = cio_read(cio, ST);	/* Ttlm_i */
-		Ptlm_i = cio_read(cio, SP ? 4 : 2);	/* Ptlm_i */
-	}
+static void j2k_read_tlm(opj_j2k_t *j2k)
+{
+    int len, Ztlm, Stlm, ST, SP, tile_tlm, i;
+    long int Ttlm_i, Ptlm_i;
+
+    opj_cio_t *cio = j2k->cio;
+
+    len = cio_read(cio, 2);		/* Ltlm */
+    Ztlm = cio_read(cio, 1);	/* Ztlm */
+    Stlm = cio_read(cio, 1);	/* Stlm */
+    ST = ((Stlm >> 4) & 0x01) + ((Stlm >> 4) & 0x02);
+    SP = (Stlm >> 6) & 0x01;
+    tile_tlm = (len - 4) / ((SP + 1) * 2 + ST);
+    for (i = 0; i < tile_tlm; i++) {
+        Ttlm_i = cio_read(cio, ST);	/* Ttlm_i */
+        Ptlm_i = cio_read(cio, SP ? 4 : 2);	/* Ptlm_i */
+    }
 }
 
-static void j2k_read_plm(opj_j2k_t *j2k) {
-	int len, i, Zplm, Nplm, add, packet_len = 0;
-	
-	opj_cio_t *cio = j2k->cio;
-
-	len = cio_read(cio, 2);		/* Lplm */
-	Zplm = cio_read(cio, 1);	/* Zplm */
-	len -= 3;
-	while (len > 0) {
-		Nplm = cio_read(cio, 4);		/* Nplm */
-		len -= 4;
-		for (i = Nplm; i > 0; i--) {
-			add = cio_read(cio, 1);
-			len--;
-			packet_len = (packet_len << 7) + add;	/* Iplm_ij */
-			if ((add & 0x80) == 0) {
-				/* New packet */
-				packet_len = 0;
-			}
-			if (len <= 0)
-				break;
-		}
-	}
+static void j2k_read_plm(opj_j2k_t *j2k)
+{
+    int len, i, Zplm, Nplm, add, packet_len = 0;
+
+    opj_cio_t *cio = j2k->cio;
+
+    len = cio_read(cio, 2);		/* Lplm */
+    Zplm = cio_read(cio, 1);	/* Zplm */
+    len -= 3;
+    while (len > 0) {
+        Nplm = cio_read(cio, 4);		/* Nplm */
+        len -= 4;
+        for (i = Nplm; i > 0; i--) {
+            add = cio_read(cio, 1);
+            len--;
+            packet_len = (packet_len << 7) + add;	/* Iplm_ij */
+            if ((add & 0x80) == 0) {
+                /* New packet */
+                packet_len = 0;
+            }
+            if (len <= 0)
+                break;
+        }
+    }
 }
 
-static void j2k_read_plt(opj_j2k_t *j2k) {
-	int len, i, Zplt, packet_len = 0, add;
-	
-	opj_cio_t *cio = j2k->cio;
-	
-	len = cio_read(cio, 2);		/* Lplt */
-	Zplt = cio_read(cio, 1);	/* Zplt */
-	for (i = len - 3; i > 0; i--) {
-		add = cio_read(cio, 1);
-		packet_len = (packet_len << 7) + add;	/* Iplt_i */
-		if ((add & 0x80) == 0) {
-			/* New packet */
-			packet_len = 0;
-		}
-	}
+static void j2k_read_plt(opj_j2k_t *j2k)
+{
+    int len, i, Zplt, packet_len = 0, add;
+
+    opj_cio_t *cio = j2k->cio;
+
+    len = cio_read(cio, 2);		/* Lplt */
+    Zplt = cio_read(cio, 1);	/* Zplt */
+    for (i = len - 3; i > 0; i--) {
+        add = cio_read(cio, 1);
+        packet_len = (packet_len << 7) + add;	/* Iplt_i */
+        if ((add & 0x80) == 0) {
+            /* New packet */
+            packet_len = 0;
+        }
+    }
 }
 
-static void j2k_read_ppm(opj_j2k_t *j2k) {
-	int len, Z_ppm, i, j;
-	int N_ppm;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_cio_t *cio = j2k->cio;
-	
-	len = cio_read(cio, 2);
-	cp->ppm = 1;
-	
-	Z_ppm = cio_read(cio, 1);	/* Z_ppm */
-	len -= 3;
-	while (len > 0) {
-		if (cp->ppm_previous == 0) {
-			N_ppm = cio_read(cio, 4);	/* N_ppm */
-			len -= 4;
-		} else {
-			N_ppm = cp->ppm_previous;
-		}
-		j = cp->ppm_store;
-		if (Z_ppm == 0) {	/* First PPM marker */
-			cp->ppm_data = (unsigned char *) opj_malloc(N_ppm * sizeof(unsigned char));
-			cp->ppm_data_first = cp->ppm_data;
-			cp->ppm_len = N_ppm;
-		} else {			/* NON-first PPM marker */
-			cp->ppm_data = (unsigned char *) opj_realloc(cp->ppm_data, (N_ppm +	cp->ppm_store) * sizeof(unsigned char));
+static void j2k_read_ppm(opj_j2k_t *j2k)
+{
+    int len, Z_ppm, i, j;
+    int N_ppm;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_cio_t *cio = j2k->cio;
+
+    len = cio_read(cio, 2);
+    cp->ppm = 1;
+
+    Z_ppm = cio_read(cio, 1);	/* Z_ppm */
+    len -= 3;
+    while (len > 0) {
+        if (cp->ppm_previous == 0) {
+            N_ppm = cio_read(cio, 4);	/* N_ppm */
+            len -= 4;
+        } else {
+            N_ppm = cp->ppm_previous;
+        }
+        j = cp->ppm_store;
+        if (Z_ppm == 0) {	/* First PPM marker */
+            cp->ppm_data = (unsigned char *) opj_malloc(N_ppm * sizeof(unsigned char));
+            cp->ppm_data_first = cp->ppm_data;
+            cp->ppm_len = N_ppm;
+        } else {			/* NON-first PPM marker */
+            cp->ppm_data = (unsigned char *) opj_realloc(cp->ppm_data, (N_ppm +	cp->ppm_store) * sizeof(unsigned char));
 
 #ifdef USE_JPWL
-			/* this memory allocation check could be done even in non-JPWL cases */
-			if (cp->correct) {
-				if (!cp->ppm_data) {
-					opj_event_msg(j2k->cinfo, EVT_ERROR,
-						"JPWL: failed memory allocation during PPM marker parsing (pos. %x)\n",
-						cio_tell(cio));
-					if (!JPWL_ASSUME || JPWL_ASSUME) {
-						opj_free(cp->ppm_data);
-						opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-						return;
-					}
-				}
-			}
+            /* this memory allocation check could be done even in non-JPWL cases */
+            if (cp->correct) {
+                if (!cp->ppm_data) {
+                    opj_event_msg(j2k->cinfo, EVT_ERROR,
+                                  "JPWL: failed memory allocation during PPM marker parsing (pos. %x)\n",
+                                  cio_tell(cio));
+                    if (!JPWL_ASSUME || JPWL_ASSUME) {
+                        opj_free(cp->ppm_data);
+                        opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                        return;
+                    }
+                }
+            }
 #endif
 
-			cp->ppm_data_first = cp->ppm_data;
-			cp->ppm_len = N_ppm + cp->ppm_store;
-		}
-		for (i = N_ppm; i > 0; i--) {	/* Read packet header */
-			cp->ppm_data[j] = cio_read(cio, 1);
-			j++;
-			len--;
-			if (len == 0)
-				break;			/* Case of non-finished packet header in present marker but finished in next one */
-		}
-		cp->ppm_previous = i - 1;
-		cp->ppm_store = j;
-	}
+            cp->ppm_data_first = cp->ppm_data;
+            cp->ppm_len = N_ppm + cp->ppm_store;
+        }
+        for (i = N_ppm; i > 0; i--) {	/* Read packet header */
+            cp->ppm_data[j] = cio_read(cio, 1);
+            j++;
+            len--;
+            if (len == 0)
+                break;			/* Case of non-finished packet header in present marker but finished in next one */
+        }
+        cp->ppm_previous = i - 1;
+        cp->ppm_store = j;
+    }
 }
 
-static void j2k_read_ppt(opj_j2k_t *j2k) {
-	int len, Z_ppt, i, j = 0;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = cp->tcps + j2k->curtileno;
-	opj_cio_t *cio = j2k->cio;
-
-	len = cio_read(cio, 2);
-	Z_ppt = cio_read(cio, 1);
-	tcp->ppt = 1;
-	if (Z_ppt == 0) {		/* First PPT marker */
-		tcp->ppt_data = (unsigned char *) opj_malloc((len - 3) * sizeof(unsigned char));
-		tcp->ppt_data_first = tcp->ppt_data;
-		tcp->ppt_store = 0;
-		tcp->ppt_len = len - 3;
-	} else {			/* NON-first PPT marker */
-		tcp->ppt_data =	(unsigned char *) opj_realloc(tcp->ppt_data, (len - 3 + tcp->ppt_store) * sizeof(unsigned char));
-		tcp->ppt_data_first = tcp->ppt_data;
-		tcp->ppt_len = len - 3 + tcp->ppt_store;
-	}
-	j = tcp->ppt_store;
-	for (i = len - 3; i > 0; i--) {
-		tcp->ppt_data[j] = cio_read(cio, 1);
-		j++;
-	}
-	tcp->ppt_store = j;
+static void j2k_read_ppt(opj_j2k_t *j2k)
+{
+    int len, Z_ppt, i, j = 0;
+
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = cp->tcps + j2k->curtileno;
+    opj_cio_t *cio = j2k->cio;
+
+    len = cio_read(cio, 2);
+    Z_ppt = cio_read(cio, 1);
+    tcp->ppt = 1;
+    if (Z_ppt == 0) {		/* First PPT marker */
+        tcp->ppt_data = (unsigned char *) opj_malloc((len - 3) * sizeof(unsigned char));
+        tcp->ppt_data_first = tcp->ppt_data;
+        tcp->ppt_store = 0;
+        tcp->ppt_len = len - 3;
+    } else {			/* NON-first PPT marker */
+        tcp->ppt_data =	(unsigned char *) opj_realloc(tcp->ppt_data, (len - 3 + tcp->ppt_store) * sizeof(unsigned char));
+        tcp->ppt_data_first = tcp->ppt_data;
+        tcp->ppt_len = len - 3 + tcp->ppt_store;
+    }
+    j = tcp->ppt_store;
+    for (i = len - 3; i > 0; i--) {
+        tcp->ppt_data[j] = cio_read(cio, 1);
+        j++;
+    }
+    tcp->ppt_store = j;
 }
 
-static void j2k_write_tlm(opj_j2k_t *j2k){
-	int lenp;
-	opj_cio_t *cio = j2k->cio;
-	j2k->tlm_start = cio_tell(cio);
-	cio_write(cio, J2K_MS_TLM, 2);/* TLM */
-	lenp = 4 + (5*j2k->totnum_tp);
-	cio_write(cio,lenp,2);				/* Ltlm */
-	cio_write(cio, 0,1);					/* Ztlm=0*/
-	cio_write(cio,80,1);					/* Stlm ST=1(8bits-255 tiles max),SP=1(Ptlm=32bits) */
-	cio_skip(cio,5*j2k->totnum_tp);
+static void j2k_write_tlm(opj_j2k_t *j2k)
+{
+    int lenp;
+    opj_cio_t *cio = j2k->cio;
+    j2k->tlm_start = cio_tell(cio);
+    cio_write(cio, J2K_MS_TLM, 2);/* TLM */
+    lenp = 4 + (5*j2k->totnum_tp);
+    cio_write(cio,lenp,2);				/* Ltlm */
+    cio_write(cio, 0,1);					/* Ztlm=0*/
+    cio_write(cio,80,1);					/* Stlm ST=1(8bits-255 tiles max),SP=1(Ptlm=32bits) */
+    cio_skip(cio,5*j2k->totnum_tp);
 }
 
-static void j2k_write_sot(opj_j2k_t *j2k) {
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-
-	j2k->sot_start = cio_tell(cio);
-	cio_write(cio, J2K_MS_SOT, 2);		/* SOT */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);					/* Lsot (further) */
-	cio_write(cio, j2k->curtileno, 2);	/* Isot */
-	cio_skip(cio, 4);					/* Psot (further in j2k_write_sod) */
-	cio_write(cio, j2k->cur_tp_num , 1);	/* TPsot */
-	cio_write(cio, j2k->cur_totnum_tp[j2k->curtileno], 1);		/* TNsot */
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);				/* Lsot */
-	cio_seek(cio, lenp + len);
-
-	/* UniPG>> */
+static void j2k_write_sot(opj_j2k_t *j2k)
+{
+    int lenp, len;
+
+    opj_cio_t *cio = j2k->cio;
+
+    j2k->sot_start = cio_tell(cio);
+    cio_write(cio, J2K_MS_SOT, 2);		/* SOT */
+    lenp = cio_tell(cio);
+    cio_skip(cio, 2);					/* Lsot (further) */
+    cio_write(cio, j2k->curtileno, 2);	/* Isot */
+    cio_skip(cio, 4);					/* Psot (further in j2k_write_sod) */
+    cio_write(cio, j2k->cur_tp_num , 1);	/* TPsot */
+    cio_write(cio, j2k->cur_totnum_tp[j2k->curtileno], 1);		/* TNsot */
+    len = cio_tell(cio) - lenp;
+    cio_seek(cio, lenp);
+    cio_write(cio, len, 2);				/* Lsot */
+    cio_seek(cio, lenp + len);
+
+    /* UniPG>> */
 #ifdef USE_JPWL
-	/* update markers struct */
-	j2k_add_marker(j2k->cstr_info, J2K_MS_SOT, j2k->sot_start, len + 2);
+    /* update markers struct */
+    j2k_add_marker(j2k->cstr_info, J2K_MS_SOT, j2k->sot_start, len + 2);
 #endif /* USE_JPWL */
-	/* <<UniPG */
+    /* <<UniPG */
 
-	if( j2k->cstr_info && j2k->cur_tp_num==0){
-	  j2k_add_tlmarker( j2k->curtileno, j2k->cstr_info, J2K_MS_SOT, lenp, len);
-	}
+    if( j2k->cstr_info && j2k->cur_tp_num==0) {
+        j2k_add_tlmarker( j2k->curtileno, j2k->cstr_info, J2K_MS_SOT, lenp, len);
+    }
 }
 
-static void j2k_read_sot(opj_j2k_t *j2k) {
-	int len, tileno, totlen, partno, numparts, i;
-	opj_tcp_t *tcp = NULL;
-	char status = 0;
+static void j2k_read_sot(opj_j2k_t *j2k)
+{
+    int len, tileno, totlen, partno, numparts, i;
+    opj_tcp_t *tcp = NULL;
+    char status = 0;
 
-	opj_cp_t *cp = j2k->cp;
-	opj_cio_t *cio = j2k->cio;
+    opj_cp_t *cp = j2k->cp;
+    opj_cio_t *cio = j2k->cio;
 
-	len = cio_read(cio, 2);
-	tileno = cio_read(cio, 2);
+    len = cio_read(cio, 2);
+    tileno = cio_read(cio, 2);
 
 #ifdef USE_JPWL
-	if (j2k->cp->correct) {
-
-		static int backup_tileno = 0;
-
-		/* tileno is negative or larger than the number of tiles!!! */
-		if ((tileno < 0) || (tileno >= (cp->tw * cp->th))) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad tile number (%d out of a maximum of %d)\n",
-				tileno, (cp->tw * cp->th));
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			tileno = backup_tileno;
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
-				"- setting tile number to %d\n",
-				tileno);
-		}
-
-		/* keep your private count of tiles */
-		backup_tileno++;
-	}
-  else
+    if (j2k->cp->correct) {
+
+        static int backup_tileno = 0;
+
+        /* tileno is negative or larger than the number of tiles!!! */
+        if ((tileno < 0) || (tileno >= (cp->tw * cp->th))) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "JPWL: bad tile number (%d out of a maximum of %d)\n",
+                          tileno, (cp->tw * cp->th));
+            if (!JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+            /* we try to correct */
+            tileno = backup_tileno;
+            opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
+                          "- setting tile number to %d\n",
+                          tileno);
+        }
+
+        /* keep your private count of tiles */
+        backup_tileno++;
+    } else
 #endif /* USE_JPWL */
-  {
-    /* tileno is negative or larger than the number of tiles!!! */
-    if ((tileno < 0) || (tileno >= (cp->tw * cp->th))) {
-      opj_event_msg(j2k->cinfo, EVT_ERROR,
-        "JPWL: bad tile number (%d out of a maximum of %d)\n",
-        tileno, (cp->tw * cp->th));
-      return;
-    }
-  }
-	
-	if (cp->tileno_size == 0) {
-		cp->tileno[cp->tileno_size] = tileno;
-		cp->tileno_size++;
-	} else {
-		i = 0;
-		while (i < cp->tileno_size && status == 0) {
-			status = cp->tileno[i] == tileno ? 1 : 0;
-			i++;
-		}
-		if (status == 0) {
-			cp->tileno[cp->tileno_size] = tileno;
-			cp->tileno_size++;
-		}
-	}
-	
-	totlen = cio_read(cio, 4);
+    {
+        /* tileno is negative or larger than the number of tiles!!! */
+        if ((tileno < 0) || (tileno >= (cp->tw * cp->th))) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "JPWL: bad tile number (%d out of a maximum of %d)\n",
+                          tileno, (cp->tw * cp->th));
+            return;
+        }
+    }
+
+    if (cp->tileno_size == 0) {
+        cp->tileno[cp->tileno_size] = tileno;
+        cp->tileno_size++;
+    } else {
+        i = 0;
+        while (i < cp->tileno_size && status == 0) {
+            status = cp->tileno[i] == tileno ? 1 : 0;
+            i++;
+        }
+        if (status == 0) {
+            cp->tileno[cp->tileno_size] = tileno;
+            cp->tileno_size++;
+        }
+    }
+
+    totlen = cio_read(cio, 4);
 
 #ifdef USE_JPWL
-	if (j2k->cp->correct) {
-
-		/* totlen is negative or larger than the bytes left!!! */
-		if ((totlen < 0) || (totlen > (cio_numbytesleft(cio) + 8))) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
-				totlen, cio_numbytesleft(cio) + 8);
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			totlen = 0;
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
-				"- setting Psot to %d => assuming it is the last tile\n",
-				totlen);
-		}
-
-	}
-  else
+    if (j2k->cp->correct) {
+
+        /* totlen is negative or larger than the bytes left!!! */
+        if ((totlen < 0) || (totlen > (cio_numbytesleft(cio) + 8))) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
+                          totlen, cio_numbytesleft(cio) + 8);
+            if (!JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+            /* we try to correct */
+            totlen = 0;
+            opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
+                          "- setting Psot to %d => assuming it is the last tile\n",
+                          totlen);
+        }
+
+    } else
 #endif /* USE_JPWL */
-  {
-    /* totlen is negative or larger than the bytes left!!! */
-    if ((totlen < 0) || (totlen > (cio_numbytesleft(cio) + 8))) {
-      opj_event_msg(j2k->cinfo, EVT_ERROR,
-        "JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
-        totlen, cio_numbytesleft(cio) + 8);
-      return;
-    }
-  }
-
-	if (!totlen)
-		totlen = cio_numbytesleft(cio) + 8;
-	
-	partno = cio_read(cio, 1);
-	numparts = cio_read(cio, 1);
-  
-  if (partno >= numparts) {
-    opj_event_msg(j2k->cinfo, EVT_WARNING, "SOT marker inconsistency in tile %d: tile-part index greater (%d) than number of tile-parts (%d)\n", tileno, partno, numparts);
-    numparts = partno+1;
-  }
-	
-	j2k->curtileno = tileno;
-	j2k->cur_tp_num = partno;
-	j2k->eot = cio_getbp(cio) - 12 + totlen;
-	j2k->state = J2K_STATE_TPH;
-	tcp = &cp->tcps[j2k->curtileno];
-
-	/* Index */
-	if (j2k->cstr_info) {
-		if (tcp->first) {
-			if (tileno == 0) 
-				j2k->cstr_info->main_head_end = cio_tell(cio) - 13;
-			j2k->cstr_info->tile[tileno].tileno = tileno;
-			j2k->cstr_info->tile[tileno].start_pos = cio_tell(cio) - 12;
-			j2k->cstr_info->tile[tileno].end_pos = j2k->cstr_info->tile[tileno].start_pos + totlen - 1;				
-    } else {
-			j2k->cstr_info->tile[tileno].end_pos += totlen;
-		}
-    j2k->cstr_info->tile[tileno].num_tps = numparts;
-    if (numparts)
-      j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_realloc(j2k->cstr_info->tile[tileno].tp, numparts * sizeof(opj_tp_info_t));
-    else
-      j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_realloc(j2k->cstr_info->tile[tileno].tp, 10 * sizeof(opj_tp_info_t)); /* Fixme (10)*/
-		j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos = cio_tell(cio) - 12;
-		j2k->cstr_info->tile[tileno].tp[partno].tp_end_pos = 
-			j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos + totlen - 1;
-	}
-	
-	if (tcp->first == 1) {		
-		/* Initialization PPT */
-		opj_tccp_t *tmp = tcp->tccps;
-		memcpy(tcp, j2k->default_tcp, sizeof(opj_tcp_t));
-		tcp->ppt = 0;
-		tcp->ppt_data = NULL;
-		tcp->ppt_data_first = NULL;
-		tcp->tccps = tmp;
-
-		for (i = 0; i < j2k->image->numcomps; i++) {
-			tcp->tccps[i] = j2k->default_tcp->tccps[i];
-		}
-		cp->tcps[j2k->curtileno].first = 0;
-	}
+    {
+        /* totlen is negative or larger than the bytes left!!! */
+        if ((totlen < 0) || (totlen > (cio_numbytesleft(cio) + 8))) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
+                          totlen, cio_numbytesleft(cio) + 8);
+            return;
+        }
+    }
+
+    if (!totlen)
+        totlen = cio_numbytesleft(cio) + 8;
+
+    partno = cio_read(cio, 1);
+    numparts = cio_read(cio, 1);
+
+    if (partno >= numparts) {
+        opj_event_msg(j2k->cinfo, EVT_WARNING, "SOT marker inconsistency in tile %d: tile-part index greater (%d) than number of tile-parts (%d)\n", tileno, partno, numparts);
+        numparts = partno+1;
+    }
+
+    j2k->curtileno = tileno;
+    j2k->cur_tp_num = partno;
+    j2k->eot = cio_getbp(cio) - 12 + totlen;
+    j2k->state = J2K_STATE_TPH;
+    tcp = &cp->tcps[j2k->curtileno];
+
+    /* Index */
+    if (j2k->cstr_info) {
+        if (tcp->first) {
+            if (tileno == 0)
+                j2k->cstr_info->main_head_end = cio_tell(cio) - 13;
+            j2k->cstr_info->tile[tileno].tileno = tileno;
+            j2k->cstr_info->tile[tileno].start_pos = cio_tell(cio) - 12;
+            j2k->cstr_info->tile[tileno].end_pos = j2k->cstr_info->tile[tileno].start_pos + totlen - 1;
+        } else {
+            j2k->cstr_info->tile[tileno].end_pos += totlen;
+        }
+        j2k->cstr_info->tile[tileno].num_tps = numparts;
+        if (numparts)
+            j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_realloc(j2k->cstr_info->tile[tileno].tp, numparts * sizeof(opj_tp_info_t));
+        else
+            j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_realloc(j2k->cstr_info->tile[tileno].tp, 10 * sizeof(opj_tp_info_t)); /* Fixme (10)*/
+        j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos = cio_tell(cio) - 12;
+        j2k->cstr_info->tile[tileno].tp[partno].tp_end_pos =
+            j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos + totlen - 1;
+    }
+
+    if (tcp->first == 1) {
+        /* Initialization PPT */
+        opj_tccp_t *tmp = tcp->tccps;
+        memcpy(tcp, j2k->default_tcp, sizeof(opj_tcp_t));
+        tcp->ppt = 0;
+        tcp->ppt_data = NULL;
+        tcp->ppt_data_first = NULL;
+        tcp->tccps = tmp;
+
+        for (i = 0; i < j2k->image->numcomps; i++) {
+            tcp->tccps[i] = j2k->default_tcp->tccps[i];
+        }
+        cp->tcps[j2k->curtileno].first = 0;
+    }
 }
 
-static void j2k_write_sod(opj_j2k_t *j2k, void *tile_coder) {
-	int l, layno;
-	int totlen;
-	opj_tcp_t *tcp = NULL;
-	opj_codestream_info_t *cstr_info = NULL;
-	
-	opj_tcd_t *tcd = (opj_tcd_t*)tile_coder;	/* cast is needed because of conflicts in header inclusions */
-	opj_cp_t *cp = j2k->cp;
-	opj_cio_t *cio = j2k->cio;
-
-	tcd->tp_num = j2k->tp_num ;
-	tcd->cur_tp_num = j2k->cur_tp_num;
-	
-	cio_write(cio, J2K_MS_SOD, 2);
-
-	if( j2k->cstr_info && j2k->cur_tp_num==0){
-	  j2k_add_tlmarker( j2k->curtileno, j2k->cstr_info, J2K_MS_SOD, cio_tell(cio), 0);
-	}
-
-	if (j2k->curtileno == 0) {
-		j2k->sod_start = cio_tell(cio) + j2k->pos_correction;
-	}
-
-	/* INDEX >> */
-	cstr_info = j2k->cstr_info;
-	if (cstr_info) {
-		if (!j2k->cur_tp_num ) {
-			cstr_info->tile[j2k->curtileno].end_header = cio_tell(cio) + j2k->pos_correction - 1;
-			j2k->cstr_info->tile[j2k->curtileno].tileno = j2k->curtileno;
-		}
-		else{
-			if(cstr_info->tile[j2k->curtileno].packet[cstr_info->packno - 1].end_pos < cio_tell(cio))
-				cstr_info->tile[j2k->curtileno].packet[cstr_info->packno].start_pos = cio_tell(cio);
-		}
-		/* UniPG>> */
+static void j2k_write_sod(opj_j2k_t *j2k, void *tile_coder)
+{
+    int l, layno;
+    int totlen;
+    opj_tcp_t *tcp = NULL;
+    opj_codestream_info_t *cstr_info = NULL;
+
+    opj_tcd_t *tcd = (opj_tcd_t*)tile_coder;	/* cast is needed because of conflicts in header inclusions */
+    opj_cp_t *cp = j2k->cp;
+    opj_cio_t *cio = j2k->cio;
+
+    tcd->tp_num = j2k->tp_num ;
+    tcd->cur_tp_num = j2k->cur_tp_num;
+
+    cio_write(cio, J2K_MS_SOD, 2);
+
+    if( j2k->cstr_info && j2k->cur_tp_num==0) {
+        j2k_add_tlmarker( j2k->curtileno, j2k->cstr_info, J2K_MS_SOD, cio_tell(cio), 0);
+    }
+
+    if (j2k->curtileno == 0) {
+        j2k->sod_start = cio_tell(cio) + j2k->pos_correction;
+    }
+
+    /* INDEX >> */
+    cstr_info = j2k->cstr_info;
+    if (cstr_info) {
+        if (!j2k->cur_tp_num ) {
+            cstr_info->tile[j2k->curtileno].end_header = cio_tell(cio) + j2k->pos_correction - 1;
+            j2k->cstr_info->tile[j2k->curtileno].tileno = j2k->curtileno;
+        } else {
+            if(cstr_info->tile[j2k->curtileno].packet[cstr_info->packno - 1].end_pos < cio_tell(cio))
+                cstr_info->tile[j2k->curtileno].packet[cstr_info->packno].start_pos = cio_tell(cio);
+        }
+        /* UniPG>> */
 #ifdef USE_JPWL
-		/* update markers struct */
-		j2k_add_marker(j2k->cstr_info, J2K_MS_SOD, j2k->sod_start, 2);
+        /* update markers struct */
+        j2k_add_marker(j2k->cstr_info, J2K_MS_SOD, j2k->sod_start, 2);
 #endif /* USE_JPWL */
-		/* <<UniPG */
-	}
-	/* << INDEX */
-	
-	tcp = &cp->tcps[j2k->curtileno];
-	for (layno = 0; layno < tcp->numlayers; layno++) {
-		if (tcp->rates[layno]>(j2k->sod_start / (cp->th * cp->tw))) {
-			tcp->rates[layno]-=(j2k->sod_start / (cp->th * cp->tw));
-		} else if (tcp->rates[layno]) {
-			tcp->rates[layno]=1;
-		}
-	}
-	if(j2k->cur_tp_num == 0){
-		tcd->tcd_image->tiles->packno = 0;
-		if(cstr_info)
-			cstr_info->packno = 0;
-	}
-	
-	l = tcd_encode_tile(tcd, j2k->curtileno, cio_getbp(cio), cio_numbytesleft(cio) - 2, cstr_info);
-	
-	/* Writing Psot in SOT marker */
-	totlen = cio_tell(cio) + l - j2k->sot_start;
-	cio_seek(cio, j2k->sot_start + 6);
-	cio_write(cio, totlen, 4);
-	cio_seek(cio, j2k->sot_start + totlen);
-	/* Writing Ttlm and Ptlm in TLM marker */
-	if(cp->cinema){
-		cio_seek(cio, j2k->tlm_start + 6 + (5*j2k->cur_tp_num));
-		cio_write(cio, j2k->curtileno, 1);
-		cio_write(cio, totlen, 4);
-	}
-	cio_seek(cio, j2k->sot_start + totlen);
+        /* <<UniPG */
+    }
+    /* << INDEX */
+
+    tcp = &cp->tcps[j2k->curtileno];
+    for (layno = 0; layno < tcp->numlayers; layno++) {
+        if (tcp->rates[layno]>(j2k->sod_start / (cp->th * cp->tw))) {
+            tcp->rates[layno]-=(j2k->sod_start / (cp->th * cp->tw));
+        } else if (tcp->rates[layno]) {
+            tcp->rates[layno]=1;
+        }
+    }
+    if(j2k->cur_tp_num == 0) {
+        tcd->tcd_image->tiles->packno = 0;
+        if(cstr_info)
+            cstr_info->packno = 0;
+    }
+
+    l = tcd_encode_tile(tcd, j2k->curtileno, cio_getbp(cio), cio_numbytesleft(cio) - 2, cstr_info);
+
+    /* Writing Psot in SOT marker */
+    totlen = cio_tell(cio) + l - j2k->sot_start;
+    cio_seek(cio, j2k->sot_start + 6);
+    cio_write(cio, totlen, 4);
+    cio_seek(cio, j2k->sot_start + totlen);
+    /* Writing Ttlm and Ptlm in TLM marker */
+    if(cp->cinema) {
+        cio_seek(cio, j2k->tlm_start + 6 + (5*j2k->cur_tp_num));
+        cio_write(cio, j2k->curtileno, 1);
+        cio_write(cio, totlen, 4);
+    }
+    cio_seek(cio, j2k->sot_start + totlen);
 }
 
-static void j2k_read_sod(opj_j2k_t *j2k) {
-	int len, truncate = 0, i;
-	unsigned char *data = NULL, *data_ptr = NULL;
-
-	opj_cio_t *cio = j2k->cio;
-	int curtileno = j2k->curtileno;
-
-	/* Index */
-	if (j2k->cstr_info) {
-		j2k->cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_header =
-			cio_tell(cio) + j2k->pos_correction - 1;
-		if (j2k->cur_tp_num == 0)
-			j2k->cstr_info->tile[j2k->curtileno].end_header = cio_tell(cio) + j2k->pos_correction - 1;
-		j2k->cstr_info->packno = 0;
-	}
-	
-	len = int_min(j2k->eot - cio_getbp(cio), cio_numbytesleft(cio) + 1);
-
-	if (len == cio_numbytesleft(cio) + 1) {
-		truncate = 1;		/* Case of a truncate codestream */
-	}	
-
-	data = j2k->tile_data[curtileno];
-	data = (unsigned char*) opj_realloc(data, (j2k->tile_len[curtileno] + len) * sizeof(unsigned char));
-
-	data_ptr = data + j2k->tile_len[curtileno];
-	for (i = 0; i < len; i++) {
-		data_ptr[i] = cio_read(cio, 1);
-	}
-
-	j2k->tile_len[curtileno] += len;
-	j2k->tile_data[curtileno] = data;
-	
-	if (!truncate) {
-		j2k->state = J2K_STATE_TPHSOT;
-	} else {
-		j2k->state = J2K_STATE_NEOC;	/* RAJOUTE !! */
-	}
-	j2k->cur_tp_num++;
+static void j2k_read_sod(opj_j2k_t *j2k)
+{
+    int len, truncate = 0, i;
+    unsigned char *data = NULL, *data_ptr = NULL;
+
+    opj_cio_t *cio = j2k->cio;
+    int curtileno = j2k->curtileno;
+
+    /* Index */
+    if (j2k->cstr_info) {
+        j2k->cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_header =
+            cio_tell(cio) + j2k->pos_correction - 1;
+        if (j2k->cur_tp_num == 0)
+            j2k->cstr_info->tile[j2k->curtileno].end_header = cio_tell(cio) + j2k->pos_correction - 1;
+        j2k->cstr_info->packno = 0;
+    }
+
+    len = int_min(j2k->eot - cio_getbp(cio), cio_numbytesleft(cio) + 1);
+
+    if (len == cio_numbytesleft(cio) + 1) {
+        truncate = 1;		/* Case of a truncate codestream */
+    }
+
+    data = j2k->tile_data[curtileno];
+    data = (unsigned char*) opj_realloc(data, (j2k->tile_len[curtileno] + len) * sizeof(unsigned char));
+
+    data_ptr = data + j2k->tile_len[curtileno];
+    for (i = 0; i < len; i++) {
+        data_ptr[i] = cio_read(cio, 1);
+    }
+
+    j2k->tile_len[curtileno] += len;
+    j2k->tile_data[curtileno] = data;
+
+    if (!truncate) {
+        j2k->state = J2K_STATE_TPHSOT;
+    } else {
+        j2k->state = J2K_STATE_NEOC;	/* RAJOUTE !! */
+    }
+    j2k->cur_tp_num++;
 }
 
-static void j2k_write_rgn(opj_j2k_t *j2k, int compno, int tileno) {
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[tileno];
-	opj_cio_t *cio = j2k->cio;
-	int numcomps = j2k->image->numcomps;
-	
-	cio_write(cio, J2K_MS_RGN, 2);						/* RGN  */
-	cio_write(cio, numcomps <= 256 ? 5 : 6, 2);			/* Lrgn */
-	cio_write(cio, compno, numcomps <= 256 ? 1 : 2);	/* Crgn */
-	cio_write(cio, 0, 1);								/* Srgn */
-	cio_write(cio, tcp->tccps[compno].roishift, 1);		/* SPrgn */
+static void j2k_write_rgn(opj_j2k_t *j2k, int compno, int tileno)
+{
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = &cp->tcps[tileno];
+    opj_cio_t *cio = j2k->cio;
+    int numcomps = j2k->image->numcomps;
+
+    cio_write(cio, J2K_MS_RGN, 2);						/* RGN  */
+    cio_write(cio, numcomps <= 256 ? 5 : 6, 2);			/* Lrgn */
+    cio_write(cio, compno, numcomps <= 256 ? 1 : 2);	/* Crgn */
+    cio_write(cio, 0, 1);								/* Srgn */
+    cio_write(cio, tcp->tccps[compno].roishift, 1);		/* SPrgn */
 }
 
-static void j2k_read_rgn(opj_j2k_t *j2k) {
-	int len, compno, roisty;
+static void j2k_read_rgn(opj_j2k_t *j2k)
+{
+    int len, compno, roisty;
 
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_cio_t *cio = j2k->cio;
-	int numcomps = j2k->image->numcomps;
+    opj_cp_t *cp = j2k->cp;
+    opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+    opj_cio_t *cio = j2k->cio;
+    int numcomps = j2k->image->numcomps;
 
-	len = cio_read(cio, 2);										/* Lrgn */
-	compno = cio_read(cio, numcomps <= 256 ? 1 : 2);			/* Crgn */
-	roisty = cio_read(cio, 1);									/* Srgn */
+    len = cio_read(cio, 2);										/* Lrgn */
+    compno = cio_read(cio, numcomps <= 256 ? 1 : 2);			/* Crgn */
+    roisty = cio_read(cio, 1);									/* Srgn */
 
 #ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		/* totlen is negative or larger than the bytes left!!! */
-		if (compno >= numcomps) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad component number in RGN (%d when there are only %d)\n",
-				compno, numcomps);
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-		}
-	};
+    if (j2k->cp->correct) {
+        /* totlen is negative or larger than the bytes left!!! */
+        if (compno >= numcomps) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "JPWL: bad component number in RGN (%d when there are only %d)\n",
+                          compno, numcomps);
+            if (!JPWL_ASSUME || JPWL_ASSUME) {
+                opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                return;
+            }
+        }
+    };
 #endif /* USE_JPWL */
 
-  if (compno >= numcomps) {
-    opj_event_msg(j2k->cinfo, EVT_ERROR,
-      "bad component number in RGN (%d out of a maximum of %d)\n",
-      compno, j2k->image->numcomps);
-    return;
-  }
+    if (compno >= numcomps) {
+        opj_event_msg(j2k->cinfo, EVT_ERROR,
+                      "bad component number in RGN (%d out of a maximum of %d)\n",
+                      compno, j2k->image->numcomps);
+        return;
+    }
 
-	tcp->tccps[compno].roishift = cio_read(cio, 1);				/* SPrgn */
+    tcp->tccps[compno].roishift = cio_read(cio, 1);				/* SPrgn */
 }
 
-static void j2k_write_eoc(opj_j2k_t *j2k) {
-	opj_cio_t *cio = j2k->cio;
-	/* opj_event_msg(j2k->cinfo, "%.8x: EOC\n", cio_tell(cio) + j2k->pos_correction); */
-	cio_write(cio, J2K_MS_EOC, 2);
+static void j2k_write_eoc(opj_j2k_t *j2k)
+{
+    opj_cio_t *cio = j2k->cio;
+    /* opj_event_msg(j2k->cinfo, "%.8x: EOC\n", cio_tell(cio) + j2k->pos_correction); */
+    cio_write(cio, J2K_MS_EOC, 2);
 
-/* UniPG>> */
+    /* UniPG>> */
 #ifdef USE_JPWL
-	/* update markers struct */
-	j2k_add_marker(j2k->cstr_info, J2K_MS_EOC, cio_tell(cio) - 2, 2);
+    /* update markers struct */
+    j2k_add_marker(j2k->cstr_info, J2K_MS_EOC, cio_tell(cio) - 2, 2);
 #endif /* USE_JPWL */
-/* <<UniPG */
+    /* <<UniPG */
 }
 
-static void j2k_read_eoc(opj_j2k_t *j2k) {
-	int i, tileno;
-	opj_bool success = OPJ_FALSE;
-
-	/* if packets should be decoded */
-	if (j2k->cp->limit_decoding != DECODE_ALL_BUT_PACKETS) {
-		opj_tcd_t *tcd = tcd_create(j2k->cinfo);
-		tcd_malloc_decode(tcd, j2k->image, j2k->cp);
-		for (i = 0; i < j2k->cp->tileno_size; i++) {
-			tcd_malloc_decode_tile(tcd, j2k->image, j2k->cp, i, j2k->cstr_info);
-			if (j2k->cp->tileno[i] != -1)
-			{
-				tileno = j2k->cp->tileno[i];
-				success = tcd_decode_tile(tcd, j2k->tile_data[tileno], j2k->tile_len[tileno], tileno, j2k->cstr_info);
-				opj_free(j2k->tile_data[tileno]);
-				j2k->tile_data[tileno] = NULL;
-				tcd_free_decode_tile(tcd, i);
-			}
-			else
-				success = OPJ_FALSE;
-			if (success == OPJ_FALSE) {
-				j2k->state |= J2K_STATE_ERR;
-				break;
-			}
-		}
-		tcd_free_decode(tcd);
-		tcd_destroy(tcd);
-	}
-	/* if packets should not be decoded  */
-	else {
-		for (i = 0; i < j2k->cp->tileno_size; i++) {
-			tileno = j2k->cp->tileno[i];
-			opj_free(j2k->tile_data[tileno]);
-			j2k->tile_data[tileno] = NULL;
-		}
-	}	
-	if (j2k->state & J2K_STATE_ERR)
-		j2k->state = J2K_STATE_MT + J2K_STATE_ERR;
-	else
-		j2k->state = J2K_STATE_MT; 
+static void j2k_read_eoc(opj_j2k_t *j2k)
+{
+    int i, tileno;
+    opj_bool success = OPJ_FALSE;
+
+    /* if packets should be decoded */
+    if (j2k->cp->limit_decoding != DECODE_ALL_BUT_PACKETS) {
+        opj_tcd_t *tcd = tcd_create(j2k->cinfo);
+        tcd_malloc_decode(tcd, j2k->image, j2k->cp);
+        for (i = 0; i < j2k->cp->tileno_size; i++) {
+            tcd_malloc_decode_tile(tcd, j2k->image, j2k->cp, i, j2k->cstr_info);
+            if (j2k->cp->tileno[i] != -1) {
+                tileno = j2k->cp->tileno[i];
+                success = tcd_decode_tile(tcd, j2k->tile_data[tileno], j2k->tile_len[tileno], tileno, j2k->cstr_info);
+                opj_free(j2k->tile_data[tileno]);
+                j2k->tile_data[tileno] = NULL;
+                tcd_free_decode_tile(tcd, i);
+            } else
+                success = OPJ_FALSE;
+            if (success == OPJ_FALSE) {
+                j2k->state |= J2K_STATE_ERR;
+                break;
+            }
+        }
+        tcd_free_decode(tcd);
+        tcd_destroy(tcd);
+    }
+    /* if packets should not be decoded  */
+    else {
+        for (i = 0; i < j2k->cp->tileno_size; i++) {
+            tileno = j2k->cp->tileno[i];
+            opj_free(j2k->tile_data[tileno]);
+            j2k->tile_data[tileno] = NULL;
+        }
+    }
+    if (j2k->state & J2K_STATE_ERR)
+        j2k->state = J2K_STATE_MT + J2K_STATE_ERR;
+    else
+        j2k->state = J2K_STATE_MT;
 }
 
 typedef struct opj_dec_mstabent {
-	/** marker value */
-	int id;
-	/** value of the state when the marker can appear */
-	int states;
-	/** action linked to the marker */
-	void (*handler) (opj_j2k_t *j2k);
+    /** marker value */
+    int id;
+    /** value of the state when the marker can appear */
+    int states;
+    /** action linked to the marker */
+    void (*handler) (opj_j2k_t *j2k);
 } opj_dec_mstabent_t;
 
 opj_dec_mstabent_t j2k_dec_mstab[] = {
-  {J2K_MS_SOC, J2K_STATE_MHSOC, j2k_read_soc},
-  {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, j2k_read_sot},
-  {J2K_MS_SOD, J2K_STATE_TPH, j2k_read_sod},
-  {J2K_MS_EOC, J2K_STATE_TPHSOT, j2k_read_eoc},
-  {J2K_MS_SIZ, J2K_STATE_MHSIZ, j2k_read_siz},
-  {J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_cod},
-  {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_coc},
-  {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn},
-  {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd},
-  {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc},
-  {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc},
-  {J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm},
-  {J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm},
-  {J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt},
-  {J2K_MS_PPM, J2K_STATE_MH, j2k_read_ppm},
-  {J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt},
-  {J2K_MS_SOP, 0, 0},
-  {J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg},
-  {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com},
+    {J2K_MS_SOC, J2K_STATE_MHSOC, j2k_read_soc},
+    {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, j2k_read_sot},
+    {J2K_MS_SOD, J2K_STATE_TPH, j2k_read_sod},
+    {J2K_MS_EOC, J2K_STATE_TPHSOT, j2k_read_eoc},
+    {J2K_MS_SIZ, J2K_STATE_MHSIZ, j2k_read_siz},
+    {J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_cod},
+    {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_coc},
+    {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn},
+    {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd},
+    {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc},
+    {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc},
+    {J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm},
+    {J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm},
+    {J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt},
+    {J2K_MS_PPM, J2K_STATE_MH, j2k_read_ppm},
+    {J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt},
+    {J2K_MS_SOP, 0, 0},
+    {J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg},
+    {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com},
 
 #ifdef USE_JPWL
-  {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},
-  {J2K_MS_EPB, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epb},
-  {J2K_MS_ESD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_esd},
-  {J2K_MS_RED, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_red},
+    {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},
+    {J2K_MS_EPB, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epb},
+    {J2K_MS_ESD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_esd},
+    {J2K_MS_RED, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_red},
 #endif /* USE_JPWL */
 #ifdef USE_JPSEC
-  {J2K_MS_SEC, J2K_STATE_MH, j2k_read_sec},
-  {J2K_MS_INSEC, 0, j2k_read_insec},
+    {J2K_MS_SEC, J2K_STATE_MH, j2k_read_sec},
+    {J2K_MS_INSEC, 0, j2k_read_insec},
 #endif /* USE_JPSEC */
 
-  {0, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_unk}
+    {0, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_unk}
 };
 
-static void j2k_read_unk(opj_j2k_t *j2k) {
-	opj_event_msg(j2k->cinfo, EVT_WARNING, "Unknown marker\n");
+static void j2k_read_unk(opj_j2k_t *j2k)
+{
+    opj_event_msg(j2k->cinfo, EVT_WARNING, "Unknown marker\n");
 
 #ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		int m = 0, id, i;
-		int min_id = 0, min_dist = 17, cur_dist = 0, tmp_id;
-		cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
-		id = cio_read(j2k->cio, 2);
-		opj_event_msg(j2k->cinfo, EVT_ERROR,
-			"JPWL: really don't know this marker %x\n",
-			id);
-		if (!JPWL_ASSUME) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"- possible synch loss due to uncorrectable codestream errors => giving up\n");
-			return;
-		}
-		/* OK, activate this at your own risk!!! */
-		/* we look for the marker at the minimum hamming distance from this */
-		while (j2k_dec_mstab[m].id) {
-			
-			/* 1's where they differ */
-			tmp_id = j2k_dec_mstab[m].id ^ id;
-
-			/* compute the hamming distance between our id and the current */
-			cur_dist = 0;
-			for (i = 0; i < 16; i++) {
-				if ((tmp_id >> i) & 0x0001) {
-					cur_dist++;
-				}
-			}
-
-			/* if current distance is smaller, set the minimum */
-			if (cur_dist < min_dist) {
-				min_dist = cur_dist;
-				min_id = j2k_dec_mstab[m].id;
-			}
-			
-			/* jump to the next marker */
-			m++;
-		}
-
-		/* do we substitute the marker? */
-		if (min_dist < JPWL_MAXIMUM_HAMMING) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"- marker %x is at distance %d from the read %x\n",
-				min_id, min_dist, id);
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"- trying to substitute in place and crossing fingers!\n");
-			cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
-			cio_write(j2k->cio, min_id, 2);
-
-			/* rewind */
-			cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
-
-		}
-
-	};
+    if (j2k->cp->correct) {
+        int m = 0, id, i;
+        int min_id = 0, min_dist = 17, cur_dist = 0, tmp_id;
+        cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
+        id = cio_read(j2k->cio, 2);
+        opj_event_msg(j2k->cinfo, EVT_ERROR,
+                      "JPWL: really don't know this marker %x\n",
+                      id);
+        if (!JPWL_ASSUME) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "- possible synch loss due to uncorrectable codestream errors => giving up\n");
+            return;
+        }
+        /* OK, activate this at your own risk!!! */
+        /* we look for the marker at the minimum hamming distance from this */
+        while (j2k_dec_mstab[m].id) {
+
+            /* 1's where they differ */
+            tmp_id = j2k_dec_mstab[m].id ^ id;
+
+            /* compute the hamming distance between our id and the current */
+            cur_dist = 0;
+            for (i = 0; i < 16; i++) {
+                if ((tmp_id >> i) & 0x0001) {
+                    cur_dist++;
+                }
+            }
+
+            /* if current distance is smaller, set the minimum */
+            if (cur_dist < min_dist) {
+                min_dist = cur_dist;
+                min_id = j2k_dec_mstab[m].id;
+            }
+
+            /* jump to the next marker */
+            m++;
+        }
+
+        /* do we substitute the marker? */
+        if (min_dist < JPWL_MAXIMUM_HAMMING) {
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "- marker %x is at distance %d from the read %x\n",
+                          min_id, min_dist, id);
+            opj_event_msg(j2k->cinfo, EVT_ERROR,
+                          "- trying to substitute in place and crossing fingers!\n");
+            cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
+            cio_write(j2k->cio, min_id, 2);
+
+            /* rewind */
+            cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
+
+        }
+
+    };
 #endif /* USE_JPWL */
 
 }
@@ -1778,44 +1812,47 @@ static void j2k_read_unk(opj_j2k_t *j2k) {
 Read the lookup table containing all the marker, status and action
 @param id Marker value
 */
-static opj_dec_mstabent_t *j2k_dec_mstab_lookup(int id) {
-	opj_dec_mstabent_t *e;
-	for (e = j2k_dec_mstab; e->id != 0; e++) {
-		if (e->id == id) {
-			break;
-		}
-	}
-	return e;
+static opj_dec_mstabent_t *j2k_dec_mstab_lookup(int id)
+{
+    opj_dec_mstabent_t *e;
+    for (e = j2k_dec_mstab; e->id != 0; e++) {
+        if (e->id == id) {
+            break;
+        }
+    }
+    return e;
 }
 
 /* ----------------------------------------------------------------------- */
 /* J2K / JPT decoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo) {
-	opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
-	if(!j2k)
-		return NULL;
+opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo)
+{
+    opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
+    if(!j2k)
+        return NULL;
 
-	j2k->default_tcp = (opj_tcp_t*) opj_calloc(1, sizeof(opj_tcp_t));
-	if(!j2k->default_tcp) {
-		opj_free(j2k);
-		return NULL;
-	}
+    j2k->default_tcp = (opj_tcp_t*) opj_calloc(1, sizeof(opj_tcp_t));
+    if(!j2k->default_tcp) {
+        opj_free(j2k);
+        return NULL;
+    }
 
-	j2k->cinfo = cinfo;
-	j2k->tile_data = NULL;
+    j2k->cinfo = cinfo;
+    j2k->tile_data = NULL;
 
-	return j2k;
+    return j2k;
 }
 
-void j2k_destroy_decompress(opj_j2k_t *j2k) {
-	int i = 0;
+void j2k_destroy_decompress(opj_j2k_t *j2k)
+{
+    int i = 0;
 
-	if(j2k->tile_len != NULL) {
-		opj_free(j2k->tile_len);
-	}
-	if(j2k->tile_data != NULL) {
+    if(j2k->tile_len != NULL) {
+        opj_free(j2k->tile_len);
+    }
+    if(j2k->tile_data != NULL) {
         if(j2k->cp != NULL) {
             for (i = 0; i < j2k->cp->tileno_size; i++) {
                 int tileno = j2k->cp->tileno[i];
@@ -1824,813 +1861,818 @@ void j2k_destroy_decompress(opj_j2k_t *j2k) {
             }
         }
 
-		opj_free(j2k->tile_data);
-	}
-	if(j2k->default_tcp != NULL) {
-		opj_tcp_t *default_tcp = j2k->default_tcp;
-		if(default_tcp->ppt_data_first != NULL) {
-			opj_free(default_tcp->ppt_data_first);
-		}
-		if(j2k->default_tcp->tccps != NULL) {
-			opj_free(j2k->default_tcp->tccps);
-		}
-		opj_free(j2k->default_tcp);
-	}
-	if(j2k->cp != NULL) {
-		opj_cp_t *cp = j2k->cp;
-		if(cp->tcps != NULL) {
-			for(i = 0; i < cp->tw * cp->th; i++) {
-				if(cp->tcps[i].ppt_data_first != NULL) {
-					opj_free(cp->tcps[i].ppt_data_first);
-				}
-				if(cp->tcps[i].tccps != NULL) {
-					opj_free(cp->tcps[i].tccps);
-				}
-			}
-			opj_free(cp->tcps);
-		}
-		if(cp->ppm_data_first != NULL) {
-			opj_free(cp->ppm_data_first);
-		}
-		if(cp->tileno != NULL) {
-			opj_free(cp->tileno);  
-		}
-		if(cp->comment != NULL) {
-			opj_free(cp->comment);
-		}
-
-		opj_free(cp);
-	}
-	opj_free(j2k);
+        opj_free(j2k->tile_data);
+    }
+    if(j2k->default_tcp != NULL) {
+        opj_tcp_t *default_tcp = j2k->default_tcp;
+        if(default_tcp->ppt_data_first != NULL) {
+            opj_free(default_tcp->ppt_data_first);
+        }
+        if(j2k->default_tcp->tccps != NULL) {
+            opj_free(j2k->default_tcp->tccps);
+        }
+        opj_free(j2k->default_tcp);
+    }
+    if(j2k->cp != NULL) {
+        opj_cp_t *cp = j2k->cp;
+        if(cp->tcps != NULL) {
+            for(i = 0; i < cp->tw * cp->th; i++) {
+                if(cp->tcps[i].ppt_data_first != NULL) {
+                    opj_free(cp->tcps[i].ppt_data_first);
+                }
+                if(cp->tcps[i].tccps != NULL) {
+                    opj_free(cp->tcps[i].tccps);
+                }
+            }
+            opj_free(cp->tcps);
+        }
+        if(cp->ppm_data_first != NULL) {
+            opj_free(cp->ppm_data_first);
+        }
+        if(cp->tileno != NULL) {
+            opj_free(cp->tileno);
+        }
+        if(cp->comment != NULL) {
+            opj_free(cp->comment);
+        }
+
+        opj_free(cp);
+    }
+    opj_free(j2k);
 }
 
-void j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters) {
-	if(j2k && parameters) {
-		/* create and initialize the coding parameters structure */
-		opj_cp_t *cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t));
-		cp->reduce = parameters->cp_reduce;	
-		cp->layer = parameters->cp_layer;
-		cp->limit_decoding = parameters->cp_limit_decoding;
+void j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters)
+{
+    if(j2k && parameters) {
+        /* create and initialize the coding parameters structure */
+        opj_cp_t *cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t));
+        cp->reduce = parameters->cp_reduce;
+        cp->layer = parameters->cp_layer;
+        cp->limit_decoding = parameters->cp_limit_decoding;
 
 #ifdef USE_JPWL
-		cp->correct = parameters->jpwl_correct;
-		cp->exp_comps = parameters->jpwl_exp_comps;
-		cp->max_tiles = parameters->jpwl_max_tiles;
+        cp->correct = parameters->jpwl_correct;
+        cp->exp_comps = parameters->jpwl_exp_comps;
+        cp->max_tiles = parameters->jpwl_max_tiles;
 #endif /* USE_JPWL */
 
 
-		/* keep a link to cp so that we can destroy it later in j2k_destroy_decompress */
-		j2k->cp = cp;
-	}
+        /* keep a link to cp so that we can destroy it later in j2k_destroy_decompress */
+        j2k->cp = cp;
+    }
 }
 
-opj_image_t* j2k_decode(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestream_info_t *cstr_info) {
-	opj_image_t *image = NULL;
+opj_image_t* j2k_decode(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestream_info_t *cstr_info)
+{
+    opj_image_t *image = NULL;
 
-	opj_common_ptr cinfo = j2k->cinfo;	
+    opj_common_ptr cinfo = j2k->cinfo;
 
-	j2k->cio = cio;
-	j2k->cstr_info = cstr_info;
-	if (cstr_info)
-		memset(cstr_info, 0, sizeof(opj_codestream_info_t));
+    j2k->cio = cio;
+    j2k->cstr_info = cstr_info;
+    if (cstr_info)
+        memset(cstr_info, 0, sizeof(opj_codestream_info_t));
 
-	/* create an empty image */
-	image = opj_image_create0();
-	j2k->image = image;
+    /* create an empty image */
+    image = opj_image_create0();
+    j2k->image = image;
 
-	j2k->state = J2K_STATE_MHSOC;
+    j2k->state = J2K_STATE_MHSOC;
 
-	for (;;) {
-		opj_dec_mstabent_t *e;
-		int id = cio_read(cio, 2);
+    for (;;) {
+        opj_dec_mstabent_t *e;
+        int id = cio_read(cio, 2);
 
 #ifdef USE_JPWL
-		/* we try to honor JPWL correction power */
-		if (j2k->cp->correct) {
-
-			int orig_pos = cio_tell(cio);
-			opj_bool status;
-
-			/* call the corrector */
-			status = jpwl_correct(j2k);
-
-			/* go back to where you were */
-			cio_seek(cio, orig_pos - 2);
-
-			/* re-read the marker */
-			id = cio_read(cio, 2);
-
-			/* check whether it begins with ff */
-			if (id >> 8 != 0xff) {
-				opj_event_msg(cinfo, EVT_ERROR,
-					"JPWL: possible bad marker %x at %d\n",
-					id, cio_tell(cio) - 2);
-				if (!JPWL_ASSUME) {
-					opj_image_destroy(image);
-					opj_event_msg(cinfo, EVT_ERROR, "JPWL: giving up\n");
-					return 0;
-				}
-				/* we try to correct */
-				id = id | 0xff00;
-				cio_seek(cio, cio_tell(cio) - 2);
-				cio_write(cio, id, 2);
-				opj_event_msg(cinfo, EVT_WARNING, "- trying to adjust this\n"
-					"- setting marker to %x\n",
-					id);
-			}
-
-		}
+        /* we try to honor JPWL correction power */
+        if (j2k->cp->correct) {
+
+            int orig_pos = cio_tell(cio);
+            opj_bool status;
+
+            /* call the corrector */
+            status = jpwl_correct(j2k);
+
+            /* go back to where you were */
+            cio_seek(cio, orig_pos - 2);
+
+            /* re-read the marker */
+            id = cio_read(cio, 2);
+
+            /* check whether it begins with ff */
+            if (id >> 8 != 0xff) {
+                opj_event_msg(cinfo, EVT_ERROR,
+                              "JPWL: possible bad marker %x at %d\n",
+                              id, cio_tell(cio) - 2);
+                if (!JPWL_ASSUME) {
+                    opj_image_destroy(image);
+                    opj_event_msg(cinfo, EVT_ERROR, "JPWL: giving up\n");
+                    return 0;
+                }
+                /* we try to correct */
+                id = id | 0xff00;
+                cio_seek(cio, cio_tell(cio) - 2);
+                cio_write(cio, id, 2);
+                opj_event_msg(cinfo, EVT_WARNING, "- trying to adjust this\n"
+                              "- setting marker to %x\n",
+                              id);
+            }
+
+        }
 #endif /* USE_JPWL */
 
-		if (id >> 8 != 0xff) {
-		if(cio_numbytesleft(cio) != 0) /* not end of file reached and no EOC */
-	   {
-		opj_event_msg(cinfo, EVT_ERROR, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
-		opj_image_destroy(image);
-		return 0;
-	   }
-		opj_event_msg(cinfo, EVT_WARNING, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
-		j2k->state = J2K_STATE_NEOC;
-		break;
-		}
-		e = j2k_dec_mstab_lookup(id);
-		/* Check if the marker is known*/
-		if (!(j2k->state & e->states)) {
-			opj_image_destroy(image);
-			opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);
-			return 0;
-		}
-		/* Check if the decoding is limited to the main header*/
-		if (e->id == J2K_MS_SOT && j2k->cp->limit_decoding == LIMIT_TO_MAIN_HEADER) {
-			opj_event_msg(cinfo, EVT_INFO, "Main Header decoded.\n");
-			return image;
-		}		
-
-		if (e->handler) {
-			(*e->handler)(j2k);
-		}
-		if (j2k->state & J2K_STATE_ERR) 
-        {
+        if (id >> 8 != 0xff) {
+            if(cio_numbytesleft(cio) != 0) { /* not end of file reached and no EOC */
+                opj_event_msg(cinfo, EVT_ERROR, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
+                opj_image_destroy(image);
+                return 0;
+            }
+            opj_event_msg(cinfo, EVT_WARNING, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
+            j2k->state = J2K_STATE_NEOC;
+            break;
+        }
+        e = j2k_dec_mstab_lookup(id);
+        /* Check if the marker is known*/
+        if (!(j2k->state & e->states)) {
             opj_image_destroy(image);
-			return NULL;	
-        }
-
-		if (j2k->state == J2K_STATE_MT) {
-			break;
-		}
-		if (j2k->state == J2K_STATE_NEOC) {
-			break;
-		}
-	}
-	if (j2k->state == J2K_STATE_NEOC) {
-		j2k_read_eoc(j2k);
-	}
-
-	if (j2k->state != J2K_STATE_MT) {
-		opj_event_msg(cinfo, EVT_WARNING, "Incomplete bitstream\n");
-	}
-	return image;
+            opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);
+            return 0;
+        }
+        /* Check if the decoding is limited to the main header*/
+        if (e->id == J2K_MS_SOT && j2k->cp->limit_decoding == LIMIT_TO_MAIN_HEADER) {
+            opj_event_msg(cinfo, EVT_INFO, "Main Header decoded.\n");
+            return image;
+        }
+
+        if (e->handler) {
+            (*e->handler)(j2k);
+        }
+        if (j2k->state & J2K_STATE_ERR) {
+            opj_image_destroy(image);
+            return NULL;
+        }
+
+        if (j2k->state == J2K_STATE_MT) {
+            break;
+        }
+        if (j2k->state == J2K_STATE_NEOC) {
+            break;
+        }
+    }
+    if (j2k->state == J2K_STATE_NEOC) {
+        j2k_read_eoc(j2k);
+    }
+
+    if (j2k->state != J2K_STATE_MT) {
+        opj_event_msg(cinfo, EVT_WARNING, "Incomplete bitstream\n");
+    }
+    return image;
 }
 
 /*
 * Read a JPT-stream and decode file
 *
 */
-opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio,  opj_codestream_info_t *cstr_info) {
-	opj_image_t *image = NULL;
-	opj_jpt_msg_header_t header;
-	int position;
-	opj_common_ptr cinfo = j2k->cinfo;
-
-	OPJ_ARG_NOT_USED(cstr_info);
-
-	j2k->cio = cio;
-
-	/* create an empty image */
-	image = opj_image_create0();
-	j2k->image = image;
-
-	j2k->state = J2K_STATE_MHSOC;
-	
-	/* Initialize the header */
-	jpt_init_msg_header(&header);
-	/* Read the first header of the message */
-	jpt_read_msg_header(cinfo, cio, &header);
-	
-	position = cio_tell(cio);
-	if (header.Class_Id != 6) {	/* 6 : Main header data-bin message */
-		opj_image_destroy(image);
-		opj_event_msg(cinfo, EVT_ERROR, "[JPT-stream] : Expecting Main header first [class_Id %d] !\n", header.Class_Id);
-		return 0;
-	}
-	
-	for (;;) {
-		opj_dec_mstabent_t *e = NULL;
-		int id;
-		
-		if (!cio_numbytesleft(cio)) {
-			j2k_read_eoc(j2k);
-			return image;
-		}
-		/* data-bin read -> need to read a new header */
-		if ((unsigned int) (cio_tell(cio) - position) == header.Msg_length) {
-			jpt_read_msg_header(cinfo, cio, &header);
-			position = cio_tell(cio);
-			if (header.Class_Id != 4) {	/* 4 : Tile data-bin message */
-				opj_image_destroy(image);
-				opj_event_msg(cinfo, EVT_ERROR, "[JPT-stream] : Expecting Tile info !\n");
-				return 0;
-			}
-		}
-		
-		id = cio_read(cio, 2);
-		if (id >> 8 != 0xff) {
-        if(cio_numbytesleft(cio) != 0) /* no end of file reached and no EOC */
-	  {
-		opj_event_msg(cinfo, EVT_ERROR, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
-		opj_image_destroy(image);
-		return 0;
-	  }
-		opj_event_msg(cinfo, EVT_WARNING, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
-		j2k->state = J2K_STATE_NEOC;
-		break;
-		}
-		e = j2k_dec_mstab_lookup(id);
-		if (!(j2k->state & e->states)) {
-			opj_image_destroy(image);
-			opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);
-			return 0;
-		}
-		if (e->handler) {
-			(*e->handler)(j2k);
-		}
-		if (j2k->state == J2K_STATE_MT) {
-			break;
-		}
-		if (j2k->state == J2K_STATE_NEOC) {
-			break;
-		}
-	}
-	if (j2k->state == J2K_STATE_NEOC) {
-		j2k_read_eoc(j2k);
-	}
-	
-	if (j2k->state != J2K_STATE_MT) {
-		opj_event_msg(cinfo, EVT_WARNING, "Incomplete bitstream\n");
-	}
-
-	return image;
+opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio,  opj_codestream_info_t *cstr_info)
+{
+    opj_image_t *image = NULL;
+    opj_jpt_msg_header_t header;
+    int position;
+    opj_common_ptr cinfo = j2k->cinfo;
+
+    OPJ_ARG_NOT_USED(cstr_info);
+
+    j2k->cio = cio;
+
+    /* create an empty image */
+    image = opj_image_create0();
+    j2k->image = image;
+
+    j2k->state = J2K_STATE_MHSOC;
+
+    /* Initialize the header */
+    jpt_init_msg_header(&header);
+    /* Read the first header of the message */
+    jpt_read_msg_header(cinfo, cio, &header);
+
+    position = cio_tell(cio);
+    if (header.Class_Id != 6) {	/* 6 : Main header data-bin message */
+        opj_image_destroy(image);
+        opj_event_msg(cinfo, EVT_ERROR, "[JPT-stream] : Expecting Main header first [class_Id %d] !\n", header.Class_Id);
+        return 0;
+    }
+
+    for (;;) {
+        opj_dec_mstabent_t *e = NULL;
+        int id;
+
+        if (!cio_numbytesleft(cio)) {
+            j2k_read_eoc(j2k);
+            return image;
+        }
+        /* data-bin read -> need to read a new header */
+        if ((unsigned int) (cio_tell(cio) - position) == header.Msg_length) {
+            jpt_read_msg_header(cinfo, cio, &header);
+            position = cio_tell(cio);
+            if (header.Class_Id != 4) {	/* 4 : Tile data-bin message */
+                opj_image_destroy(image);
+                opj_event_msg(cinfo, EVT_ERROR, "[JPT-stream] : Expecting Tile info !\n");
+                return 0;
+            }
+        }
+
+        id = cio_read(cio, 2);
+        if (id >> 8 != 0xff) {
+            if(cio_numbytesleft(cio) != 0) { /* no end of file reached and no EOC */
+                opj_event_msg(cinfo, EVT_ERROR, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
+                opj_image_destroy(image);
+                return 0;
+            }
+            opj_event_msg(cinfo, EVT_WARNING, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
+            j2k->state = J2K_STATE_NEOC;
+            break;
+        }
+        e = j2k_dec_mstab_lookup(id);
+        if (!(j2k->state & e->states)) {
+            opj_image_destroy(image);
+            opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);
+            return 0;
+        }
+        if (e->handler) {
+            (*e->handler)(j2k);
+        }
+        if (j2k->state == J2K_STATE_MT) {
+            break;
+        }
+        if (j2k->state == J2K_STATE_NEOC) {
+            break;
+        }
+    }
+    if (j2k->state == J2K_STATE_NEOC) {
+        j2k_read_eoc(j2k);
+    }
+
+    if (j2k->state != J2K_STATE_MT) {
+        opj_event_msg(cinfo, EVT_WARNING, "Incomplete bitstream\n");
+    }
+
+    return image;
 }
 
 /* ----------------------------------------------------------------------- */
 /* J2K encoder interface                                                       */
 /* ----------------------------------------------------------------------- */
 
-opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo) {
-	opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
-	if(j2k) {
-		j2k->cinfo = cinfo;
-	}
-	return j2k;
+opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo)
+{
+    opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
+    if(j2k) {
+        j2k->cinfo = cinfo;
+    }
+    return j2k;
 }
 
-void j2k_destroy_compress(opj_j2k_t *j2k) {
-	int tileno;
-
-	if(!j2k) return;
-	if(j2k->cp != NULL) {
-		opj_cp_t *cp = j2k->cp;
-
-		if(cp->comment) {
-			opj_free(cp->comment);
-		}
-		if(cp->matrice) {
-			opj_free(cp->matrice);
-		}
-		for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
-			opj_free(cp->tcps[tileno].tccps);
-		}
-		opj_free(cp->tcps);
-		opj_free(cp);
-	}
-
-	opj_free(j2k);
+void j2k_destroy_compress(opj_j2k_t *j2k)
+{
+    int tileno;
+
+    if(!j2k) return;
+    if(j2k->cp != NULL) {
+        opj_cp_t *cp = j2k->cp;
+
+        if(cp->comment) {
+            opj_free(cp->comment);
+        }
+        if(cp->matrice) {
+            opj_free(cp->matrice);
+        }
+        for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+            opj_free(cp->tcps[tileno].tccps);
+        }
+        opj_free(cp->tcps);
+        opj_free(cp);
+    }
+
+    opj_free(j2k);
 }
 
-void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_t *image) {
-	int i, j, tileno, numpocs_tile;
-	opj_cp_t *cp = NULL;
-
-	if(!j2k || !parameters || ! image) {
-		return;
-	}
-
-	/* create and initialize the coding parameters structure */
-	cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t));
-
-	/* keep a link to cp so that we can destroy it later in j2k_destroy_compress */
-	j2k->cp = cp;
-
-	/* set default values for cp */
-	cp->tw = 1;
-	cp->th = 1;
-
-	/* 
-	copy user encoding parameters 
-	*/
-	cp->cinema = parameters->cp_cinema;
-	cp->max_comp_size =	parameters->max_comp_size;
-	cp->rsiz   = parameters->cp_rsiz;
-	cp->disto_alloc = parameters->cp_disto_alloc;
-	cp->fixed_alloc = parameters->cp_fixed_alloc;
-	cp->fixed_quality = parameters->cp_fixed_quality;
-
-	/* mod fixed_quality */
-	if(parameters->cp_matrice) {
-		size_t array_size = parameters->tcp_numlayers * parameters->numresolution * 3 * sizeof(int);
-		cp->matrice = (int *) opj_malloc(array_size);
-		memcpy(cp->matrice, parameters->cp_matrice, array_size);
-	}
-
-	/* tiles */
-	cp->tdx = parameters->cp_tdx;
-	cp->tdy = parameters->cp_tdy;
-
-	/* tile offset */
-	cp->tx0 = parameters->cp_tx0;
-	cp->ty0 = parameters->cp_ty0;
-
-	/* comment string */
-	if(parameters->cp_comment) {
-		cp->comment = (char*)opj_malloc(strlen(parameters->cp_comment) + 1);
-		if(cp->comment) {
-			strcpy(cp->comment, parameters->cp_comment);
-		}
-	}
-
-	/*
-	calculate other encoding parameters
-	*/
-
-	if (parameters->tile_size_on) {
-		cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
-		cp->th = int_ceildiv(image->y1 - cp->ty0, cp->tdy);
-	} else {
-		cp->tdx = image->x1 - cp->tx0;
-		cp->tdy = image->y1 - cp->ty0;
-	}
-
-	if(parameters->tp_on){
-		cp->tp_flag = parameters->tp_flag;
-		cp->tp_on = 1;
-	}
-	
-	cp->img_size = 0;
-	for(i=0;i<image->numcomps ;i++){
-	cp->img_size += (image->comps[i].w *image->comps[i].h * image->comps[i].prec);
-	}
+void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_t *image)
+{
+    int i, j, tileno, numpocs_tile;
+    opj_cp_t *cp = NULL;
+
+    if(!j2k || !parameters || ! image) {
+        return;
+    }
+
+    /* create and initialize the coding parameters structure */
+    cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t));
+
+    /* keep a link to cp so that we can destroy it later in j2k_destroy_compress */
+    j2k->cp = cp;
+
+    /* set default values for cp */
+    cp->tw = 1;
+    cp->th = 1;
+
+    /*
+    copy user encoding parameters
+    */
+    cp->cinema = parameters->cp_cinema;
+    cp->max_comp_size =	parameters->max_comp_size;
+    cp->rsiz   = parameters->cp_rsiz;
+    cp->disto_alloc = parameters->cp_disto_alloc;
+    cp->fixed_alloc = parameters->cp_fixed_alloc;
+    cp->fixed_quality = parameters->cp_fixed_quality;
+
+    /* mod fixed_quality */
+    if(parameters->cp_matrice) {
+        size_t array_size = parameters->tcp_numlayers * parameters->numresolution * 3 * sizeof(int);
+        cp->matrice = (int *) opj_malloc(array_size);
+        memcpy(cp->matrice, parameters->cp_matrice, array_size);
+    }
+
+    /* tiles */
+    cp->tdx = parameters->cp_tdx;
+    cp->tdy = parameters->cp_tdy;
+
+    /* tile offset */
+    cp->tx0 = parameters->cp_tx0;
+    cp->ty0 = parameters->cp_ty0;
+
+    /* comment string */
+    if(parameters->cp_comment) {
+        cp->comment = (char*)opj_malloc(strlen(parameters->cp_comment) + 1);
+        if(cp->comment) {
+            strcpy(cp->comment, parameters->cp_comment);
+        }
+    }
+
+    /*
+    calculate other encoding parameters
+    */
+
+    if (parameters->tile_size_on) {
+        cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
+        cp->th = int_ceildiv(image->y1 - cp->ty0, cp->tdy);
+    } else {
+        cp->tdx = image->x1 - cp->tx0;
+        cp->tdy = image->y1 - cp->ty0;
+    }
+
+    if(parameters->tp_on) {
+        cp->tp_flag = parameters->tp_flag;
+        cp->tp_on = 1;
+    }
+
+    cp->img_size = 0;
+    for(i=0; i<image->numcomps ; i++) {
+        cp->img_size += (image->comps[i].w *image->comps[i].h * image->comps[i].prec);
+    }
 
 
 #ifdef USE_JPWL
-	/*
-	calculate JPWL encoding parameters
-	*/
-
-	if (parameters->jpwl_epc_on) {
-		int i;
-
-		/* set JPWL on */
-		cp->epc_on = OPJ_TRUE;
-		cp->info_on = OPJ_FALSE; /* no informative technique */
-
-		/* set EPB on */
-		if ((parameters->jpwl_hprot_MH > 0) || (parameters->jpwl_hprot_TPH[0] > 0)) {
-			cp->epb_on = OPJ_TRUE;
-			
-			cp->hprot_MH = parameters->jpwl_hprot_MH;
-			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
-				cp->hprot_TPH_tileno[i] = parameters->jpwl_hprot_TPH_tileno[i];
-				cp->hprot_TPH[i] = parameters->jpwl_hprot_TPH[i];
-			}
-			/* if tile specs are not specified, copy MH specs */
-			if (cp->hprot_TPH[0] == -1) {
-				cp->hprot_TPH_tileno[0] = 0;
-				cp->hprot_TPH[0] = parameters->jpwl_hprot_MH;
-			}
-			for (i = 0; i < JPWL_MAX_NO_PACKSPECS; i++) {
-				cp->pprot_tileno[i] = parameters->jpwl_pprot_tileno[i];
-				cp->pprot_packno[i] = parameters->jpwl_pprot_packno[i];
-				cp->pprot[i] = parameters->jpwl_pprot[i];
-			}
-		}
-
-		/* set ESD writing */
-		if ((parameters->jpwl_sens_size == 1) || (parameters->jpwl_sens_size == 2)) {
-			cp->esd_on = OPJ_TRUE;
-
-			cp->sens_size = parameters->jpwl_sens_size;
-			cp->sens_addr = parameters->jpwl_sens_addr;
-			cp->sens_range = parameters->jpwl_sens_range;
-
-			cp->sens_MH = parameters->jpwl_sens_MH;
-			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
-				cp->sens_TPH_tileno[i] = parameters->jpwl_sens_TPH_tileno[i];
-				cp->sens_TPH[i] = parameters->jpwl_sens_TPH[i];
-			}
-		}
-
-		/* always set RED writing to false: we are at the encoder */
-		cp->red_on = OPJ_FALSE;
-
-	} else {
-		cp->epc_on = OPJ_FALSE;
-	}
+    /*
+    calculate JPWL encoding parameters
+    */
+
+    if (parameters->jpwl_epc_on) {
+        int i;
+
+        /* set JPWL on */
+        cp->epc_on = OPJ_TRUE;
+        cp->info_on = OPJ_FALSE; /* no informative technique */
+
+        /* set EPB on */
+        if ((parameters->jpwl_hprot_MH > 0) || (parameters->jpwl_hprot_TPH[0] > 0)) {
+            cp->epb_on = OPJ_TRUE;
+
+            cp->hprot_MH = parameters->jpwl_hprot_MH;
+            for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
+                cp->hprot_TPH_tileno[i] = parameters->jpwl_hprot_TPH_tileno[i];
+                cp->hprot_TPH[i] = parameters->jpwl_hprot_TPH[i];
+            }
+            /* if tile specs are not specified, copy MH specs */
+            if (cp->hprot_TPH[0] == -1) {
+                cp->hprot_TPH_tileno[0] = 0;
+                cp->hprot_TPH[0] = parameters->jpwl_hprot_MH;
+            }
+            for (i = 0; i < JPWL_MAX_NO_PACKSPECS; i++) {
+                cp->pprot_tileno[i] = parameters->jpwl_pprot_tileno[i];
+                cp->pprot_packno[i] = parameters->jpwl_pprot_packno[i];
+                cp->pprot[i] = parameters->jpwl_pprot[i];
+            }
+        }
+
+        /* set ESD writing */
+        if ((parameters->jpwl_sens_size == 1) || (parameters->jpwl_sens_size == 2)) {
+            cp->esd_on = OPJ_TRUE;
+
+            cp->sens_size = parameters->jpwl_sens_size;
+            cp->sens_addr = parameters->jpwl_sens_addr;
+            cp->sens_range = parameters->jpwl_sens_range;
+
+            cp->sens_MH = parameters->jpwl_sens_MH;
+            for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
+                cp->sens_TPH_tileno[i] = parameters->jpwl_sens_TPH_tileno[i];
+                cp->sens_TPH[i] = parameters->jpwl_sens_TPH[i];
+            }
+        }
+
+        /* always set RED writing to false: we are at the encoder */
+        cp->red_on = OPJ_FALSE;
+
+    } else {
+        cp->epc_on = OPJ_FALSE;
+    }
 #endif /* USE_JPWL */
 
 
-	/* initialize the mutiple tiles */
-	/* ---------------------------- */
-	cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
-
-	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
-		opj_tcp_t *tcp = &cp->tcps[tileno];
-		tcp->numlayers = parameters->tcp_numlayers;
-		for (j = 0; j < tcp->numlayers; j++) {
-			if(cp->cinema){
-				if (cp->fixed_quality) {
-					tcp->distoratio[j] = parameters->tcp_distoratio[j];
-				}
-				tcp->rates[j] = parameters->tcp_rates[j];
-			}else{
-				if (cp->fixed_quality) {	/* add fixed_quality */
-					tcp->distoratio[j] = parameters->tcp_distoratio[j];
-				} else {
-					tcp->rates[j] = parameters->tcp_rates[j];
-				}
-			}
-		}
-		tcp->csty = parameters->csty;
-		tcp->prg = parameters->prog_order;
-		tcp->mct = parameters->tcp_mct; 
-
-		numpocs_tile = 0;
-		tcp->POC = 0;
-		if (parameters->numpocs) {
-			/* initialisation of POC */
-			tcp->POC = 1;
-			for (i = 0; i < parameters->numpocs; i++) {
-				if((tileno == parameters->POC[i].tile - 1) || (parameters->POC[i].tile == -1)) {
-					opj_poc_t *tcp_poc = &tcp->pocs[numpocs_tile];
-					tcp_poc->resno0		= parameters->POC[numpocs_tile].resno0;
-					tcp_poc->compno0	= parameters->POC[numpocs_tile].compno0;
-					tcp_poc->layno1		= parameters->POC[numpocs_tile].layno1;
-					tcp_poc->resno1		= parameters->POC[numpocs_tile].resno1;
-					tcp_poc->compno1	= parameters->POC[numpocs_tile].compno1;
-					tcp_poc->prg1		= parameters->POC[numpocs_tile].prg1;
-					tcp_poc->tile		= parameters->POC[numpocs_tile].tile;
-					numpocs_tile++;
-				}
-			}
-			tcp->numpocs = numpocs_tile -1 ;
-		}else{ 
-			tcp->numpocs = 0;
-		}
-
-		tcp->tccps = (opj_tccp_t*) opj_calloc(image->numcomps, sizeof(opj_tccp_t));
-
-		for (i = 0; i < image->numcomps; i++) {
-			opj_tccp_t *tccp = &tcp->tccps[i];
-			tccp->csty = parameters->csty & 0x01;	/* 0 => one precinct || 1 => custom precinct  */
-			tccp->numresolutions = parameters->numresolution;
-			tccp->cblkw = int_floorlog2(parameters->cblockw_init);
-			tccp->cblkh = int_floorlog2(parameters->cblockh_init);
-			tccp->cblksty = parameters->mode;
-			tccp->qmfbid = parameters->irreversible ? 0 : 1;
-			tccp->qntsty = parameters->irreversible ? J2K_CCP_QNTSTY_SEQNT : J2K_CCP_QNTSTY_NOQNT;
-			tccp->numgbits = 2;
-			if (i == parameters->roi_compno) {
-				tccp->roishift = parameters->roi_shift;
-			} else {
-				tccp->roishift = 0;
-			}
-
-			if(parameters->cp_cinema)
-			{
-				/*Precinct size for lowest frequency subband=128*/
-				tccp->prcw[0] = 7;
-				tccp->prch[0] = 7;
-				/*Precinct size at all other resolutions = 256*/
-				for (j = 1; j < tccp->numresolutions; j++) {
-					tccp->prcw[j] = 8;
-					tccp->prch[j] = 8;
-				}
-			}else{
-				if (parameters->csty & J2K_CCP_CSTY_PRT) {
-					int p = 0;
-					for (j = tccp->numresolutions - 1; j >= 0; j--) {
-						if (p < parameters->res_spec) {
-							
-							if (parameters->prcw_init[p] < 1) {
-								tccp->prcw[j] = 1;
-							} else {
-								tccp->prcw[j] = int_floorlog2(parameters->prcw_init[p]);
-							}
-							
-							if (parameters->prch_init[p] < 1) {
-								tccp->prch[j] = 1;
-							}else {
-								tccp->prch[j] = int_floorlog2(parameters->prch_init[p]);
-							}
-
-						} else {
-							int res_spec = parameters->res_spec;
-							int size_prcw = parameters->prcw_init[res_spec - 1] >> (p - (res_spec - 1));
-							int size_prch = parameters->prch_init[res_spec - 1] >> (p - (res_spec - 1));
-							
-							if (size_prcw < 1) {
-								tccp->prcw[j] = 1;
-							} else {
-								tccp->prcw[j] = int_floorlog2(size_prcw);
-							}
-							
-							if (size_prch < 1) {
-								tccp->prch[j] = 1;
-							} else {
-								tccp->prch[j] = int_floorlog2(size_prch);
-							}
-						}
-						p++;
-						/*printf("\nsize precinct for level %d : %d,%d\n", j,tccp->prcw[j], tccp->prch[j]); */
-					}	/*end for*/
-				} else {
-					for (j = 0; j < tccp->numresolutions; j++) {
-						tccp->prcw[j] = 15;
-						tccp->prch[j] = 15;
-					}
-				}
-			}
-
-			dwt_calc_explicit_stepsizes(tccp, image->comps[i].prec);
-		}
-	}
+    /* initialize the mutiple tiles */
+    /* ---------------------------- */
+    cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
+
+    for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+        opj_tcp_t *tcp = &cp->tcps[tileno];
+        tcp->numlayers = parameters->tcp_numlayers;
+        for (j = 0; j < tcp->numlayers; j++) {
+            if(cp->cinema) {
+                if (cp->fixed_quality) {
+                    tcp->distoratio[j] = parameters->tcp_distoratio[j];
+                }
+                tcp->rates[j] = parameters->tcp_rates[j];
+            } else {
+                if (cp->fixed_quality) {	/* add fixed_quality */
+                    tcp->distoratio[j] = parameters->tcp_distoratio[j];
+                } else {
+                    tcp->rates[j] = parameters->tcp_rates[j];
+                }
+            }
+        }
+        tcp->csty = parameters->csty;
+        tcp->prg = parameters->prog_order;
+        tcp->mct = parameters->tcp_mct;
+
+        numpocs_tile = 0;
+        tcp->POC = 0;
+        if (parameters->numpocs) {
+            /* initialisation of POC */
+            tcp->POC = 1;
+            for (i = 0; i < parameters->numpocs; i++) {
+                if((tileno == parameters->POC[i].tile - 1) || (parameters->POC[i].tile == -1)) {
+                    opj_poc_t *tcp_poc = &tcp->pocs[numpocs_tile];
+                    tcp_poc->resno0		= parameters->POC[numpocs_tile].resno0;
+                    tcp_poc->compno0	= parameters->POC[numpocs_tile].compno0;
+                    tcp_poc->layno1		= parameters->POC[numpocs_tile].layno1;
+                    tcp_poc->resno1		= parameters->POC[numpocs_tile].resno1;
+                    tcp_poc->compno1	= parameters->POC[numpocs_tile].compno1;
+                    tcp_poc->prg1		= parameters->POC[numpocs_tile].prg1;
+                    tcp_poc->tile		= parameters->POC[numpocs_tile].tile;
+                    numpocs_tile++;
+                }
+            }
+            tcp->numpocs = numpocs_tile -1 ;
+        } else {
+            tcp->numpocs = 0;
+        }
+
+        tcp->tccps = (opj_tccp_t*) opj_calloc(image->numcomps, sizeof(opj_tccp_t));
+
+        for (i = 0; i < image->numcomps; i++) {
+            opj_tccp_t *tccp = &tcp->tccps[i];
+            tccp->csty = parameters->csty & 0x01;	/* 0 => one precinct || 1 => custom precinct  */
+            tccp->numresolutions = parameters->numresolution;
+            tccp->cblkw = int_floorlog2(parameters->cblockw_init);
+            tccp->cblkh = int_floorlog2(parameters->cblockh_init);
+            tccp->cblksty = parameters->mode;
+            tccp->qmfbid = parameters->irreversible ? 0 : 1;
+            tccp->qntsty = parameters->irreversible ? J2K_CCP_QNTSTY_SEQNT : J2K_CCP_QNTSTY_NOQNT;
+            tccp->numgbits = 2;
+            if (i == parameters->roi_compno) {
+                tccp->roishift = parameters->roi_shift;
+            } else {
+                tccp->roishift = 0;
+            }
+
+            if(parameters->cp_cinema) {
+                /*Precinct size for lowest frequency subband=128*/
+                tccp->prcw[0] = 7;
+                tccp->prch[0] = 7;
+                /*Precinct size at all other resolutions = 256*/
+                for (j = 1; j < tccp->numresolutions; j++) {
+                    tccp->prcw[j] = 8;
+                    tccp->prch[j] = 8;
+                }
+            } else {
+                if (parameters->csty & J2K_CCP_CSTY_PRT) {
+                    int p = 0;
+                    for (j = tccp->numresolutions - 1; j >= 0; j--) {
+                        if (p < parameters->res_spec) {
+
+                            if (parameters->prcw_init[p] < 1) {
+                                tccp->prcw[j] = 1;
+                            } else {
+                                tccp->prcw[j] = int_floorlog2(parameters->prcw_init[p]);
+                            }
+
+                            if (parameters->prch_init[p] < 1) {
+                                tccp->prch[j] = 1;
+                            } else {
+                                tccp->prch[j] = int_floorlog2(parameters->prch_init[p]);
+                            }
+
+                        } else {
+                            int res_spec = parameters->res_spec;
+                            int size_prcw = parameters->prcw_init[res_spec - 1] >> (p - (res_spec - 1));
+                            int size_prch = parameters->prch_init[res_spec - 1] >> (p - (res_spec - 1));
+
+                            if (size_prcw < 1) {
+                                tccp->prcw[j] = 1;
+                            } else {
+                                tccp->prcw[j] = int_floorlog2(size_prcw);
+                            }
+
+                            if (size_prch < 1) {
+                                tccp->prch[j] = 1;
+                            } else {
+                                tccp->prch[j] = int_floorlog2(size_prch);
+                            }
+                        }
+                        p++;
+                        /*printf("\nsize precinct for level %d : %d,%d\n", j,tccp->prcw[j], tccp->prch[j]); */
+                    }	/*end for*/
+                } else {
+                    for (j = 0; j < tccp->numresolutions; j++) {
+                        tccp->prcw[j] = 15;
+                        tccp->prch[j] = 15;
+                    }
+                }
+            }
+
+            dwt_calc_explicit_stepsizes(tccp, image->comps[i].prec);
+        }
+    }
 }
 
-opj_bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
-	int tileno, compno;
-	opj_cp_t *cp = NULL;
-
-	opj_tcd_t *tcd = NULL;	/* TCD component */
-
-	j2k->cio = cio;	
-	j2k->image = image;
-
-	cp = j2k->cp;
-
-	/* INDEX >> */
-	j2k->cstr_info = cstr_info;
-	if (cstr_info) {
-		int compno;
-		cstr_info->tile = (opj_tile_info_t *) opj_malloc(cp->tw * cp->th * sizeof(opj_tile_info_t));
-		cstr_info->image_w = image->x1 - image->x0;
-		cstr_info->image_h = image->y1 - image->y0;
-		cstr_info->prog = (&cp->tcps[0])->prg;
-		cstr_info->tw = cp->tw;
-		cstr_info->th = cp->th;
-		cstr_info->tile_x = cp->tdx;	/* new version parser */
-		cstr_info->tile_y = cp->tdy;	/* new version parser */
-		cstr_info->tile_Ox = cp->tx0;	/* new version parser */
-		cstr_info->tile_Oy = cp->ty0;	/* new version parser */
-		cstr_info->numcomps = image->numcomps;
-		cstr_info->numlayers = (&cp->tcps[0])->numlayers;
-		cstr_info->numdecompos = (int*) opj_malloc(image->numcomps * sizeof(int));
-		for (compno=0; compno < image->numcomps; compno++) {
-			cstr_info->numdecompos[compno] = (&cp->tcps[0])->tccps->numresolutions - 1;
-		}
-		cstr_info->D_max = 0.0;		/* ADD Marcela */
-		cstr_info->main_head_start = cio_tell(cio); /* position of SOC */
-		cstr_info->maxmarknum = 100;
-		cstr_info->marker = (opj_marker_info_t *) opj_malloc(cstr_info->maxmarknum * sizeof(opj_marker_info_t));
-		cstr_info->marknum = 0;
-	}
-	/* << INDEX */
-
-	j2k_write_soc(j2k);
-	j2k_write_siz(j2k);
-	j2k_write_cod(j2k);
-	j2k_write_qcd(j2k);
-
-	if(cp->cinema){
-		for (compno = 1; compno < image->numcomps; compno++) {
-			j2k_write_coc(j2k, compno);
-			j2k_write_qcc(j2k, compno);
-		}
-	}
-
-	for (compno = 0; compno < image->numcomps; compno++) {
-		opj_tcp_t *tcp = &cp->tcps[0];
-		if (tcp->tccps[compno].roishift)
-			j2k_write_rgn(j2k, compno, 0);
-	}
-	if (cp->comment != NULL) {
-		j2k_write_com(j2k);
-	}
-
-	j2k->totnum_tp = j2k_calculate_tp(cp,image->numcomps,image,j2k);
-	/* TLM Marker*/
-	if(cp->cinema){
-		j2k_write_tlm(j2k);
-		if (cp->cinema == CINEMA4K_24) {
-			j2k_write_poc(j2k);
-		}
-	}
-
-	/* uncomment only for testing JPSEC marker writing */
-	/* j2k_write_sec(j2k); */
-
-	/* INDEX >> */
-	if(cstr_info) {
-		cstr_info->main_head_end = cio_tell(cio) - 1;
-	}
-	/* << INDEX */
-	/**** Main Header ENDS here ***/
-
-	/* create the tile encoder */
-	tcd = tcd_create(j2k->cinfo);
-
-	/* encode each tile */
-	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
-		int pino;
-		int tilepartno=0;
-		/* UniPG>> */
-		int acc_pack_num = 0;
-		/* <<UniPG */
-
-
-		opj_tcp_t *tcp = &cp->tcps[tileno];
-		opj_event_msg(j2k->cinfo, EVT_INFO, "tile number %d / %d\n", tileno + 1, cp->tw * cp->th);
-
-		j2k->curtileno = tileno;
-		j2k->cur_tp_num = 0;
-		tcd->cur_totnum_tp = j2k->cur_totnum_tp[j2k->curtileno];
-		/* initialisation before tile encoding  */
-		if (tileno == 0) {
-			tcd_malloc_encode(tcd, image, cp, j2k->curtileno);
-		} else {
-			tcd_init_encode(tcd, image, cp, j2k->curtileno);
-		}
-
-		/* INDEX >> */
-		if(cstr_info) {
-			cstr_info->tile[j2k->curtileno].start_pos = cio_tell(cio) + j2k->pos_correction;
-			cstr_info->tile[j2k->curtileno].maxmarknum = 10;
-			cstr_info->tile[j2k->curtileno].marker = (opj_marker_info_t *) opj_malloc(cstr_info->tile[j2k->curtileno].maxmarknum * sizeof(opj_marker_info_t));
-			cstr_info->tile[j2k->curtileno].marknum = 0;
-		}
-		/* << INDEX */
-
-		for(pino = 0; pino <= tcp->numpocs; pino++) {
-			int tot_num_tp;
-			tcd->cur_pino=pino;
-
-			/*Get number of tile parts*/
-			tot_num_tp = j2k_get_num_tp(cp,pino,tileno);
-			tcd->tp_pos = cp->tp_pos;
-
-			for(tilepartno = 0; tilepartno < tot_num_tp ; tilepartno++){
-				j2k->tp_num = tilepartno;
-				/* INDEX >> */
-				if(cstr_info)
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_start_pos =
-					cio_tell(cio) + j2k->pos_correction;
-				/* << INDEX */
-				j2k_write_sot(j2k);
-
-				if(j2k->cur_tp_num == 0 && cp->cinema == 0){
-					for (compno = 1; compno < image->numcomps; compno++) {
-						j2k_write_coc(j2k, compno);
-						j2k_write_qcc(j2k, compno);
-					}
-					if (cp->tcps[tileno].numpocs) {
-						j2k_write_poc(j2k);
-					}
-				}
-
-				/* INDEX >> */
-				if(cstr_info)
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_header =
-					cio_tell(cio) + j2k->pos_correction + 1;
-				/* << INDEX */
-
-				j2k_write_sod(j2k, tcd);
-
-				/* INDEX >> */
-				if(cstr_info) {
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_pos =
-						cio_tell(cio) + j2k->pos_correction - 1;
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_start_pack =
-						acc_pack_num;
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_numpacks =
-						cstr_info->packno - acc_pack_num;
-					acc_pack_num = cstr_info->packno;
-				}
-				/* << INDEX */
-
-				j2k->cur_tp_num++;
-			}			
-		}
-		if(cstr_info) {
-			cstr_info->tile[j2k->curtileno].end_pos = cio_tell(cio) + j2k->pos_correction - 1;
-		}
-
-
-		/*
-		if (tile->PPT) { // BAD PPT !!! 
-		FILE *PPT_file;
-		int i;
-		PPT_file=fopen("PPT","rb");
-		fprintf(stderr,"%c%c%c%c",255,97,tile->len_ppt/256,tile->len_ppt%256);
-		for (i=0;i<tile->len_ppt;i++) {
-		unsigned char elmt;
-		fread(&elmt, 1, 1, PPT_file);
-		fwrite(&elmt,1,1,f);
-		}
-		fclose(PPT_file);
-		unlink("PPT");
-		}
-		*/
-
-	}
-
-	/* destroy the tile encoder */
-	tcd_free_encode(tcd);
-	tcd_destroy(tcd);
-
-	opj_free(j2k->cur_totnum_tp);
-
-	j2k_write_eoc(j2k);
-
-	if(cstr_info) {
-		cstr_info->codestream_size = cio_tell(cio) + j2k->pos_correction;
-		/* UniPG>> */
-		/* The following adjustment is done to adjust the codestream size */
-		/* if SOD is not at 0 in the buffer. Useful in case of JP2, where */
-		/* the first bunch of bytes is not in the codestream              */
-		cstr_info->codestream_size -= cstr_info->main_head_start;
-		/* <<UniPG */
-	}
+opj_bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info)
+{
+    int tileno, compno;
+    opj_cp_t *cp = NULL;
+
+    opj_tcd_t *tcd = NULL;	/* TCD component */
+
+    j2k->cio = cio;
+    j2k->image = image;
+
+    cp = j2k->cp;
+
+    /* INDEX >> */
+    j2k->cstr_info = cstr_info;
+    if (cstr_info) {
+        int compno;
+        cstr_info->tile = (opj_tile_info_t *) opj_malloc(cp->tw * cp->th * sizeof(opj_tile_info_t));
+        cstr_info->image_w = image->x1 - image->x0;
+        cstr_info->image_h = image->y1 - image->y0;
+        cstr_info->prog = (&cp->tcps[0])->prg;
+        cstr_info->tw = cp->tw;
+        cstr_info->th = cp->th;
+        cstr_info->tile_x = cp->tdx;	/* new version parser */
+        cstr_info->tile_y = cp->tdy;	/* new version parser */
+        cstr_info->tile_Ox = cp->tx0;	/* new version parser */
+        cstr_info->tile_Oy = cp->ty0;	/* new version parser */
+        cstr_info->numcomps = image->numcomps;
+        cstr_info->numlayers = (&cp->tcps[0])->numlayers;
+        cstr_info->numdecompos = (int*) opj_malloc(image->numcomps * sizeof(int));
+        for (compno=0; compno < image->numcomps; compno++) {
+            cstr_info->numdecompos[compno] = (&cp->tcps[0])->tccps->numresolutions - 1;
+        }
+        cstr_info->D_max = 0.0;		/* ADD Marcela */
+        cstr_info->main_head_start = cio_tell(cio); /* position of SOC */
+        cstr_info->maxmarknum = 100;
+        cstr_info->marker = (opj_marker_info_t *) opj_malloc(cstr_info->maxmarknum * sizeof(opj_marker_info_t));
+        cstr_info->marknum = 0;
+    }
+    /* << INDEX */
+
+    j2k_write_soc(j2k);
+    j2k_write_siz(j2k);
+    j2k_write_cod(j2k);
+    j2k_write_qcd(j2k);
+
+    if(cp->cinema) {
+        for (compno = 1; compno < image->numcomps; compno++) {
+            j2k_write_coc(j2k, compno);
+            j2k_write_qcc(j2k, compno);
+        }
+    }
+
+    for (compno = 0; compno < image->numcomps; compno++) {
+        opj_tcp_t *tcp = &cp->tcps[0];
+        if (tcp->tccps[compno].roishift)
+            j2k_write_rgn(j2k, compno, 0);
+    }
+    if (cp->comment != NULL) {
+        j2k_write_com(j2k);
+    }
+
+    j2k->totnum_tp = j2k_calculate_tp(cp,image->numcomps,image,j2k);
+    /* TLM Marker*/
+    if(cp->cinema) {
+        j2k_write_tlm(j2k);
+        if (cp->cinema == CINEMA4K_24) {
+            j2k_write_poc(j2k);
+        }
+    }
+
+    /* uncomment only for testing JPSEC marker writing */
+    /* j2k_write_sec(j2k); */
+
+    /* INDEX >> */
+    if(cstr_info) {
+        cstr_info->main_head_end = cio_tell(cio) - 1;
+    }
+    /* << INDEX */
+    /**** Main Header ENDS here ***/
+
+    /* create the tile encoder */
+    tcd = tcd_create(j2k->cinfo);
+
+    /* encode each tile */
+    for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+        int pino;
+        int tilepartno=0;
+        /* UniPG>> */
+        int acc_pack_num = 0;
+        /* <<UniPG */
+
+
+        opj_tcp_t *tcp = &cp->tcps[tileno];
+        opj_event_msg(j2k->cinfo, EVT_INFO, "tile number %d / %d\n", tileno + 1, cp->tw * cp->th);
+
+        j2k->curtileno = tileno;
+        j2k->cur_tp_num = 0;
+        tcd->cur_totnum_tp = j2k->cur_totnum_tp[j2k->curtileno];
+        /* initialisation before tile encoding  */
+        if (tileno == 0) {
+            tcd_malloc_encode(tcd, image, cp, j2k->curtileno);
+        } else {
+            tcd_init_encode(tcd, image, cp, j2k->curtileno);
+        }
+
+        /* INDEX >> */
+        if(cstr_info) {
+            cstr_info->tile[j2k->curtileno].start_pos = cio_tell(cio) + j2k->pos_correction;
+            cstr_info->tile[j2k->curtileno].maxmarknum = 10;
+            cstr_info->tile[j2k->curtileno].marker = (opj_marker_info_t *) opj_malloc(cstr_info->tile[j2k->curtileno].maxmarknum * sizeof(opj_marker_info_t));
+            cstr_info->tile[j2k->curtileno].marknum = 0;
+        }
+        /* << INDEX */
+
+        for(pino = 0; pino <= tcp->numpocs; pino++) {
+            int tot_num_tp;
+            tcd->cur_pino=pino;
+
+            /*Get number of tile parts*/
+            tot_num_tp = j2k_get_num_tp(cp,pino,tileno);
+            tcd->tp_pos = cp->tp_pos;
+
+            for(tilepartno = 0; tilepartno < tot_num_tp ; tilepartno++) {
+                j2k->tp_num = tilepartno;
+                /* INDEX >> */
+                if(cstr_info)
+                    cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_start_pos =
+                        cio_tell(cio) + j2k->pos_correction;
+                /* << INDEX */
+                j2k_write_sot(j2k);
+
+                if(j2k->cur_tp_num == 0 && cp->cinema == 0) {
+                    for (compno = 1; compno < image->numcomps; compno++) {
+                        j2k_write_coc(j2k, compno);
+                        j2k_write_qcc(j2k, compno);
+                    }
+                    if (cp->tcps[tileno].numpocs) {
+                        j2k_write_poc(j2k);
+                    }
+                }
+
+                /* INDEX >> */
+                if(cstr_info)
+                    cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_header =
+                        cio_tell(cio) + j2k->pos_correction + 1;
+                /* << INDEX */
+
+                j2k_write_sod(j2k, tcd);
+
+                /* INDEX >> */
+                if(cstr_info) {
+                    cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_pos =
+                        cio_tell(cio) + j2k->pos_correction - 1;
+                    cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_start_pack =
+                        acc_pack_num;
+                    cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_numpacks =
+                        cstr_info->packno - acc_pack_num;
+                    acc_pack_num = cstr_info->packno;
+                }
+                /* << INDEX */
+
+                j2k->cur_tp_num++;
+            }
+        }
+        if(cstr_info) {
+            cstr_info->tile[j2k->curtileno].end_pos = cio_tell(cio) + j2k->pos_correction - 1;
+        }
+
+
+        /*
+        if (tile->PPT) { // BAD PPT !!!
+        FILE *PPT_file;
+        int i;
+        PPT_file=fopen("PPT","rb");
+        fprintf(stderr,"%c%c%c%c",255,97,tile->len_ppt/256,tile->len_ppt%256);
+        for (i=0;i<tile->len_ppt;i++) {
+        unsigned char elmt;
+        fread(&elmt, 1, 1, PPT_file);
+        fwrite(&elmt,1,1,f);
+        }
+        fclose(PPT_file);
+        unlink("PPT");
+        }
+        */
+
+    }
+
+    /* destroy the tile encoder */
+    tcd_free_encode(tcd);
+    tcd_destroy(tcd);
+
+    opj_free(j2k->cur_totnum_tp);
+
+    j2k_write_eoc(j2k);
+
+    if(cstr_info) {
+        cstr_info->codestream_size = cio_tell(cio) + j2k->pos_correction;
+        /* UniPG>> */
+        /* The following adjustment is done to adjust the codestream size */
+        /* if SOD is not at 0 in the buffer. Useful in case of JP2, where */
+        /* the first bunch of bytes is not in the codestream              */
+        cstr_info->codestream_size -= cstr_info->main_head_start;
+        /* <<UniPG */
+    }
 
 #ifdef USE_JPWL
-	/*
-	preparation of JPWL marker segments
-	*/
-	if(cp->epc_on) {
+    /*
+    preparation of JPWL marker segments
+    */
+    if(cp->epc_on) {
 
-		/* encode according to JPWL */
-		jpwl_encode(j2k, cio, image);
+        /* encode according to JPWL */
+        jpwl_encode(j2k, cio, image);
 
-	}
+    }
 #endif /* USE_JPWL */
 
-	return OPJ_TRUE;
+    return OPJ_TRUE;
 }
 
-static void j2k_add_mhmarker(opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len) {
+static void j2k_add_mhmarker(opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len)
+{
 
-	if (!cstr_info)
-		return;
+    if (!cstr_info)
+        return;
 
-	/* expand the list? */
-	if ((cstr_info->marknum + 1) > cstr_info->maxmarknum) {
-		cstr_info->maxmarknum = 100 + (int) ((float) cstr_info->maxmarknum * 1.0F);
-		cstr_info->marker = (opj_marker_info_t*)opj_realloc(cstr_info->marker, cstr_info->maxmarknum);
-	}
+    /* expand the list? */
+    if ((cstr_info->marknum + 1) > cstr_info->maxmarknum) {
+        cstr_info->maxmarknum = 100 + (int) ((float) cstr_info->maxmarknum * 1.0F);
+        cstr_info->marker = (opj_marker_info_t*)opj_realloc(cstr_info->marker, cstr_info->maxmarknum);
+    }
 
-	/* add the marker */
-	cstr_info->marker[cstr_info->marknum].type = type;
-	cstr_info->marker[cstr_info->marknum].pos = pos;
-	cstr_info->marker[cstr_info->marknum].len = len;
-	cstr_info->marknum++;
+    /* add the marker */
+    cstr_info->marker[cstr_info->marknum].type = type;
+    cstr_info->marker[cstr_info->marknum].pos = pos;
+    cstr_info->marker[cstr_info->marknum].len = len;
+    cstr_info->marknum++;
 
 }
 
-static void j2k_add_tlmarker( int tileno, opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len) {
+static void j2k_add_tlmarker( int tileno, opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len)
+{
 
-  opj_marker_info_t *marker;
+    opj_marker_info_t *marker;
 
-	if (!cstr_info)
-		return;
+    if (!cstr_info)
+        return;
 
-	/* expand the list? */
-	if ((cstr_info->tile[tileno].marknum + 1) > cstr_info->tile[tileno].maxmarknum) {
-		cstr_info->tile[tileno].maxmarknum = 100 + (int) ((float) cstr_info->tile[tileno].maxmarknum * 1.0F);
-		cstr_info->tile[tileno].marker = (opj_marker_info_t*)opj_realloc(cstr_info->tile[tileno].marker, cstr_info->maxmarknum);
-	}
+    /* expand the list? */
+    if ((cstr_info->tile[tileno].marknum + 1) > cstr_info->tile[tileno].maxmarknum) {
+        cstr_info->tile[tileno].maxmarknum = 100 + (int) ((float) cstr_info->tile[tileno].maxmarknum * 1.0F);
+        cstr_info->tile[tileno].marker = (opj_marker_info_t*)opj_realloc(cstr_info->tile[tileno].marker, cstr_info->maxmarknum);
+    }
 
-	marker = &(cstr_info->tile[tileno].marker[cstr_info->tile[tileno].marknum]);
+    marker = &(cstr_info->tile[tileno].marker[cstr_info->tile[tileno].marknum]);
 
-	/* add the marker */
-	marker->type = type;
-	marker->pos = pos;
-	marker->len = len;
-	cstr_info->tile[tileno].marknum++;
+    /* add the marker */
+    marker->type = type;
+    marker->pos = pos;
+    marker->len = len;
+    cstr_info->tile[tileno].marknum++;
 }
diff --git a/src/lib/openmj2/j2k.h b/src/lib/openmj2/j2k.h
index f41bd6af..df4baa18 100644
--- a/src/lib/openmj2/j2k.h
+++ b/src/lib/openmj2/j2k.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2006-2007, Parvatha Elangovan
@@ -86,8 +86,8 @@ The functions in J2K.C have for goal to read/write the several parts of the code
 /* UniPG>> */
 #ifdef USE_JPWL
 #define J2K_MS_EPC 0xff68	/**< EPC marker value (Part 11: JPEG 2000 for Wireless) */
-#define J2K_MS_EPB 0xff66	/**< EPB marker value (Part 11: JPEG 2000 for Wireless) */ 
-#define J2K_MS_ESD 0xff67	/**< ESD marker value (Part 11: JPEG 2000 for Wireless) */ 
+#define J2K_MS_EPB 0xff66	/**< EPB marker value (Part 11: JPEG 2000 for Wireless) */
+#define J2K_MS_ESD 0xff67	/**< ESD marker value (Part 11: JPEG 2000 for Wireless) */
 #define J2K_MS_RED 0xff69	/**< RED marker value (Part 11: JPEG 2000 for Wireless) */
 #endif /* USE_JPWL */
 #ifdef USE_JPSEC
@@ -100,278 +100,278 @@ The functions in J2K.C have for goal to read/write the several parts of the code
 /* ----------------------------------------------------------------------- */
 
 /**
-Values that specify the status of the decoding process when decoding the main header. 
-These values may be combined with a | operator. 
+Values that specify the status of the decoding process when decoding the main header.
+These values may be combined with a | operator.
 */
 typedef enum J2K_STATUS {
-	J2K_STATE_MHSOC  = 0x0001, /**< a SOC marker is expected */
-	J2K_STATE_MHSIZ  = 0x0002, /**< a SIZ marker is expected */
-	J2K_STATE_MH     = 0x0004, /**< the decoding process is in the main header */
-	J2K_STATE_TPHSOT = 0x0008, /**< the decoding process is in a tile part header and expects a SOT marker */
-	J2K_STATE_TPH    = 0x0010, /**< the decoding process is in a tile part header */
-	J2K_STATE_MT     = 0x0020, /**< the EOC marker has just been read */
-	J2K_STATE_NEOC   = 0x0040, /**< the decoding process must not expect a EOC marker because the codestream is truncated */
-	J2K_STATE_ERR    = 0x0080  /**< the decoding process has encountered an error */
+    J2K_STATE_MHSOC  = 0x0001, /**< a SOC marker is expected */
+    J2K_STATE_MHSIZ  = 0x0002, /**< a SIZ marker is expected */
+    J2K_STATE_MH     = 0x0004, /**< the decoding process is in the main header */
+    J2K_STATE_TPHSOT = 0x0008, /**< the decoding process is in a tile part header and expects a SOT marker */
+    J2K_STATE_TPH    = 0x0010, /**< the decoding process is in a tile part header */
+    J2K_STATE_MT     = 0x0020, /**< the EOC marker has just been read */
+    J2K_STATE_NEOC   = 0x0040, /**< the decoding process must not expect a EOC marker because the codestream is truncated */
+    J2K_STATE_ERR    = 0x0080  /**< the decoding process has encountered an error */
 } J2K_STATUS;
 
 /* ----------------------------------------------------------------------- */
 
-/** 
-T2 encoding mode 
+/**
+T2 encoding mode
 */
 typedef enum T2_MODE {
-	THRESH_CALC = 0,	/** Function called in Rate allocation process*/
-	FINAL_PASS = 1		/** Function called in Tier 2 process*/
-}J2K_T2_MODE;
+    THRESH_CALC = 0,	/** Function called in Rate allocation process*/
+    FINAL_PASS = 1		/** Function called in Tier 2 process*/
+} J2K_T2_MODE;
 
 /**
 Quantization stepsize
 */
 typedef struct opj_stepsize {
-	/** exponent */
-	int expn;
-	/** mantissa */
-	int mant;
+    /** exponent */
+    int expn;
+    /** mantissa */
+    int mant;
 } opj_stepsize_t;
 
 /**
 Tile-component coding parameters
 */
 typedef struct opj_tccp {
-	/** coding style */
-	int csty;
-	/** number of resolutions */
-	int numresolutions;
-	/** code-blocks width */
-	int cblkw;
-	/** code-blocks height */
-	int cblkh;
-	/** code-block coding style */
-	int cblksty;
-	/** discrete wavelet transform identifier */
-	int qmfbid;
-	/** quantisation style */
-	int qntsty;
-	/** stepsizes used for quantization */
-	opj_stepsize_t stepsizes[J2K_MAXBANDS];
-	/** number of guard bits */
-	int numgbits;
-	/** Region Of Interest shift */
-	int roishift;
-	/** precinct width */
-	int prcw[J2K_MAXRLVLS];
-	/** precinct height */
-	int prch[J2K_MAXRLVLS];	
+    /** coding style */
+    int csty;
+    /** number of resolutions */
+    int numresolutions;
+    /** code-blocks width */
+    int cblkw;
+    /** code-blocks height */
+    int cblkh;
+    /** code-block coding style */
+    int cblksty;
+    /** discrete wavelet transform identifier */
+    int qmfbid;
+    /** quantisation style */
+    int qntsty;
+    /** stepsizes used for quantization */
+    opj_stepsize_t stepsizes[J2K_MAXBANDS];
+    /** number of guard bits */
+    int numgbits;
+    /** Region Of Interest shift */
+    int roishift;
+    /** precinct width */
+    int prcw[J2K_MAXRLVLS];
+    /** precinct height */
+    int prch[J2K_MAXRLVLS];
 } opj_tccp_t;
 
 /**
-Tile coding parameters : 
+Tile coding parameters :
 this structure is used to store coding/decoding parameters common to all
 tiles (information like COD, COC in main header)
 */
 typedef struct opj_tcp {
-	/** 1 : first part-tile of a tile */
-	int first;
-	/** coding style */
-	int csty;
-	/** progression order */
-	OPJ_PROG_ORDER prg;
-	/** number of layers */
-	int numlayers;
-	/** multi-component transform identifier */
-	int mct;
-	/** rates of layers */
-	float rates[100];
-	/** number of progression order changes */
-	int numpocs;
-	/** indicates if a POC marker has been used O:NO, 1:YES */
-	int POC;
-	/** progression order changes */
-	opj_poc_t pocs[32];
-	/** packet header store there for futur use in t2_decode_packet */
-	unsigned char *ppt_data;
-	/** pointer remaining on the first byte of the first header if ppt is used */
-	unsigned char *ppt_data_first;
-	/** If ppt == 1 --> there was a PPT marker for the present tile */
-	int ppt;
-	/** used in case of multiple marker PPT (number of info already stored) */
-	int ppt_store;
-	/** ppmbug1 */
-	int ppt_len;
-	/** add fixed_quality */
-	float distoratio[100];
-	/** tile-component coding parameters */
-	opj_tccp_t *tccps;
+    /** 1 : first part-tile of a tile */
+    int first;
+    /** coding style */
+    int csty;
+    /** progression order */
+    OPJ_PROG_ORDER prg;
+    /** number of layers */
+    int numlayers;
+    /** multi-component transform identifier */
+    int mct;
+    /** rates of layers */
+    float rates[100];
+    /** number of progression order changes */
+    int numpocs;
+    /** indicates if a POC marker has been used O:NO, 1:YES */
+    int POC;
+    /** progression order changes */
+    opj_poc_t pocs[32];
+    /** packet header store there for futur use in t2_decode_packet */
+    unsigned char *ppt_data;
+    /** pointer remaining on the first byte of the first header if ppt is used */
+    unsigned char *ppt_data_first;
+    /** If ppt == 1 --> there was a PPT marker for the present tile */
+    int ppt;
+    /** used in case of multiple marker PPT (number of info already stored) */
+    int ppt_store;
+    /** ppmbug1 */
+    int ppt_len;
+    /** add fixed_quality */
+    float distoratio[100];
+    /** tile-component coding parameters */
+    opj_tccp_t *tccps;
 } opj_tcp_t;
 
 /**
 Coding parameters
 */
 typedef struct opj_cp {
-	/** Digital cinema profile*/
-	OPJ_CINEMA_MODE cinema;
-	/** Maximum rate for each component. If == 0, component size limitation is not considered */
-	int max_comp_size;
-	/** Size of the image in bits*/
-	int img_size;
-	/** Rsiz*/
-	OPJ_RSIZ_CAPABILITIES rsiz;
-	/** Enabling Tile part generation*/
-	char tp_on;
-	/** Flag determining tile part generation*/
-	char tp_flag;
-	/** Position of tile part flag in progression order*/
-	int tp_pos;
-	/** allocation by rate/distortion */
-	int disto_alloc;
-	/** allocation by fixed layer */
-	int fixed_alloc;
-	/** add fixed_quality */
-	int fixed_quality;
-	/** if != 0, then original dimension divided by 2^(reduce); if == 0 or not used, image is decoded to the full resolution */
-	int reduce;
-	/** if != 0, then only the first "layer" layers are decoded; if == 0 or not used, all the quality layers are decoded */
-	int layer;
-	/** if == NO_LIMITATION, decode entire codestream; if == LIMIT_TO_MAIN_HEADER then only decode the main header */
-	OPJ_LIMIT_DECODING limit_decoding;
-	/** XTOsiz */
-	int tx0;
-	/** YTOsiz */
-	int ty0;
-	/** XTsiz */
-	int tdx;
-	/** YTsiz */
-	int tdy;
-	/** comment for coding */
-	char *comment;
-	/** number of tiles in width */
-	int tw;
-	/** number of tiles in heigth */
-	int th;
-	/** ID number of the tiles present in the codestream */
-	int *tileno;
-	/** size of the vector tileno */
-	int tileno_size;
-	/** packet header store there for futur use in t2_decode_packet */
-	unsigned char *ppm_data;
-	/** pointer remaining on the first byte of the first header if ppm is used */
-	unsigned char *ppm_data_first;
-	/** if ppm == 1 --> there was a PPM marker for the present tile */
-	int ppm;
-	/** use in case of multiple marker PPM (number of info already store) */
-	int ppm_store;
-	/** use in case of multiple marker PPM (case on non-finished previous info) */
-	int ppm_previous;
-	/** ppmbug1 */
-	int ppm_len;
-	/** tile coding parameters */
-	opj_tcp_t *tcps;
-	/** fixed layer */
-	int *matrice;
-/* UniPG>> */
+    /** Digital cinema profile*/
+    OPJ_CINEMA_MODE cinema;
+    /** Maximum rate for each component. If == 0, component size limitation is not considered */
+    int max_comp_size;
+    /** Size of the image in bits*/
+    int img_size;
+    /** Rsiz*/
+    OPJ_RSIZ_CAPABILITIES rsiz;
+    /** Enabling Tile part generation*/
+    char tp_on;
+    /** Flag determining tile part generation*/
+    char tp_flag;
+    /** Position of tile part flag in progression order*/
+    int tp_pos;
+    /** allocation by rate/distortion */
+    int disto_alloc;
+    /** allocation by fixed layer */
+    int fixed_alloc;
+    /** add fixed_quality */
+    int fixed_quality;
+    /** if != 0, then original dimension divided by 2^(reduce); if == 0 or not used, image is decoded to the full resolution */
+    int reduce;
+    /** if != 0, then only the first "layer" layers are decoded; if == 0 or not used, all the quality layers are decoded */
+    int layer;
+    /** if == NO_LIMITATION, decode entire codestream; if == LIMIT_TO_MAIN_HEADER then only decode the main header */
+    OPJ_LIMIT_DECODING limit_decoding;
+    /** XTOsiz */
+    int tx0;
+    /** YTOsiz */
+    int ty0;
+    /** XTsiz */
+    int tdx;
+    /** YTsiz */
+    int tdy;
+    /** comment for coding */
+    char *comment;
+    /** number of tiles in width */
+    int tw;
+    /** number of tiles in heigth */
+    int th;
+    /** ID number of the tiles present in the codestream */
+    int *tileno;
+    /** size of the vector tileno */
+    int tileno_size;
+    /** packet header store there for futur use in t2_decode_packet */
+    unsigned char *ppm_data;
+    /** pointer remaining on the first byte of the first header if ppm is used */
+    unsigned char *ppm_data_first;
+    /** if ppm == 1 --> there was a PPM marker for the present tile */
+    int ppm;
+    /** use in case of multiple marker PPM (number of info already store) */
+    int ppm_store;
+    /** use in case of multiple marker PPM (case on non-finished previous info) */
+    int ppm_previous;
+    /** ppmbug1 */
+    int ppm_len;
+    /** tile coding parameters */
+    opj_tcp_t *tcps;
+    /** fixed layer */
+    int *matrice;
+    /* UniPG>> */
 #ifdef USE_JPWL
-	/** enables writing of EPC in MH, thus activating JPWL */
-	opj_bool epc_on;
-	/** enables writing of EPB, in case of activated JPWL */
-	opj_bool epb_on;
-	/** enables writing of ESD, in case of activated JPWL */
-	opj_bool esd_on;
-	/** enables writing of informative techniques of ESD, in case of activated JPWL */
-	opj_bool info_on;
-	/** enables writing of RED, in case of activated JPWL */
-	opj_bool red_on;
-	/** error protection method for MH (0,1,16,32,37-128) */
-	int hprot_MH;
-	/** tile number of header protection specification (>=0) */
-	int hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** error protection methods for TPHs (0,1,16,32,37-128) */
-	int hprot_TPH[JPWL_MAX_NO_TILESPECS];
-	/** tile number of packet protection specification (>=0) */
-	int pprot_tileno[JPWL_MAX_NO_PACKSPECS];
-	/** packet number of packet protection specification (>=0) */
-	int pprot_packno[JPWL_MAX_NO_PACKSPECS];
-	/** error protection methods for packets (0,1,16,32,37-128) */
-	int pprot[JPWL_MAX_NO_PACKSPECS];
-	/** enables writing of ESD, (0/2/4 bytes) */
-	int sens_size;
-	/** sensitivity addressing size (0=auto/2/4 bytes) */
-	int sens_addr;
-	/** sensitivity range (0-3) */
-	int sens_range;
-	/** sensitivity method for MH (-1,0-7) */
-	int sens_MH;
-	/** tile number of sensitivity specification (>=0) */
-	int sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** sensitivity methods for TPHs (-1,0-7) */
-	int sens_TPH[JPWL_MAX_NO_TILESPECS];
-	/** enables JPWL correction at the decoder */
-	opj_bool correct;
-	/** expected number of components at the decoder */
-	int exp_comps;
-	/** maximum number of tiles at the decoder */
-	int max_tiles;
+    /** enables writing of EPC in MH, thus activating JPWL */
+    opj_bool epc_on;
+    /** enables writing of EPB, in case of activated JPWL */
+    opj_bool epb_on;
+    /** enables writing of ESD, in case of activated JPWL */
+    opj_bool esd_on;
+    /** enables writing of informative techniques of ESD, in case of activated JPWL */
+    opj_bool info_on;
+    /** enables writing of RED, in case of activated JPWL */
+    opj_bool red_on;
+    /** error protection method for MH (0,1,16,32,37-128) */
+    int hprot_MH;
+    /** tile number of header protection specification (>=0) */
+    int hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+    /** error protection methods for TPHs (0,1,16,32,37-128) */
+    int hprot_TPH[JPWL_MAX_NO_TILESPECS];
+    /** tile number of packet protection specification (>=0) */
+    int pprot_tileno[JPWL_MAX_NO_PACKSPECS];
+    /** packet number of packet protection specification (>=0) */
+    int pprot_packno[JPWL_MAX_NO_PACKSPECS];
+    /** error protection methods for packets (0,1,16,32,37-128) */
+    int pprot[JPWL_MAX_NO_PACKSPECS];
+    /** enables writing of ESD, (0/2/4 bytes) */
+    int sens_size;
+    /** sensitivity addressing size (0=auto/2/4 bytes) */
+    int sens_addr;
+    /** sensitivity range (0-3) */
+    int sens_range;
+    /** sensitivity method for MH (-1,0-7) */
+    int sens_MH;
+    /** tile number of sensitivity specification (>=0) */
+    int sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+    /** sensitivity methods for TPHs (-1,0-7) */
+    int sens_TPH[JPWL_MAX_NO_TILESPECS];
+    /** enables JPWL correction at the decoder */
+    opj_bool correct;
+    /** expected number of components at the decoder */
+    int exp_comps;
+    /** maximum number of tiles at the decoder */
+    int max_tiles;
 #endif /* USE_JPWL */
-/* <<UniPG */
+    /* <<UniPG */
 } opj_cp_t;
 
 /**
 JPEG-2000 codestream reader/writer
 */
 typedef struct opj_j2k {
-	/** codec context */
-	opj_common_ptr cinfo;
+    /** codec context */
+    opj_common_ptr cinfo;
 
-	/** locate in which part of the codestream the decoder is (main header, tile header, end) */
-	int state;
-	/** number of the tile curently concern by coding/decoding */
-	int curtileno;
-	/** Tile part number*/
-	int tp_num;
-	/** Tilepart number currently coding*/
-	int cur_tp_num;
-	/** Total number of tileparts of the current tile*/
-	int *cur_totnum_tp;
-	/**
-	locate the start position of the TLM marker  
-	after encoding the tilepart, a jump (in j2k_write_sod) is done to the TLM marker to store the value of its length. 
-	*/
-	int tlm_start;
-	/** Total num of tile parts in whole image = num tiles* num tileparts in each tile*/
-	/** used in TLMmarker*/
-	int totnum_tp;	
-	/** 
-	locate the position of the end of the tile in the codestream, 
-	used to detect a truncated codestream (in j2k_read_sod)
-	*/
-	unsigned char *eot;
-	/**
-	locate the start position of the SOT marker of the current coded tile:  
-	after encoding the tile, a jump (in j2k_write_sod) is done to the SOT marker to store the value of its length. 
-	*/
-	int sot_start;
-	int sod_start;
-	/**
-	as the J2K-file is written in several parts during encoding, 
-	it enables to make the right correction in position return by cio_tell
-	*/
-	int pos_correction;
-	/** array used to store the data of each tile */
-	unsigned char **tile_data;
-	/** array used to store the length of each tile */
-	int *tile_len;
-	/** 
-	decompression only : 
-	store decoding parameters common to all tiles (information like COD, COC in main header)
-	*/
-	opj_tcp_t *default_tcp;
-	/** pointer to the encoded / decoded image */
-	opj_image_t *image;
-	/** pointer to the coding parameters */
-	opj_cp_t *cp;
-	/** helper used to write the index file */
-	opj_codestream_info_t *cstr_info;
-	/** pointer to the byte i/o stream */
-	opj_cio_t *cio;
+    /** locate in which part of the codestream the decoder is (main header, tile header, end) */
+    int state;
+    /** number of the tile curently concern by coding/decoding */
+    int curtileno;
+    /** Tile part number*/
+    int tp_num;
+    /** Tilepart number currently coding*/
+    int cur_tp_num;
+    /** Total number of tileparts of the current tile*/
+    int *cur_totnum_tp;
+    /**
+    locate the start position of the TLM marker
+    after encoding the tilepart, a jump (in j2k_write_sod) is done to the TLM marker to store the value of its length.
+    */
+    int tlm_start;
+    /** Total num of tile parts in whole image = num tiles* num tileparts in each tile*/
+    /** used in TLMmarker*/
+    int totnum_tp;
+    /**
+    locate the position of the end of the tile in the codestream,
+    used to detect a truncated codestream (in j2k_read_sod)
+    */
+    unsigned char *eot;
+    /**
+    locate the start position of the SOT marker of the current coded tile:
+    after encoding the tile, a jump (in j2k_write_sod) is done to the SOT marker to store the value of its length.
+    */
+    int sot_start;
+    int sod_start;
+    /**
+    as the J2K-file is written in several parts during encoding,
+    it enables to make the right correction in position return by cio_tell
+    */
+    int pos_correction;
+    /** array used to store the data of each tile */
+    unsigned char **tile_data;
+    /** array used to store the length of each tile */
+    int *tile_len;
+    /**
+    decompression only :
+    store decoding parameters common to all tiles (information like COD, COC in main header)
+    */
+    opj_tcp_t *default_tcp;
+    /** pointer to the encoded / decoded image */
+    opj_image_t *image;
+    /** pointer to the coding parameters */
+    opj_cp_t *cp;
+    /** helper used to write the index file */
+    opj_codestream_info_t *cstr_info;
+    /** pointer to the byte i/o stream */
+    opj_cio_t *cio;
 } opj_j2k_t;
 
 /** @name Exported functions */
@@ -390,7 +390,7 @@ Destroy a J2K decompressor handle
 void j2k_destroy_decompress(opj_j2k_t *j2k);
 /**
 Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in j2k->cp. 
+Decoding parameters are returned in j2k->cp.
 @param j2k J2K decompressor handle
 @param parameters decompression parameters
 */
@@ -423,8 +423,8 @@ Destroy a J2K compressor handle
 */
 void j2k_destroy_compress(opj_j2k_t *j2k);
 /**
-Setup the encoder parameters using the current image and using user parameters. 
-Coding parameters are returned in j2k->cp. 
+Setup the encoder parameters using the current image and using user parameters.
+Coding parameters are returned in j2k->cp.
 @param j2k J2K compressor handle
 @param parameters compression parameters
 @param image input filled image
diff --git a/src/lib/openmj2/j2k_lib.c b/src/lib/openmj2/j2k_lib.c
index 1359812f..9b1d81b5 100644
--- a/src/lib/openmj2/j2k_lib.c
+++ b/src/lib/openmj2/j2k_lib.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.
  *
@@ -38,24 +38,25 @@
 #endif /* _WIN32 */
 #include "opj_includes.h"
 
-double OPJ_CALLCONV opj_clock(void) {
+double OPJ_CALLCONV opj_clock(void)
+{
 #ifdef _WIN32
-	/* _WIN32: use QueryPerformance (very accurate) */
+    /* _WIN32: use QueryPerformance (very accurate) */
     LARGE_INTEGER freq , t ;
     /* freq is the clock speed of the CPU */
     QueryPerformanceFrequency(&freq) ;
-	/* cout << "freq = " << ((double) freq.QuadPart) << endl; */
+    /* cout << "freq = " << ((double) freq.QuadPart) << endl; */
     /* t is the high resolution performance counter (see MSDN) */
     QueryPerformanceCounter ( & t ) ;
     return ( t.QuadPart /(double) freq.QuadPart ) ;
 #else
-	/* Unix or Linux: use resource usage */
+    /* Unix or Linux: use resource usage */
     struct rusage t;
     double procTime;
     /* (1) Get the rusage data structure at this moment (man getrusage) */
     getrusage(0,&t);
     /* (2) What is the elapsed time ? - CPU time = User time + System time */
-	/* (2a) Get the seconds */
+    /* (2a) Get the seconds */
     procTime = t.ru_utime.tv_sec + t.ru_stime.tv_sec;
     /* (2b) More precisely! Get the microseconds part ! */
     return ( procTime + (t.ru_utime.tv_usec + t.ru_stime.tv_usec) * 1e-6 ) ;
diff --git a/src/lib/openmj2/j2k_lib.h b/src/lib/openmj2/j2k_lib.h
index 8f4ad3af..33559a73 100644
--- a/src/lib/openmj2/j2k_lib.h
+++ b/src/lib/openmj2/j2k_lib.h
@@ -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.
  *
diff --git a/src/lib/openmj2/jp2.c b/src/lib/openmj2/jp2.c
index bb46005a..d85e9900 100644
--- a/src/lib/openmj2/jp2.c
+++ b/src/lib/openmj2/jp2.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2010-2011, Kaori Hagihara
@@ -94,11 +94,11 @@ Decode the structure of a JP2 file
 @return Returns true if successful, returns false otherwise
 */
 static opj_bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_color_t *color);
+                                opj_jp2_color_t *color);
 /**
 Apply collected palette data
 @param color Collector for profile, cdef and pclr data
-@param image 
+@param image
 */
 static void jp2_apply_pclr(opj_jp2_color_t *color, opj_image_t *image, opj_common_ptr cinfo);
 /**
@@ -110,7 +110,7 @@ Collect palette data
 @return Returns true if successful, returns false otherwise
 */
 static opj_bool jp2_read_pclr(opj_jp2_t *jp2, opj_cio_t *cio,
-    opj_jp2_box_t *box, opj_jp2_color_t *color);
+                              opj_jp2_box_t *box, opj_jp2_color_t *color);
 /**
 Collect component mapping data
 @param jp2 JP2 handle
@@ -120,7 +120,7 @@ Collect component mapping data
 @return Returns true if successful, returns false otherwise
 */
 static opj_bool jp2_read_cmap(opj_jp2_t *jp2, opj_cio_t *cio,
-    opj_jp2_box_t *box, opj_jp2_color_t *color);
+                              opj_jp2_box_t *box, opj_jp2_color_t *color);
 /**
 Collect colour specification data
 @param jp2 JP2 handle
@@ -130,183 +130,189 @@ Collect colour specification data
 @return Returns true if successful, returns false otherwise
 */
 static opj_bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio,
-    opj_jp2_box_t *box, opj_jp2_color_t *color);
+                              opj_jp2_box_t *box, opj_jp2_color_t *color);
 /*@}*/
 
 /*@}*/
 
 /* ----------------------------------------------------------------------- */
 
-static opj_bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_box_t *box) {
-	box->init_pos = cio_tell(cio);
-	box->length = cio_read(cio, 4);
-	box->type = cio_read(cio, 4);
-	if (box->length == 1) {
-		if (cio_read(cio, 4) != 0) {
-			opj_event_msg(cinfo, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
-			return OPJ_FALSE;
-		}
-		box->length = cio_read(cio, 4);
-		if (box->length == 0) 
-			box->length = cio_numbytesleft(cio) + 12;
-	}
-	else if (box->length == 0) {
-		box->length = cio_numbytesleft(cio) + 8;
-	}
-	if (box->length < 0) {
-		opj_event_msg(cinfo, EVT_ERROR, "Integer overflow in box->length\n");
-		return OPJ_FALSE; /* TODO: actually check jp2_read_boxhdr's return value */
-	}
-	
-	return OPJ_TRUE;
+static opj_bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_box_t *box)
+{
+    box->init_pos = cio_tell(cio);
+    box->length = cio_read(cio, 4);
+    box->type = cio_read(cio, 4);
+    if (box->length == 1) {
+        if (cio_read(cio, 4) != 0) {
+            opj_event_msg(cinfo, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
+            return OPJ_FALSE;
+        }
+        box->length = cio_read(cio, 4);
+        if (box->length == 0)
+            box->length = cio_numbytesleft(cio) + 12;
+    } else if (box->length == 0) {
+        box->length = cio_numbytesleft(cio) + 8;
+    }
+    if (box->length < 0) {
+        opj_event_msg(cinfo, EVT_ERROR, "Integer overflow in box->length\n");
+        return OPJ_FALSE; /* TODO: actually check jp2_read_boxhdr's return value */
+    }
+
+    return OPJ_TRUE;
 }
 
 #if 0
-static void jp2_write_url(opj_cio_t *cio, char *Idx_file) {
-	unsigned int i;
-	opj_jp2_box_t box;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_URL, 4);	/* DBTL */
-	cio_write(cio, 0, 1);		/* VERS */
-	cio_write(cio, 0, 3);		/* FLAG */
-
-	if(Idx_file) {
-		for (i = 0; i < strlen(Idx_file); i++) {
-			cio_write(cio, Idx_file[i], 1);
-		}
-	}
-
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
+static void jp2_write_url(opj_cio_t *cio, char *Idx_file)
+{
+    unsigned int i;
+    opj_jp2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio, 4);
+    cio_write(cio, JP2_URL, 4);	/* DBTL */
+    cio_write(cio, 0, 1);		/* VERS */
+    cio_write(cio, 0, 3);		/* FLAG */
+
+    if(Idx_file) {
+        for (i = 0; i < strlen(Idx_file); i++) {
+            cio_write(cio, Idx_file[i], 1);
+        }
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L */
+    cio_seek(cio, box.init_pos + box.length);
 }
 #endif
 
-static opj_bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
+static opj_bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    opj_jp2_box_t box;
 
-	opj_common_ptr cinfo = jp2->cinfo;
+    opj_common_ptr cinfo = jp2->cinfo;
 
-  if(jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
-    opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
-    return OPJ_FALSE;
-  }
-	if (JP2_IHDR != box.type) {
-		opj_event_msg(cinfo, EVT_ERROR, "Expected IHDR Marker\n");
-		return OPJ_FALSE;
-	}
+    if(jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
+        opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
+        return OPJ_FALSE;
+    }
+    if (JP2_IHDR != box.type) {
+        opj_event_msg(cinfo, EVT_ERROR, "Expected IHDR Marker\n");
+        return OPJ_FALSE;
+    }
 
-	jp2->h = cio_read(cio, 4);			/* HEIGHT */
-	jp2->w = cio_read(cio, 4);			/* WIDTH */
-	jp2->numcomps = cio_read(cio, 2);	/* NC */
-	jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
+    jp2->h = cio_read(cio, 4);			/* HEIGHT */
+    jp2->w = cio_read(cio, 4);			/* WIDTH */
+    jp2->numcomps = cio_read(cio, 2);	/* NC */
+    jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
 
-	jp2->bpc = cio_read(cio, 1);		/* BPC */
+    jp2->bpc = cio_read(cio, 1);		/* BPC */
 
-	jp2->C = cio_read(cio, 1);			/* C */
-	jp2->UnkC = cio_read(cio, 1);		/* UnkC */
-	jp2->IPR = cio_read(cio, 1);		/* IPR */
+    jp2->C = cio_read(cio, 1);			/* C */
+    jp2->UnkC = cio_read(cio, 1);		/* UnkC */
+    jp2->IPR = cio_read(cio, 1);		/* IPR */
 
-	if (cio_tell(cio) - box.init_pos != box.length) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with IHDR Box\n");
-		return OPJ_FALSE;
-	}
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cinfo, EVT_ERROR, "Error with IHDR Box\n");
+        return OPJ_FALSE;
+    }
 
-	return OPJ_TRUE;
+    return OPJ_TRUE;
 }
 
-static void jp2_write_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
+static void jp2_write_ihdr(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    opj_jp2_box_t box;
 
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_IHDR, 4);		/* IHDR */
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio, 4);
+    cio_write(cio, JP2_IHDR, 4);		/* IHDR */
 
-	cio_write(cio, jp2->h, 4);			/* HEIGHT */
-	cio_write(cio, jp2->w, 4);			/* WIDTH */
-	cio_write(cio, jp2->numcomps, 2);	/* NC */
+    cio_write(cio, jp2->h, 4);			/* HEIGHT */
+    cio_write(cio, jp2->w, 4);			/* WIDTH */
+    cio_write(cio, jp2->numcomps, 2);	/* NC */
 
-	cio_write(cio, jp2->bpc, 1);		/* BPC */
+    cio_write(cio, jp2->bpc, 1);		/* BPC */
 
-	cio_write(cio, jp2->C, 1);			/* C : Always 7 */
-	cio_write(cio, jp2->UnkC, 1);		/* UnkC, colorspace unknown */
-	cio_write(cio, jp2->IPR, 1);		/* IPR, no intellectual property */
+    cio_write(cio, jp2->C, 1);			/* C : Always 7 */
+    cio_write(cio, jp2->UnkC, 1);		/* UnkC, colorspace unknown */
+    cio_write(cio, jp2->IPR, 1);		/* IPR, no intellectual property */
 
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
-static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
-	unsigned int i;
-	opj_jp2_box_t box;
+static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    unsigned int i;
+    opj_jp2_box_t box;
 
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_BPCC, 4);	/* BPCC */
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio, 4);
+    cio_write(cio, JP2_BPCC, 4);	/* BPCC */
 
-	for (i = 0; i < jp2->numcomps; i++) {
-		cio_write(cio, jp2->comps[i].bpcc, 1);
-	}
+    for (i = 0; i < jp2->numcomps; i++) {
+        cio_write(cio, jp2->comps[i].bpcc, 1);
+    }
 
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 
-static opj_bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
-	unsigned int i;
-	opj_jp2_box_t box;
+static opj_bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    unsigned int i;
+    opj_jp2_box_t box;
 
-	opj_common_ptr cinfo = jp2->cinfo;
+    opj_common_ptr cinfo = jp2->cinfo;
 
-  if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
-    opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
-    return OPJ_FALSE;
-  }
-	if (JP2_BPCC != box.type) {
-		opj_event_msg(cinfo, EVT_ERROR, "Expected BPCC Marker\n");
-		return OPJ_FALSE;
-	}
+    if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
+        opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
+        return OPJ_FALSE;
+    }
+    if (JP2_BPCC != box.type) {
+        opj_event_msg(cinfo, EVT_ERROR, "Expected BPCC Marker\n");
+        return OPJ_FALSE;
+    }
 
-	for (i = 0; i < jp2->numcomps; i++) {
-		jp2->comps[i].bpcc = cio_read(cio, 1);
-	}
+    for (i = 0; i < jp2->numcomps; i++) {
+        jp2->comps[i].bpcc = cio_read(cio, 1);
+    }
 
-	if (cio_tell(cio) - box.init_pos != box.length) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with BPCC Box\n");
-		return OPJ_FALSE;
-	}
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cinfo, EVT_ERROR, "Error with BPCC Box\n");
+        return OPJ_FALSE;
+    }
 
-	return OPJ_TRUE;
+    return OPJ_TRUE;
 }
 
-static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
+static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    opj_jp2_box_t box;
 
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_COLR, 4);		/* COLR */
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio, 4);
+    cio_write(cio, JP2_COLR, 4);		/* COLR */
 
-	cio_write(cio, jp2->meth, 1);		/* METH */
-	cio_write(cio, jp2->precedence, 1);	/* PRECEDENCE */
-	cio_write(cio, jp2->approx, 1);		/* APPROX */
+    cio_write(cio, jp2->meth, 1);		/* METH */
+    cio_write(cio, jp2->precedence, 1);	/* PRECEDENCE */
+    cio_write(cio, jp2->approx, 1);		/* APPROX */
 
-	if(jp2->meth == 2)
-	 jp2->enumcs = 0;
+    if(jp2->meth == 2)
+        jp2->enumcs = 0;
 
-	cio_write(cio, jp2->enumcs, 4);	/* EnumCS */
+    cio_write(cio, jp2->enumcs, 4);	/* EnumCS */
 
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 static void jp2_free_pclr(opj_jp2_color_t *color)
@@ -315,656 +321,632 @@ static void jp2_free_pclr(opj_jp2_color_t *color)
     opj_free(color->jp2_pclr->channel_size);
     opj_free(color->jp2_pclr->entries);
 
-	if(color->jp2_pclr->cmap) opj_free(color->jp2_pclr->cmap);
+    if(color->jp2_pclr->cmap) opj_free(color->jp2_pclr->cmap);
 
-    opj_free(color->jp2_pclr); color->jp2_pclr = NULL;
+    opj_free(color->jp2_pclr);
+    color->jp2_pclr = NULL;
 }
 
 static void free_color_data(opj_jp2_color_t *color)
 {
-	if(color->jp2_pclr)
-   {
-	jp2_free_pclr(color);
-   }
-	if(color->jp2_cdef) 
-   {
-	if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
-	opj_free(color->jp2_cdef);
-   }
-	if(color->icc_profile_buf) opj_free(color->icc_profile_buf);
+    if(color->jp2_pclr) {
+        jp2_free_pclr(color);
+    }
+    if(color->jp2_cdef) {
+        if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
+        opj_free(color->jp2_cdef);
+    }
+    if(color->icc_profile_buf) opj_free(color->icc_profile_buf);
 }
 
 static void jp2_apply_pclr(opj_jp2_color_t *color, opj_image_t *image, opj_common_ptr cinfo)
 {
-	opj_image_comp_t *old_comps, *new_comps;
-	unsigned char *channel_size, *channel_sign;
-	unsigned int *entries;
-	opj_jp2_cmap_comp_t *cmap;
-	int *src, *dst;
-	unsigned int j, max;
-	unsigned short i, nr_channels, cmp, pcol;
-	int k, top_k;
-
-	channel_size = color->jp2_pclr->channel_size;
-	channel_sign = color->jp2_pclr->channel_sign;
-	entries = color->jp2_pclr->entries;
-	cmap = color->jp2_pclr->cmap;
-	nr_channels = color->jp2_pclr->nr_channels;
-
-	old_comps = image->comps;
-	new_comps = (opj_image_comp_t*)
-	 opj_malloc(nr_channels * sizeof(opj_image_comp_t));
-
-	for(i = 0; i < nr_channels; ++i)
-   {
-	pcol = cmap[i].pcol; cmp = cmap[i].cmp;
-
-  if( pcol < nr_channels )
-    new_comps[pcol] = old_comps[cmp];
-  else
-    {
-    opj_event_msg(cinfo, EVT_ERROR, "Error with pcol value %d (max: %d). skipping\n", pcol, nr_channels);
-    continue;
+    opj_image_comp_t *old_comps, *new_comps;
+    unsigned char *channel_size, *channel_sign;
+    unsigned int *entries;
+    opj_jp2_cmap_comp_t *cmap;
+    int *src, *dst;
+    unsigned int j, max;
+    unsigned short i, nr_channels, cmp, pcol;
+    int k, top_k;
+
+    channel_size = color->jp2_pclr->channel_size;
+    channel_sign = color->jp2_pclr->channel_sign;
+    entries = color->jp2_pclr->entries;
+    cmap = color->jp2_pclr->cmap;
+    nr_channels = color->jp2_pclr->nr_channels;
+
+    old_comps = image->comps;
+    new_comps = (opj_image_comp_t*)
+                opj_malloc(nr_channels * sizeof(opj_image_comp_t));
+
+    for(i = 0; i < nr_channels; ++i) {
+        pcol = cmap[i].pcol;
+        cmp = cmap[i].cmp;
+
+        if( pcol < nr_channels )
+            new_comps[pcol] = old_comps[cmp];
+        else {
+            opj_event_msg(cinfo, EVT_ERROR, "Error with pcol value %d (max: %d). skipping\n", pcol, nr_channels);
+            continue;
+        }
+
+        if(cmap[i].mtyp == 0) { /* Direct use */
+            old_comps[cmp].data = NULL;
+            continue;
+        }
+        /* Palette mapping: */
+        new_comps[pcol].data = (int*)
+                               opj_malloc(old_comps[cmp].w * old_comps[cmp].h * sizeof(int));
+        new_comps[pcol].prec = channel_size[i];
+        new_comps[pcol].sgnd = channel_sign[i];
+    }
+    top_k = color->jp2_pclr->nr_entries - 1;
+
+    for(i = 0; i < nr_channels; ++i) {
+        /* Direct use: */
+        if(cmap[i].mtyp == 0) continue;
+
+        /* Palette mapping: */
+        cmp = cmap[i].cmp;
+        pcol = cmap[i].pcol;
+        src = old_comps[cmp].data;
+        dst = new_comps[pcol].data;
+        max = new_comps[pcol].w * new_comps[pcol].h;
+
+        for(j = 0; j < max; ++j) {
+            /* The index */
+            if((k = src[j]) < 0) k = 0;
+            else if(k > top_k) k = top_k;
+            /* The colour */
+            dst[j] = entries[k * nr_channels + pcol];
+        }
+    }
+    max = image->numcomps;
+    for(i = 0; i < max; ++i) {
+        if(old_comps[i].data) opj_free(old_comps[i].data);
     }
+    opj_free(old_comps);
+    image->comps = new_comps;
+    image->numcomps = nr_channels;
 
-	if(cmap[i].mtyp == 0) /* Direct use */
-  {
-	old_comps[cmp].data = NULL; continue;
-  }
-/* Palette mapping: */
-	new_comps[pcol].data = (int*)
-	 opj_malloc(old_comps[cmp].w * old_comps[cmp].h * sizeof(int));
-	new_comps[pcol].prec = channel_size[i];
-	new_comps[pcol].sgnd = channel_sign[i];
-   }
-	top_k = color->jp2_pclr->nr_entries - 1;
-
-	for(i = 0; i < nr_channels; ++i)
-   {
-/* Direct use: */
-	if(cmap[i].mtyp == 0) continue;
-
-/* Palette mapping: */
-	cmp = cmap[i].cmp; pcol = cmap[i].pcol;
-	src = old_comps[cmp].data; 
-	dst = new_comps[pcol].data;
-	max = new_comps[pcol].w * new_comps[pcol].h;
-
-	for(j = 0; j < max; ++j)
-  {
-/* The index */
-	if((k = src[j]) < 0) k = 0; else if(k > top_k) k = top_k;
-/* The colour */
-	dst[j] = entries[k * nr_channels + pcol];
-  }
-   }
-	max = image->numcomps;
-	for(i = 0; i < max; ++i)
-   {
-	if(old_comps[i].data) opj_free(old_comps[i].data);
-   }
-	opj_free(old_comps);
-	image->comps = new_comps;
-	image->numcomps = nr_channels;
-
-	jp2_free_pclr(color);
+    jp2_free_pclr(color);
 
 }/* apply_pclr() */
 
 static opj_bool jp2_read_pclr(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_box_t *box, opj_jp2_color_t *color)
+                              opj_jp2_box_t *box, opj_jp2_color_t *color)
 {
-	opj_jp2_pclr_t *jp2_pclr;
-	unsigned char *channel_size, *channel_sign;
-	unsigned int *entries;
-	unsigned short nr_entries, nr_channels;
-	unsigned short i, j;
-	unsigned char uc;
-
-	OPJ_ARG_NOT_USED(box);
-	OPJ_ARG_NOT_USED(jp2);
-
-/* Part 1, I.5.3.4: 'There shall be at most one Palette box inside
- * a JP2 Header box' :
-*/
-	if(color->jp2_pclr) return OPJ_FALSE;
-
-	nr_entries = (unsigned short)cio_read(cio, 2); /* NE */
-	nr_channels = (unsigned short)cio_read(cio, 1);/* NPC */
-
-	entries = (unsigned int*)
-	 opj_malloc(nr_channels * nr_entries * sizeof(unsigned int));
-	channel_size = (unsigned char*)opj_malloc(nr_channels);
-	channel_sign = (unsigned char*)opj_malloc(nr_channels);
-
-	jp2_pclr = (opj_jp2_pclr_t*)opj_malloc(sizeof(opj_jp2_pclr_t));
-	jp2_pclr->channel_sign = channel_sign;
-	jp2_pclr->channel_size = channel_size;
-	jp2_pclr->entries = entries;
-	jp2_pclr->nr_entries = nr_entries;
-	jp2_pclr->nr_channels = nr_channels;
-	jp2_pclr->cmap = NULL;
-
-	color->jp2_pclr = jp2_pclr;
-
-	for(i = 0; i < nr_channels; ++i)
-   {
-	uc = cio_read(cio, 1); /* Bi */
-	channel_size[i] = (uc & 0x7f) + 1;
-	channel_sign[i] = (uc & 0x80)?1:0;
-   }
-
-	for(j = 0; j < nr_entries; ++j)
-   {
-	for(i = 0; i < nr_channels; ++i)
-  {
-/* Cji */
-	*entries++ = cio_read(cio, (channel_size[i]+7)>>3);
-  }
-   }
-
-	return OPJ_TRUE;
+    opj_jp2_pclr_t *jp2_pclr;
+    unsigned char *channel_size, *channel_sign;
+    unsigned int *entries;
+    unsigned short nr_entries, nr_channels;
+    unsigned short i, j;
+    unsigned char uc;
+
+    OPJ_ARG_NOT_USED(box);
+    OPJ_ARG_NOT_USED(jp2);
+
+    /* Part 1, I.5.3.4: 'There shall be at most one Palette box inside
+     * a JP2 Header box' :
+    */
+    if(color->jp2_pclr) return OPJ_FALSE;
+
+    nr_entries = (unsigned short)cio_read(cio, 2); /* NE */
+    nr_channels = (unsigned short)cio_read(cio, 1);/* NPC */
+
+    entries = (unsigned int*)
+              opj_malloc(nr_channels * nr_entries * sizeof(unsigned int));
+    channel_size = (unsigned char*)opj_malloc(nr_channels);
+    channel_sign = (unsigned char*)opj_malloc(nr_channels);
+
+    jp2_pclr = (opj_jp2_pclr_t*)opj_malloc(sizeof(opj_jp2_pclr_t));
+    jp2_pclr->channel_sign = channel_sign;
+    jp2_pclr->channel_size = channel_size;
+    jp2_pclr->entries = entries;
+    jp2_pclr->nr_entries = nr_entries;
+    jp2_pclr->nr_channels = nr_channels;
+    jp2_pclr->cmap = NULL;
+
+    color->jp2_pclr = jp2_pclr;
+
+    for(i = 0; i < nr_channels; ++i) {
+        uc = cio_read(cio, 1); /* Bi */
+        channel_size[i] = (uc & 0x7f) + 1;
+        channel_sign[i] = (uc & 0x80)?1:0;
+    }
+
+    for(j = 0; j < nr_entries; ++j) {
+        for(i = 0; i < nr_channels; ++i) {
+            /* Cji */
+            *entries++ = cio_read(cio, (channel_size[i]+7)>>3);
+        }
+    }
+
+    return OPJ_TRUE;
 }/* jp2_read_pclr() */
 
 static opj_bool jp2_read_cmap(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_box_t *box, opj_jp2_color_t *color)
+                              opj_jp2_box_t *box, opj_jp2_color_t *color)
 {
-	opj_jp2_cmap_comp_t *cmap;
-	unsigned short i, nr_channels;
+    opj_jp2_cmap_comp_t *cmap;
+    unsigned short i, nr_channels;
 
-	OPJ_ARG_NOT_USED(box);
-	OPJ_ARG_NOT_USED(jp2);
+    OPJ_ARG_NOT_USED(box);
+    OPJ_ARG_NOT_USED(jp2);
 
-/* Need nr_channels: */
-	if(color->jp2_pclr == NULL) return OPJ_FALSE;
+    /* Need nr_channels: */
+    if(color->jp2_pclr == NULL) return OPJ_FALSE;
 
-/* Part 1, I.5.3.5: 'There shall be at most one Component Mapping box
- * inside a JP2 Header box' :
-*/
-	if(color->jp2_pclr->cmap) return OPJ_FALSE;
+    /* Part 1, I.5.3.5: 'There shall be at most one Component Mapping box
+     * inside a JP2 Header box' :
+    */
+    if(color->jp2_pclr->cmap) return OPJ_FALSE;
 
-	nr_channels = color->jp2_pclr->nr_channels;
-	cmap = (opj_jp2_cmap_comp_t*)
-	 opj_malloc(nr_channels * sizeof(opj_jp2_cmap_comp_t));
+    nr_channels = color->jp2_pclr->nr_channels;
+    cmap = (opj_jp2_cmap_comp_t*)
+           opj_malloc(nr_channels * sizeof(opj_jp2_cmap_comp_t));
 
-	for(i = 0; i < nr_channels; ++i)
-   {
-	cmap[i].cmp = (unsigned short)cio_read(cio, 2);
-	cmap[i].mtyp = cio_read(cio, 1);
-	cmap[i].pcol = cio_read(cio, 1);
+    for(i = 0; i < nr_channels; ++i) {
+        cmap[i].cmp = (unsigned short)cio_read(cio, 2);
+        cmap[i].mtyp = cio_read(cio, 1);
+        cmap[i].pcol = cio_read(cio, 1);
 
-   }
-	color->jp2_pclr->cmap = cmap;
+    }
+    color->jp2_pclr->cmap = cmap;
 
-	return OPJ_TRUE;
+    return OPJ_TRUE;
 }/* jp2_read_cmap() */
 
 static void jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
 {
-	opj_jp2_cdef_info_t *info;
-	int color_space;
-	unsigned short i, n, cn, typ, asoc, acn;
+    opj_jp2_cdef_info_t *info;
+    int color_space;
+    unsigned short i, n, cn, typ, asoc, acn;
 
-	color_space = image->color_space;
-	info = color->jp2_cdef->info;
-	n = color->jp2_cdef->n;
+    color_space = image->color_space;
+    info = color->jp2_cdef->info;
+    n = color->jp2_cdef->n;
 
-	for(i = 0; i < n; ++i)
-   {
-/* WATCH: acn = asoc - 1 ! */
-	if((asoc = info[i].asoc) == 0) continue;
+    for(i = 0; i < n; ++i) {
+        /* WATCH: acn = asoc - 1 ! */
+        if((asoc = info[i].asoc) == 0) continue;
 
-	cn = info[i].cn; typ = info[i].typ; acn = asoc - 1;
+        cn = info[i].cn;
+        typ = info[i].typ;
+        acn = asoc - 1;
 
-	if(cn != acn)
-  {
-	opj_image_comp_t saved;
+        if(cn != acn) {
+            opj_image_comp_t saved;
 
-	memcpy(&saved, &image->comps[cn], sizeof(opj_image_comp_t));
-	memcpy(&image->comps[cn], &image->comps[acn], sizeof(opj_image_comp_t));
-	memcpy(&image->comps[acn], &saved, sizeof(opj_image_comp_t));
+            memcpy(&saved, &image->comps[cn], sizeof(opj_image_comp_t));
+            memcpy(&image->comps[cn], &image->comps[acn], sizeof(opj_image_comp_t));
+            memcpy(&image->comps[acn], &saved, sizeof(opj_image_comp_t));
 
-	info[i].asoc = cn + 1;
-	info[acn].asoc = info[acn].cn + 1;
-  }
-   }
-	if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
+            info[i].asoc = cn + 1;
+            info[acn].asoc = info[acn].cn + 1;
+        }
+    }
+    if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
 
-	opj_free(color->jp2_cdef); color->jp2_cdef = NULL;
+    opj_free(color->jp2_cdef);
+    color->jp2_cdef = NULL;
 
 }/* jp2_apply_cdef() */
 
 static opj_bool jp2_read_cdef(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_box_t *box, opj_jp2_color_t *color)
+                              opj_jp2_box_t *box, opj_jp2_color_t *color)
 {
-	opj_jp2_cdef_info_t *info;
-	unsigned short i, n;
+    opj_jp2_cdef_info_t *info;
+    unsigned short i, n;
 
-	OPJ_ARG_NOT_USED(box);
-	OPJ_ARG_NOT_USED(jp2);
+    OPJ_ARG_NOT_USED(box);
+    OPJ_ARG_NOT_USED(jp2);
 
-/* Part 1, I.5.3.6: 'The shall be at most one Channel Definition box
- * inside a JP2 Header box.' 
-*/
-	if(color->jp2_cdef) return OPJ_FALSE;
+    /* Part 1, I.5.3.6: 'The shall be at most one Channel Definition box
+     * inside a JP2 Header box.'
+    */
+    if(color->jp2_cdef) return OPJ_FALSE;
 
-	if((n = (unsigned short)cio_read(cio, 2)) == 0) return OPJ_FALSE; /* szukw000: FIXME */
+    if((n = (unsigned short)cio_read(cio, 2)) == 0) return OPJ_FALSE; /* szukw000: FIXME */
 
-	info = (opj_jp2_cdef_info_t*)
-	 opj_malloc(n * sizeof(opj_jp2_cdef_info_t));
+    info = (opj_jp2_cdef_info_t*)
+           opj_malloc(n * sizeof(opj_jp2_cdef_info_t));
 
-	color->jp2_cdef = (opj_jp2_cdef_t*)opj_malloc(sizeof(opj_jp2_cdef_t));
-	color->jp2_cdef->info = info;
-	color->jp2_cdef->n = n;
+    color->jp2_cdef = (opj_jp2_cdef_t*)opj_malloc(sizeof(opj_jp2_cdef_t));
+    color->jp2_cdef->info = info;
+    color->jp2_cdef->n = n;
 
-	for(i = 0; i < n; ++i)
-   {
-	info[i].cn = (unsigned short)cio_read(cio, 2);
-	info[i].typ = (unsigned short)cio_read(cio, 2);
-	info[i].asoc = (unsigned short)cio_read(cio, 2);
+    for(i = 0; i < n; ++i) {
+        info[i].cn = (unsigned short)cio_read(cio, 2);
+        info[i].typ = (unsigned short)cio_read(cio, 2);
+        info[i].asoc = (unsigned short)cio_read(cio, 2);
 
-   }
-	return OPJ_TRUE;
+    }
+    return OPJ_TRUE;
 }/* jp2_read_cdef() */
 
 static opj_bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_box_t *box, opj_jp2_color_t *color) 
+                              opj_jp2_box_t *box, opj_jp2_color_t *color)
 {
-	int skip_len;
+    int skip_len;
     opj_common_ptr cinfo;
 
-/* Part 1, I.5.3.3 : 'A conforming JP2 reader shall ignore all Colour
- * Specification boxes after the first.' 
-*/
-	if(color->jp2_has_colr) return OPJ_FALSE;
-
-	cinfo = jp2->cinfo;
-
-	jp2->meth = cio_read(cio, 1);		/* METH */
-	jp2->precedence = cio_read(cio, 1);	/* PRECEDENCE */
-	jp2->approx = cio_read(cio, 1);		/* APPROX */
-
-	if (jp2->meth == 1) 
-   {
-	jp2->enumcs = cio_read(cio, 4);	/* EnumCS */
-   } 
-	else
-	if (jp2->meth == 2) 
-   {
-/* skip PROFILE */
-	skip_len = box->init_pos + box->length - cio_tell(cio);
-	if (skip_len < 0) 
-  {
-	opj_event_msg(cinfo, EVT_ERROR, "Error with COLR box size\n");
-	return OPJ_FALSE;
-  }
-	if(skip_len > 0)
-  {
-	unsigned char *start;
-
-	start = cio_getbp(cio);
-	color->icc_profile_buf = (unsigned char*)opj_malloc(skip_len);
-	color->icc_profile_len = skip_len;
-
-	cio_skip(cio, box->init_pos + box->length - cio_tell(cio));
-
-	memcpy(color->icc_profile_buf, start, skip_len);
-  }
-   }
-
-	if (cio_tell(cio) - box->init_pos != box->length) 
-   {
-	opj_event_msg(cinfo, EVT_ERROR, "Error with COLR Box\n");
-	return OPJ_FALSE;
-   }
-	color->jp2_has_colr = 1;
-
-	return OPJ_TRUE;
+    /* Part 1, I.5.3.3 : 'A conforming JP2 reader shall ignore all Colour
+     * Specification boxes after the first.'
+    */
+    if(color->jp2_has_colr) return OPJ_FALSE;
+
+    cinfo = jp2->cinfo;
+
+    jp2->meth = cio_read(cio, 1);		/* METH */
+    jp2->precedence = cio_read(cio, 1);	/* PRECEDENCE */
+    jp2->approx = cio_read(cio, 1);		/* APPROX */
+
+    if (jp2->meth == 1) {
+        jp2->enumcs = cio_read(cio, 4);	/* EnumCS */
+    } else if (jp2->meth == 2) {
+        /* skip PROFILE */
+        skip_len = box->init_pos + box->length - cio_tell(cio);
+        if (skip_len < 0) {
+            opj_event_msg(cinfo, EVT_ERROR, "Error with COLR box size\n");
+            return OPJ_FALSE;
+        }
+        if(skip_len > 0) {
+            unsigned char *start;
+
+            start = cio_getbp(cio);
+            color->icc_profile_buf = (unsigned char*)opj_malloc(skip_len);
+            color->icc_profile_len = skip_len;
+
+            cio_skip(cio, box->init_pos + box->length - cio_tell(cio));
+
+            memcpy(color->icc_profile_buf, start, skip_len);
+        }
+    }
+
+    if (cio_tell(cio) - box->init_pos != box->length) {
+        opj_event_msg(cinfo, EVT_ERROR, "Error with COLR Box\n");
+        return OPJ_FALSE;
+    }
+    color->jp2_has_colr = 1;
+
+    return OPJ_TRUE;
 }/* jp2_read_colr() */
 
-opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color) 
+opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color)
 {
-	opj_jp2_box_t box;
-	int jp2h_end;
-
-	opj_common_ptr cinfo = jp2->cinfo;
-
-  if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
-  do {
-    if (JP2_JP2H != box.type) 
-      {
-      if (box.type == JP2_JP2C) 
-        {
-        opj_event_msg(cinfo, EVT_ERROR, "Expected JP2H Marker\n");
-        return OPJ_FALSE;
-        }
-	  if (box.length <= 8) return OPJ_FALSE;
-      cio_skip(cio, box.length - 8);
+    opj_jp2_box_t box;
+    int jp2h_end;
 
-      if(cio->bp >= cio->end) return OPJ_FALSE;
+    opj_common_ptr cinfo = jp2->cinfo;
 
-      if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
-      }
-  } while(JP2_JP2H != box.type);
+    if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+    do {
+        if (JP2_JP2H != box.type) {
+            if (box.type == JP2_JP2C) {
+                opj_event_msg(cinfo, EVT_ERROR, "Expected JP2H Marker\n");
+                return OPJ_FALSE;
+            }
+            if (box.length <= 8) return OPJ_FALSE;
+            cio_skip(cio, box.length - 8);
+
+            if(cio->bp >= cio->end) return OPJ_FALSE;
+
+            if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+        }
+    } while(JP2_JP2H != box.type);
 
-	if (!jp2_read_ihdr(jp2, cio))
-		return OPJ_FALSE;
-	jp2h_end = box.init_pos + box.length;
+    if (!jp2_read_ihdr(jp2, cio))
+        return OPJ_FALSE;
+    jp2h_end = box.init_pos + box.length;
 
-  if (jp2->bpc == 255) 
-    {
-    if (!jp2_read_bpcc(jp2, cio))
-      return OPJ_FALSE;
+    if (jp2->bpc == 255) {
+        if (!jp2_read_bpcc(jp2, cio))
+            return OPJ_FALSE;
     }
-  if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
-
-  while(cio_tell(cio) < jp2h_end)
-    {
-    if(box.type == JP2_COLR)
-      {
-      if( !jp2_read_colr(jp2, cio, &box, color))
-        {
-        if (box.length <= 8) return OPJ_FALSE;
-        cio_seek(cio, box.init_pos + 8);
-        cio_skip(cio, box.length - 8);
+    if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+
+    while(cio_tell(cio) < jp2h_end) {
+        if(box.type == JP2_COLR) {
+            if( !jp2_read_colr(jp2, cio, &box, color)) {
+                if (box.length <= 8) return OPJ_FALSE;
+                cio_seek(cio, box.init_pos + 8);
+                cio_skip(cio, box.length - 8);
+            }
+            if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+            continue;
         }
-      if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
-      continue;
-      }
-    if(box.type == JP2_CDEF && !jp2->ignore_pclr_cmap_cdef)
-      {
-      if( !jp2_read_cdef(jp2, cio, &box, color))
-        {
-        if (box.length <= 8) return OPJ_FALSE;
-        cio_seek(cio, box.init_pos + 8);
-        cio_skip(cio, box.length - 8);
+        if(box.type == JP2_CDEF && !jp2->ignore_pclr_cmap_cdef) {
+            if( !jp2_read_cdef(jp2, cio, &box, color)) {
+                if (box.length <= 8) return OPJ_FALSE;
+                cio_seek(cio, box.init_pos + 8);
+                cio_skip(cio, box.length - 8);
+            }
+            if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+            continue;
         }
-      if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
-      continue;
-      }
-    if(box.type == JP2_PCLR && !jp2->ignore_pclr_cmap_cdef)
-      {
-      if( !jp2_read_pclr(jp2, cio, &box, color))
-        {
-        if (box.length <= 8) return OPJ_FALSE;
-        cio_seek(cio, box.init_pos + 8);
-        cio_skip(cio, box.length - 8);
+        if(box.type == JP2_PCLR && !jp2->ignore_pclr_cmap_cdef) {
+            if( !jp2_read_pclr(jp2, cio, &box, color)) {
+                if (box.length <= 8) return OPJ_FALSE;
+                cio_seek(cio, box.init_pos + 8);
+                cio_skip(cio, box.length - 8);
+            }
+            if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+            continue;
+        }
+        if(box.type == JP2_CMAP && !jp2->ignore_pclr_cmap_cdef) {
+            if( !jp2_read_cmap(jp2, cio, &box, color)) {
+                if (box.length <= 8) return OPJ_FALSE;
+                cio_seek(cio, box.init_pos + 8);
+                cio_skip(cio, box.length - 8);
+            }
+            if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+            continue;
         }
-      if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
-      continue;
-      }
-    if(box.type == JP2_CMAP && !jp2->ignore_pclr_cmap_cdef)
-      {
-      if( !jp2_read_cmap(jp2, cio, &box, color))
-        {
         if (box.length <= 8) return OPJ_FALSE;
         cio_seek(cio, box.init_pos + 8);
         cio_skip(cio, box.length - 8);
-        }
-      if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
-      continue;
-      }
-    if (box.length <= 8) return OPJ_FALSE;
-    cio_seek(cio, box.init_pos + 8);
-    cio_skip(cio, box.length - 8);
-    if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+        if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
 
     }/* while(cio_tell(cio) < box_end) */
 
-  cio_seek(cio, jp2h_end);
+    cio_seek(cio, jp2h_end);
 
-  /* Part 1, I.5.3.3 : 'must contain at least one' */
-  return (color->jp2_has_colr == 1);
+    /* Part 1, I.5.3.3 : 'must contain at least one' */
+    return (color->jp2_has_colr == 1);
 
 }/* jp2_read_jp2h() */
 
-opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, 
-	opj_codestream_info_t *cstr_info) 
+opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio,
+                            opj_codestream_info_t *cstr_info)
 {
-	opj_common_ptr cinfo;
-	opj_image_t *image = NULL;
-	opj_jp2_color_t color;
-
-	if(!jp2 || !cio) 
-   {
-	return NULL;
-   }
-	memset(&color, 0, sizeof(opj_jp2_color_t));
-	cinfo = jp2->cinfo;
-
-/* JP2 decoding */
-	if(!jp2_read_struct(jp2, cio, &color)) 
-   {
-	free_color_data(&color);
-	opj_event_msg(cinfo, EVT_ERROR, "Failed to decode jp2 structure\n");
-	return NULL;
-   }
-
-/* J2K decoding */
-	image = j2k_decode(jp2->j2k, cio, cstr_info);
-
-	if(!image) 
-   {
-	free_color_data(&color);
-	opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n");
-	return NULL;
-   }
-   
-    if (!jp2->ignore_pclr_cmap_cdef){
-
-    /* Set Image Color Space */
-	if (jp2->enumcs == 16)
-		image->color_space = CLRSPC_SRGB;
-	else if (jp2->enumcs == 17)
-		image->color_space = CLRSPC_GRAY;
-	else if (jp2->enumcs == 18)
-		image->color_space = CLRSPC_SYCC;
-	else
-		image->color_space = CLRSPC_UNKNOWN;
-
-	if(color.jp2_cdef)
-   {
-	jp2_apply_cdef(image, &color);
-   }
-	if(color.jp2_pclr)
-   {
-/* Part 1, I.5.3.4: Either both or none : */
-	if( !color.jp2_pclr->cmap) 
-	 jp2_free_pclr(&color);
-	else
-	 jp2_apply_pclr(&color, image, cinfo);
-   }
-	if(color.icc_profile_buf)
-   {
-	image->icc_profile_buf = color.icc_profile_buf;
-	color.icc_profile_buf = NULL;
-	image->icc_profile_len = color.icc_profile_len;
-   }
-   }
-   
-	return image;
+    opj_common_ptr cinfo;
+    opj_image_t *image = NULL;
+    opj_jp2_color_t color;
+
+    if(!jp2 || !cio) {
+        return NULL;
+    }
+    memset(&color, 0, sizeof(opj_jp2_color_t));
+    cinfo = jp2->cinfo;
+
+    /* JP2 decoding */
+    if(!jp2_read_struct(jp2, cio, &color)) {
+        free_color_data(&color);
+        opj_event_msg(cinfo, EVT_ERROR, "Failed to decode jp2 structure\n");
+        return NULL;
+    }
+
+    /* J2K decoding */
+    image = j2k_decode(jp2->j2k, cio, cstr_info);
+
+    if(!image) {
+        free_color_data(&color);
+        opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n");
+        return NULL;
+    }
+
+    if (!jp2->ignore_pclr_cmap_cdef) {
+
+        /* Set Image Color Space */
+        if (jp2->enumcs == 16)
+            image->color_space = CLRSPC_SRGB;
+        else if (jp2->enumcs == 17)
+            image->color_space = CLRSPC_GRAY;
+        else if (jp2->enumcs == 18)
+            image->color_space = CLRSPC_SYCC;
+        else
+            image->color_space = CLRSPC_UNKNOWN;
+
+        if(color.jp2_cdef) {
+            jp2_apply_cdef(image, &color);
+        }
+        if(color.jp2_pclr) {
+            /* Part 1, I.5.3.4: Either both or none : */
+            if( !color.jp2_pclr->cmap)
+                jp2_free_pclr(&color);
+            else
+                jp2_apply_pclr(&color, image, cinfo);
+        }
+        if(color.icc_profile_buf) {
+            image->icc_profile_buf = color.icc_profile_buf;
+            color.icc_profile_buf = NULL;
+            image->icc_profile_len = color.icc_profile_len;
+        }
+    }
+
+    return image;
 
 }/* opj_jp2_decode() */
 
 
-void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
+void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    opj_jp2_box_t box;
 
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_JP2H, 4);	/* JP2H */
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio, 4);
+    cio_write(cio, JP2_JP2H, 4);	/* JP2H */
 
-	jp2_write_ihdr(jp2, cio);
+    jp2_write_ihdr(jp2, cio);
 
-	if (jp2->bpc == 255) {
-		jp2_write_bpcc(jp2, cio);
-	}
-	jp2_write_colr(jp2, cio);
+    if (jp2->bpc == 255) {
+        jp2_write_bpcc(jp2, cio);
+    }
+    jp2_write_colr(jp2, cio);
 
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
-static void jp2_write_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
-	unsigned int i;
-	opj_jp2_box_t box;
+static void jp2_write_ftyp(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    unsigned int i;
+    opj_jp2_box_t box;
 
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_FTYP, 4);		/* FTYP */
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio, 4);
+    cio_write(cio, JP2_FTYP, 4);		/* FTYP */
 
-	cio_write(cio, jp2->brand, 4);		/* BR */
-	cio_write(cio, jp2->minversion, 4);	/* MinV */
+    cio_write(cio, jp2->brand, 4);		/* BR */
+    cio_write(cio, jp2->minversion, 4);	/* MinV */
 
-	for (i = 0; i < jp2->numcl; i++) {
-		cio_write(cio, jp2->cl[i], 4);	/* CL */
-	}
+    for (i = 0; i < jp2->numcl; i++) {
+        cio_write(cio, jp2->cl[i], 4);	/* CL */
+    }
 
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
-static opj_bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
-	int i;
-	opj_jp2_box_t box;
+static opj_bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    int i;
+    opj_jp2_box_t box;
 
-	opj_common_ptr cinfo = jp2->cinfo;
+    opj_common_ptr cinfo = jp2->cinfo;
 
-  if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
-    opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
-    return OPJ_FALSE;
-  }
-	if (JP2_FTYP != box.type) {
-		opj_event_msg(cinfo, EVT_ERROR, "Expected FTYP Marker\n");
-		return OPJ_FALSE;
-	}
+    if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
+        opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
+        return OPJ_FALSE;
+    }
+    if (JP2_FTYP != box.type) {
+        opj_event_msg(cinfo, EVT_ERROR, "Expected FTYP Marker\n");
+        return OPJ_FALSE;
+    }
 
-	jp2->brand = cio_read(cio, 4);		/* BR */
-	jp2->minversion = cio_read(cio, 4);	/* MinV */
-	jp2->numcl = (box.length - 16) / 4;
-	jp2->cl = (unsigned int *) opj_malloc(jp2->numcl * sizeof(unsigned int));
+    jp2->brand = cio_read(cio, 4);		/* BR */
+    jp2->minversion = cio_read(cio, 4);	/* MinV */
+    jp2->numcl = (box.length - 16) / 4;
+    jp2->cl = (unsigned int *) opj_malloc(jp2->numcl * sizeof(unsigned int));
 
-	for (i = 0; i < (int)jp2->numcl; i++) {
-		jp2->cl[i] = cio_read(cio, 4);	/* CLi */
-	}
+    for (i = 0; i < (int)jp2->numcl; i++) {
+        jp2->cl[i] = cio_read(cio, 4);	/* CLi */
+    }
 
-	if (cio_tell(cio) - box.init_pos != box.length) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with FTYP Box\n");
-		return OPJ_FALSE;
-	}
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cinfo, EVT_ERROR, "Error with FTYP Box\n");
+        return OPJ_FALSE;
+    }
 
-	return OPJ_TRUE;
+    return OPJ_TRUE;
 }
 
-static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
-	unsigned int j2k_codestream_offset, j2k_codestream_length;
-	opj_jp2_box_t box;
+static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info)
+{
+    unsigned int j2k_codestream_offset, j2k_codestream_length;
+    opj_jp2_box_t box;
 
-	opj_j2k_t *j2k = jp2->j2k;
+    opj_j2k_t *j2k = jp2->j2k;
 
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_JP2C, 4);	/* JP2C */
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio, 4);
+    cio_write(cio, JP2_JP2C, 4);	/* JP2C */
 
-	/* J2K encoding */
-	j2k_codestream_offset = cio_tell(cio);
-	if(!j2k_encode(j2k, cio, image, cstr_info)) {
-		opj_event_msg(j2k->cinfo, EVT_ERROR, "Failed to encode image\n");
-		return 0;
-	}
-	j2k_codestream_length = cio_tell(cio) - j2k_codestream_offset;
+    /* J2K encoding */
+    j2k_codestream_offset = cio_tell(cio);
+    if(!j2k_encode(j2k, cio, image, cstr_info)) {
+        opj_event_msg(j2k->cinfo, EVT_ERROR, "Failed to encode image\n");
+        return 0;
+    }
+    j2k_codestream_length = cio_tell(cio) - j2k_codestream_offset;
 
-	jp2->j2k_codestream_offset = j2k_codestream_offset;
-	jp2->j2k_codestream_length = j2k_codestream_length;
+    jp2->j2k_codestream_offset = j2k_codestream_offset;
+    jp2->j2k_codestream_length = j2k_codestream_length;
 
-	box.length = 8 + jp2->j2k_codestream_length;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
+    box.length = 8 + jp2->j2k_codestream_length;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L */
+    cio_seek(cio, box.init_pos + box.length);
 
-	return box.length;
+    return box.length;
 }
 
-static opj_bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset) {
-	opj_jp2_box_t box;
+static opj_bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset)
+{
+    opj_jp2_box_t box;
 
-	opj_common_ptr cinfo = jp2->cinfo;
+    opj_common_ptr cinfo = jp2->cinfo;
 
-  if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
-    opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
-    return OPJ_FALSE;
-  }
-	do {
-		if(JP2_JP2C != box.type) {
-			if (box.length <= 8) return OPJ_FALSE;
-			cio_skip(cio, box.length - 8);
-			if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
-		}
-	} while(JP2_JP2C != box.type);
+    if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
+        opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
+        return OPJ_FALSE;
+    }
+    do {
+        if(JP2_JP2C != box.type) {
+            if (box.length <= 8) return OPJ_FALSE;
+            cio_skip(cio, box.length - 8);
+            if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+        }
+    } while(JP2_JP2C != box.type);
 
-	*j2k_codestream_offset = cio_tell(cio);
-	if (box.length <= 8) return OPJ_FALSE;
-	*j2k_codestream_length = box.length - 8;
+    *j2k_codestream_offset = cio_tell(cio);
+    if (box.length <= 8) return OPJ_FALSE;
+    *j2k_codestream_length = box.length - 8;
 
-	return OPJ_TRUE;
+    return OPJ_TRUE;
 }
 
-static void jp2_write_jp(opj_cio_t *cio) {
-	opj_jp2_box_t box;
+static void jp2_write_jp(opj_cio_t *cio)
+{
+    opj_jp2_box_t box;
 
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_JP, 4);		/* JP2 signature */
-	cio_write(cio, 0x0d0a870a, 4);
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio, 4);
+    cio_write(cio, JP2_JP, 4);		/* JP2 signature */
+    cio_write(cio, 0x0d0a870a, 4);
 
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
-static opj_bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
-
-	opj_common_ptr cinfo = jp2->cinfo;
-
-  if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
-    opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
-    return OPJ_FALSE;
-  }
-	if (JP2_JP != box.type) {
-		opj_event_msg(cinfo, EVT_ERROR, "Expected JP Marker\n");
-		return OPJ_FALSE;
-	}
-	if (0x0d0a870a != cio_read(cio, 4)) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with JP Marker\n");
-		return OPJ_FALSE;
-	}
-	if (cio_tell(cio) - box.init_pos != box.length) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with JP Box size\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
+static opj_bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio)
+{
+    opj_jp2_box_t box;
+
+    opj_common_ptr cinfo = jp2->cinfo;
+
+    if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
+        opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
+        return OPJ_FALSE;
+    }
+    if (JP2_JP != box.type) {
+        opj_event_msg(cinfo, EVT_ERROR, "Expected JP Marker\n");
+        return OPJ_FALSE;
+    }
+    if (0x0d0a870a != cio_read(cio, 4)) {
+        opj_event_msg(cinfo, EVT_ERROR, "Error with JP Marker\n");
+        return OPJ_FALSE;
+    }
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cinfo, EVT_ERROR, "Error with JP Box size\n");
+        return OPJ_FALSE;
+    }
+
+    return OPJ_TRUE;
 }
 
 
 static opj_bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_color_t *color) {
-	if (!jp2_read_jp(jp2, cio))
-		return OPJ_FALSE;
-	if (!jp2_read_ftyp(jp2, cio))
-		return OPJ_FALSE;
-	if (!jp2_read_jp2h(jp2, cio, color))
-		return OPJ_FALSE;
-	if (!jp2_read_jp2c(jp2, cio, &jp2->j2k_codestream_length, &jp2->j2k_codestream_offset))
-		return OPJ_FALSE;
-	
-	return OPJ_TRUE;
+                                opj_jp2_color_t *color)
+{
+    if (!jp2_read_jp(jp2, cio))
+        return OPJ_FALSE;
+    if (!jp2_read_ftyp(jp2, cio))
+        return OPJ_FALSE;
+    if (!jp2_read_jp2h(jp2, cio, color))
+        return OPJ_FALSE;
+    if (!jp2_read_jp2c(jp2, cio, &jp2->j2k_codestream_length, &jp2->j2k_codestream_offset))
+        return OPJ_FALSE;
+
+    return OPJ_TRUE;
 }
 
 
@@ -974,159 +956,166 @@ static opj_bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio,
 /* JP2 decoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo) {
-	opj_jp2_t *jp2 = (opj_jp2_t*) opj_calloc(1, sizeof(opj_jp2_t));
-	if(jp2) {
-		jp2->cinfo = cinfo;
-		/* create the J2K codec */
-		jp2->j2k = j2k_create_decompress(cinfo);
-		if(jp2->j2k == NULL) {
-			jp2_destroy_decompress(jp2);
-			return NULL;
-		}
-	}
-	return jp2;
+opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo)
+{
+    opj_jp2_t *jp2 = (opj_jp2_t*) opj_calloc(1, sizeof(opj_jp2_t));
+    if(jp2) {
+        jp2->cinfo = cinfo;
+        /* create the J2K codec */
+        jp2->j2k = j2k_create_decompress(cinfo);
+        if(jp2->j2k == NULL) {
+            jp2_destroy_decompress(jp2);
+            return NULL;
+        }
+    }
+    return jp2;
 }
 
-void jp2_destroy_decompress(opj_jp2_t *jp2) {
-	if(jp2) {
-		/* destroy the J2K codec */
-		j2k_destroy_decompress(jp2->j2k);
-
-		if(jp2->comps) {
-			opj_free(jp2->comps);
-		}
-		if(jp2->cl) {
-			opj_free(jp2->cl);
-		}
-		opj_free(jp2);
-	}
+void jp2_destroy_decompress(opj_jp2_t *jp2)
+{
+    if(jp2) {
+        /* destroy the J2K codec */
+        j2k_destroy_decompress(jp2->j2k);
+
+        if(jp2->comps) {
+            opj_free(jp2->comps);
+        }
+        if(jp2->cl) {
+            opj_free(jp2->cl);
+        }
+        opj_free(jp2);
+    }
 }
 
-void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters) {
-	/* setup the J2K codec */
-	j2k_setup_decoder(jp2->j2k, parameters);
-	/* further JP2 initializations go here */
-	jp2->ignore_pclr_cmap_cdef = parameters->flags & OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters)
+{
+    /* setup the J2K codec */
+    j2k_setup_decoder(jp2->j2k, parameters);
+    /* further JP2 initializations go here */
+    jp2->ignore_pclr_cmap_cdef = parameters->flags & OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
 }
 
 /* ----------------------------------------------------------------------- */
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-opj_jp2_t* jp2_create_compress(opj_common_ptr cinfo) {
-	opj_jp2_t *jp2 = (opj_jp2_t*)opj_malloc(sizeof(opj_jp2_t));
-	if(jp2) {
-		jp2->cinfo = cinfo;
-		/* create the J2K codec */
-		jp2->j2k = j2k_create_compress(cinfo);
-		if(jp2->j2k == NULL) {
-			jp2_destroy_compress(jp2);
-			return NULL;
-		}
-	}
-	return jp2;
+opj_jp2_t* jp2_create_compress(opj_common_ptr cinfo)
+{
+    opj_jp2_t *jp2 = (opj_jp2_t*)opj_malloc(sizeof(opj_jp2_t));
+    if(jp2) {
+        jp2->cinfo = cinfo;
+        /* create the J2K codec */
+        jp2->j2k = j2k_create_compress(cinfo);
+        if(jp2->j2k == NULL) {
+            jp2_destroy_compress(jp2);
+            return NULL;
+        }
+    }
+    return jp2;
 }
 
-void jp2_destroy_compress(opj_jp2_t *jp2) {
-	if(jp2) {
-		/* destroy the J2K codec */
-		j2k_destroy_compress(jp2->j2k);
-
-		if(jp2->comps) {
-			opj_free(jp2->comps);
-		}
-		if(jp2->cl) {
-			opj_free(jp2->cl);
-		}
-		opj_free(jp2);
-	}
+void jp2_destroy_compress(opj_jp2_t *jp2)
+{
+    if(jp2) {
+        /* destroy the J2K codec */
+        j2k_destroy_compress(jp2->j2k);
+
+        if(jp2->comps) {
+            opj_free(jp2->comps);
+        }
+        if(jp2->cl) {
+            opj_free(jp2->cl);
+        }
+        opj_free(jp2);
+    }
 }
 
-void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_t *image) {
-	int i;
-	int depth_0, sign;
-
-	if(!jp2 || !parameters || !image)
-		return;
-
-	/* setup the J2K codec */
-	/* ------------------- */
-
-	/* Check if number of components respects standard */
-	if (image->numcomps < 1 || image->numcomps > 16384) {
-		opj_event_msg(jp2->cinfo, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
-		return;
-	}
-
-	j2k_setup_encoder(jp2->j2k, parameters, image);
-
-	/* setup the JP2 codec */
-	/* ------------------- */
-	
-	/* Profile box */
-
-	jp2->brand = JP2_JP2;	/* BR */
-	jp2->minversion = 0;	/* MinV */
-	jp2->numcl = 1;
-	jp2->cl = (unsigned int*) opj_malloc(jp2->numcl * sizeof(unsigned int));
-	jp2->cl[0] = JP2_JP2;	/* CL0 : JP2 */
-
-	/* Image Header box */
-
-	jp2->numcomps = image->numcomps;	/* NC */
-	jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
-	jp2->h = image->y1 - image->y0;		/* HEIGHT */
-	jp2->w = image->x1 - image->x0;		/* WIDTH */
-	/* BPC */
-	depth_0 = image->comps[0].prec - 1;
-	sign = image->comps[0].sgnd;
-	jp2->bpc = depth_0 + (sign << 7);
-	for (i = 1; i < image->numcomps; i++) {
-		int depth = image->comps[i].prec - 1;
-		sign = image->comps[i].sgnd;
-		if (depth_0 != depth)
-			jp2->bpc = 255;
-	}
-	jp2->C = 7;			/* C : Always 7 */
-	jp2->UnkC = 0;		/* UnkC, colorspace specified in colr box */
-	jp2->IPR = 0;		/* IPR, no intellectual property */
-	
-	/* BitsPerComponent box */
-
-	for (i = 0; i < image->numcomps; i++) {
-		jp2->comps[i].bpcc = image->comps[i].prec - 1 + (image->comps[i].sgnd << 7);
-	}
-	jp2->meth = 1;
-	if (image->color_space == 1)
-		jp2->enumcs = 16;	/* sRGB as defined by IEC 61966-2.1 */
-	else if (image->color_space == 2)
-		jp2->enumcs = 17;	/* greyscale */
-	else if (image->color_space == 3)
-		jp2->enumcs = 18;	/* YUV */
-	jp2->precedence = 0;	/* PRECEDENCE */
-	jp2->approx = 0;		/* APPROX */
+void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_t *image)
+{
+    int i;
+    int depth_0, sign;
+
+    if(!jp2 || !parameters || !image)
+        return;
+
+    /* setup the J2K codec */
+    /* ------------------- */
+
+    /* Check if number of components respects standard */
+    if (image->numcomps < 1 || image->numcomps > 16384) {
+        opj_event_msg(jp2->cinfo, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
+        return;
+    }
+
+    j2k_setup_encoder(jp2->j2k, parameters, image);
+
+    /* setup the JP2 codec */
+    /* ------------------- */
+
+    /* Profile box */
+
+    jp2->brand = JP2_JP2;	/* BR */
+    jp2->minversion = 0;	/* MinV */
+    jp2->numcl = 1;
+    jp2->cl = (unsigned int*) opj_malloc(jp2->numcl * sizeof(unsigned int));
+    jp2->cl[0] = JP2_JP2;	/* CL0 : JP2 */
+
+    /* Image Header box */
+
+    jp2->numcomps = image->numcomps;	/* NC */
+    jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
+    jp2->h = image->y1 - image->y0;		/* HEIGHT */
+    jp2->w = image->x1 - image->x0;		/* WIDTH */
+    /* BPC */
+    depth_0 = image->comps[0].prec - 1;
+    sign = image->comps[0].sgnd;
+    jp2->bpc = depth_0 + (sign << 7);
+    for (i = 1; i < image->numcomps; i++) {
+        int depth = image->comps[i].prec - 1;
+        sign = image->comps[i].sgnd;
+        if (depth_0 != depth)
+            jp2->bpc = 255;
+    }
+    jp2->C = 7;			/* C : Always 7 */
+    jp2->UnkC = 0;		/* UnkC, colorspace specified in colr box */
+    jp2->IPR = 0;		/* IPR, no intellectual property */
+
+    /* BitsPerComponent box */
+
+    for (i = 0; i < image->numcomps; i++) {
+        jp2->comps[i].bpcc = image->comps[i].prec - 1 + (image->comps[i].sgnd << 7);
+    }
+    jp2->meth = 1;
+    if (image->color_space == 1)
+        jp2->enumcs = 16;	/* sRGB as defined by IEC 61966-2.1 */
+    else if (image->color_space == 2)
+        jp2->enumcs = 17;	/* greyscale */
+    else if (image->color_space == 3)
+        jp2->enumcs = 18;	/* YUV */
+    jp2->precedence = 0;	/* PRECEDENCE */
+    jp2->approx = 0;		/* APPROX */
 }
 
-opj_bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
+opj_bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info)
+{
 
-	int pos_iptr, pos_jp2c, len_jp2c;
-	pos_jp2c = pos_iptr = -1; /* remove a warning */
+    int pos_iptr, pos_jp2c, len_jp2c;
+    pos_jp2c = pos_iptr = -1; /* remove a warning */
 
-	/* JP2 encoding */
+    /* JP2 encoding */
 
-	/* JPEG 2000 Signature box */
-	jp2_write_jp(cio);
-	/* File Type box */
-	jp2_write_ftyp(jp2, cio);
-	/* JP2 Header box */
-	jp2_write_jp2h(jp2, cio);
+    /* JPEG 2000 Signature box */
+    jp2_write_jp(cio);
+    /* File Type box */
+    jp2_write_ftyp(jp2, cio);
+    /* JP2 Header box */
+    jp2_write_jp2h(jp2, cio);
 
-	/* J2K encoding */
-	if(!(len_jp2c = jp2_write_jp2c( jp2, cio, image, cstr_info))){
-	    opj_event_msg(jp2->cinfo, EVT_ERROR, "Failed to encode image\n");
-	    return OPJ_FALSE;
-	}
+    /* J2K encoding */
+    if(!(len_jp2c = jp2_write_jp2c( jp2, cio, image, cstr_info))) {
+        opj_event_msg(jp2->cinfo, EVT_ERROR, "Failed to encode image\n");
+        return OPJ_FALSE;
+    }
 
-	return OPJ_TRUE;
+    return OPJ_TRUE;
 }
diff --git a/src/lib/openmj2/jp2.h b/src/lib/openmj2/jp2.h
index fbd17a4d..74363f4e 100644
--- a/src/lib/openmj2/jp2.h
+++ b/src/lib/openmj2/jp2.h
@@ -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.
  *
@@ -57,37 +57,33 @@
 #define JP2_CDEF 0x63646566		/**< Channel Definition box */
 
 /* ----------------------------------------------------------------------- */
-/** 
+/**
 Channel description: channel index, type, association
 */
-typedef struct opj_jp2_cdef_info
-{
+typedef struct opj_jp2_cdef_info {
     unsigned short cn, typ, asoc;
 } opj_jp2_cdef_info_t;
 
-/** 
+/**
 Channel descriptions and number of descriptions
 */
-typedef struct opj_jp2_cdef
-{
+typedef struct opj_jp2_cdef {
     opj_jp2_cdef_info_t *info;
     unsigned short n;
 } opj_jp2_cdef_t;
 
-/** 
+/**
 Component mappings: channel index, mapping type, palette index
 */
-typedef struct opj_jp2_cmap_comp
-{
+typedef struct opj_jp2_cmap_comp {
     unsigned short cmp;
     unsigned char mtyp, pcol;
 } opj_jp2_cmap_comp_t;
 
-/** 
+/**
 Palette data: table entries, palette columns
 */
-typedef struct opj_jp2_pclr
-{
+typedef struct opj_jp2_pclr {
     unsigned int *entries;
     unsigned char *channel_sign;
     unsigned char *channel_size;
@@ -95,11 +91,10 @@ typedef struct opj_jp2_pclr
     unsigned short nr_entries, nr_channels;
 } opj_jp2_pclr_t;
 
-/** 
-Collector for ICC profile, palette, component mapping, channel description 
+/**
+Collector for ICC profile, palette, component mapping, channel description
 */
-typedef struct opj_jp2_color
-{
+typedef struct opj_jp2_color {
     unsigned char *icc_profile_buf;
     int icc_profile_len;
 
@@ -108,51 +103,51 @@ typedef struct opj_jp2_color
     unsigned char jp2_has_colr;
 } opj_jp2_color_t;
 
-/** 
+/**
 JP2 component
 */
 typedef struct opj_jp2_comps {
-  int depth;		  
-  int sgnd;		   
-  int bpcc;
+    int depth;
+    int sgnd;
+    int bpcc;
 } opj_jp2_comps_t;
 
 /**
 JPEG-2000 file format reader/writer
 */
 typedef struct opj_jp2 {
-	/** codec context */
-	opj_common_ptr cinfo;
-	/** handle to the J2K codec  */
-	opj_j2k_t *j2k;
-	unsigned int w;
-	unsigned int h;
-	unsigned int numcomps;
-	unsigned int bpc;
-	unsigned int C;
-	unsigned int UnkC;
-	unsigned int IPR;
-	unsigned int meth;
-	unsigned int approx;
-	unsigned int enumcs;
-	unsigned int precedence;
-	unsigned int brand;
-	unsigned int minversion;
-	unsigned int numcl;
-	unsigned int *cl;
-	opj_jp2_comps_t *comps;
-	unsigned int j2k_codestream_offset;
-	unsigned int j2k_codestream_length;
-	opj_bool ignore_pclr_cmap_cdef;
+    /** codec context */
+    opj_common_ptr cinfo;
+    /** handle to the J2K codec  */
+    opj_j2k_t *j2k;
+    unsigned int w;
+    unsigned int h;
+    unsigned int numcomps;
+    unsigned int bpc;
+    unsigned int C;
+    unsigned int UnkC;
+    unsigned int IPR;
+    unsigned int meth;
+    unsigned int approx;
+    unsigned int enumcs;
+    unsigned int precedence;
+    unsigned int brand;
+    unsigned int minversion;
+    unsigned int numcl;
+    unsigned int *cl;
+    opj_jp2_comps_t *comps;
+    unsigned int j2k_codestream_offset;
+    unsigned int j2k_codestream_length;
+    opj_bool ignore_pclr_cmap_cdef;
 } opj_jp2_t;
 
 /**
 JP2 Box
 */
 typedef struct opj_jp2_box {
-  int length;
-  int type;
-  int init_pos;
+    int length;
+    int type;
+    int init_pos;
 } opj_jp2_box_t;
 
 /** @name Exported functions */
@@ -185,7 +180,7 @@ Destroy a JP2 decompressor handle
 void jp2_destroy_decompress(opj_jp2_t *jp2);
 /**
 Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in jp2->j2k->cp. 
+Decoding parameters are returned in jp2->j2k->cp.
 @param jp2 JP2 decompressor handle
 @param parameters decompression parameters
 */
@@ -210,8 +205,8 @@ Destroy a JP2 compressor handle
 */
 void jp2_destroy_compress(opj_jp2_t *jp2);
 /**
-Setup the encoder parameters using the current image and using user parameters. 
-Coding parameters are returned in jp2->j2k->cp. 
+Setup the encoder parameters using the current image and using user parameters.
+Coding parameters are returned in jp2->j2k->cp.
 @param jp2 JP2 compressor handle
 @param parameters compression parameters
 @param image input filled image
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);
+    }
 }
diff --git a/src/lib/openmj2/jpt.h b/src/lib/openmj2/jpt.h
index f974432d..578ccb46 100644
--- a/src/lib/openmj2/jpt.h
+++ b/src/lib/openmj2/jpt.h
@@ -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.
  *
@@ -38,33 +38,33 @@
 @file jpt.h
 @brief JPT-stream reader (JPEG 2000, JPIP)
 
-JPT-stream functions are implemented in J2K.C. 
+JPT-stream functions are implemented in J2K.C.
 */
 
 /**
 Message Header JPT stream structure
 */
 typedef struct opj_jpt_msg_header {
-	/** In-class Identifier */
-	unsigned int Id;
-	/** Last byte information */
-	unsigned int last_byte;	
-	/** Class Identifier */
-	unsigned int Class_Id;	
-	/** CSn : index identifier */
-	unsigned int CSn_Id;
-	/** Message offset */
-	unsigned int Msg_offset;
-	/** Message length */
-	unsigned int Msg_length;
-	/** Auxiliary for JPP case */
-	unsigned int Layer_nb;
+    /** In-class Identifier */
+    unsigned int Id;
+    /** Last byte information */
+    unsigned int last_byte;
+    /** Class Identifier */
+    unsigned int Class_Id;
+    /** CSn : index identifier */
+    unsigned int CSn_Id;
+    /** Message offset */
+    unsigned int Msg_offset;
+    /** Message length */
+    unsigned int Msg_length;
+    /** Auxiliary for JPP case */
+    unsigned int Layer_nb;
 } opj_jpt_msg_header_t;
 
 /* ----------------------------------------------------------------------- */
 
 /**
-Initialize the value of the message header structure 
+Initialize the value of the message header structure
 @param header Message header structure
 */
 void jpt_init_msg_header(opj_jpt_msg_header_t * header);
diff --git a/src/lib/openmj2/mct.c b/src/lib/openmj2/mct.c
index 0f926194..24291721 100644
--- a/src/lib/openmj2/mct.c
+++ b/src/lib/openmj2/mct.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -55,142 +55,144 @@ static const double mct_norms_real[3] = { 1.732, 1.805, 1.573 };
 /* Forward reversible MCT. */
 /* </summary> */
 void mct_encode(
-		int* restrict c0,
-		int* restrict c1,
-		int* restrict c2,
-		int n)
+    int* restrict c0,
+    int* restrict c1,
+    int* restrict c2,
+    int n)
 {
-	int i;
-	for(i = 0; i < n; ++i) {
-		int r = c0[i];
-		int g = c1[i];
-		int b = c2[i];
-		int y = (r + (g * 2) + b) >> 2;
-		int u = b - g;
-		int v = r - g;
-		c0[i] = y;
-		c1[i] = u;
-		c2[i] = v;
-	}
+    int i;
+    for(i = 0; i < n; ++i) {
+        int r = c0[i];
+        int g = c1[i];
+        int b = c2[i];
+        int y = (r + (g * 2) + b) >> 2;
+        int u = b - g;
+        int v = r - g;
+        c0[i] = y;
+        c1[i] = u;
+        c2[i] = v;
+    }
 }
 
 /* <summary> */
 /* Inverse reversible MCT. */
 /* </summary> */
 void mct_decode(
-		int* restrict c0,
-		int* restrict c1, 
-		int* restrict c2, 
-		int n)
+    int* restrict c0,
+    int* restrict c1,
+    int* restrict c2,
+    int n)
 {
-	int i;
-	for (i = 0; i < n; ++i) {
-		int y = c0[i];
-		int u = c1[i];
-		int v = c2[i];
-		int g = y - ((u + v) >> 2);
-		int r = v + g;
-		int b = u + g;
-		c0[i] = r;
-		c1[i] = g;
-		c2[i] = b;
-	}
+    int i;
+    for (i = 0; i < n; ++i) {
+        int y = c0[i];
+        int u = c1[i];
+        int v = c2[i];
+        int g = y - ((u + v) >> 2);
+        int r = v + g;
+        int b = u + g;
+        c0[i] = r;
+        c1[i] = g;
+        c2[i] = b;
+    }
 }
 
 /* <summary> */
 /* Get norm of basis function of reversible MCT. */
 /* </summary> */
-double mct_getnorm(int compno) {
-	return mct_norms[compno];
+double mct_getnorm(int compno)
+{
+    return mct_norms[compno];
 }
 
 /* <summary> */
 /* Forward irreversible MCT. */
 /* </summary> */
 void mct_encode_real(
-		int* restrict c0,
-		int* restrict c1,
-		int* restrict c2,
-		int n)
+    int* restrict c0,
+    int* restrict c1,
+    int* restrict c2,
+    int n)
 {
-	int i;
-	for(i = 0; i < n; ++i) {
-		int r = c0[i];
-		int g = c1[i];
-		int b = c2[i];
-		int y =  fix_mul(r, 2449) + fix_mul(g, 4809) + fix_mul(b, 934);
-		int u = -fix_mul(r, 1382) - fix_mul(g, 2714) + fix_mul(b, 4096);
-		int v =  fix_mul(r, 4096) - fix_mul(g, 3430) - fix_mul(b, 666);
-		c0[i] = y;
-		c1[i] = u;
-		c2[i] = v;
-	}
+    int i;
+    for(i = 0; i < n; ++i) {
+        int r = c0[i];
+        int g = c1[i];
+        int b = c2[i];
+        int y =  fix_mul(r, 2449) + fix_mul(g, 4809) + fix_mul(b, 934);
+        int u = -fix_mul(r, 1382) - fix_mul(g, 2714) + fix_mul(b, 4096);
+        int v =  fix_mul(r, 4096) - fix_mul(g, 3430) - fix_mul(b, 666);
+        c0[i] = y;
+        c1[i] = u;
+        c2[i] = v;
+    }
 }
 
 /* <summary> */
 /* Inverse irreversible MCT. */
 /* </summary> */
 void mct_decode_real(
-		float* restrict c0,
-		float* restrict c1,
-		float* restrict c2,
-		int n)
+    float* restrict c0,
+    float* restrict c1,
+    float* restrict c2,
+    int n)
 {
-	int i;
+    int i;
 #ifdef __SSE__
-	__m128 vrv, vgu, vgv, vbu;
-	vrv = _mm_set1_ps(1.402f);
-	vgu = _mm_set1_ps(0.34413f);
-	vgv = _mm_set1_ps(0.71414f);
-	vbu = _mm_set1_ps(1.772f);
-	for (i = 0; i < (n >> 3); ++i) {
-		__m128 vy, vu, vv;
-		__m128 vr, vg, vb;
+    __m128 vrv, vgu, vgv, vbu;
+    vrv = _mm_set1_ps(1.402f);
+    vgu = _mm_set1_ps(0.34413f);
+    vgv = _mm_set1_ps(0.71414f);
+    vbu = _mm_set1_ps(1.772f);
+    for (i = 0; i < (n >> 3); ++i) {
+        __m128 vy, vu, vv;
+        __m128 vr, vg, vb;
 
-		vy = _mm_load_ps(c0);
-		vu = _mm_load_ps(c1);
-		vv = _mm_load_ps(c2);
-		vr = _mm_add_ps(vy, _mm_mul_ps(vv, vrv));
-		vg = _mm_sub_ps(_mm_sub_ps(vy, _mm_mul_ps(vu, vgu)), _mm_mul_ps(vv, vgv));
-		vb = _mm_add_ps(vy, _mm_mul_ps(vu, vbu));
-		_mm_store_ps(c0, vr);
-		_mm_store_ps(c1, vg);
-		_mm_store_ps(c2, vb);
-		c0 += 4;
-		c1 += 4;
-		c2 += 4;
+        vy = _mm_load_ps(c0);
+        vu = _mm_load_ps(c1);
+        vv = _mm_load_ps(c2);
+        vr = _mm_add_ps(vy, _mm_mul_ps(vv, vrv));
+        vg = _mm_sub_ps(_mm_sub_ps(vy, _mm_mul_ps(vu, vgu)), _mm_mul_ps(vv, vgv));
+        vb = _mm_add_ps(vy, _mm_mul_ps(vu, vbu));
+        _mm_store_ps(c0, vr);
+        _mm_store_ps(c1, vg);
+        _mm_store_ps(c2, vb);
+        c0 += 4;
+        c1 += 4;
+        c2 += 4;
 
-		vy = _mm_load_ps(c0);
-		vu = _mm_load_ps(c1);
-		vv = _mm_load_ps(c2);
-		vr = _mm_add_ps(vy, _mm_mul_ps(vv, vrv));
-		vg = _mm_sub_ps(_mm_sub_ps(vy, _mm_mul_ps(vu, vgu)), _mm_mul_ps(vv, vgv));
-		vb = _mm_add_ps(vy, _mm_mul_ps(vu, vbu));
-		_mm_store_ps(c0, vr);
-		_mm_store_ps(c1, vg);
-		_mm_store_ps(c2, vb);
-		c0 += 4;
-		c1 += 4;
-		c2 += 4;
-	}
-	n &= 7;
+        vy = _mm_load_ps(c0);
+        vu = _mm_load_ps(c1);
+        vv = _mm_load_ps(c2);
+        vr = _mm_add_ps(vy, _mm_mul_ps(vv, vrv));
+        vg = _mm_sub_ps(_mm_sub_ps(vy, _mm_mul_ps(vu, vgu)), _mm_mul_ps(vv, vgv));
+        vb = _mm_add_ps(vy, _mm_mul_ps(vu, vbu));
+        _mm_store_ps(c0, vr);
+        _mm_store_ps(c1, vg);
+        _mm_store_ps(c2, vb);
+        c0 += 4;
+        c1 += 4;
+        c2 += 4;
+    }
+    n &= 7;
 #endif
-	for(i = 0; i < n; ++i) {
-		float y = c0[i];
-		float u = c1[i];
-		float v = c2[i];
-		float r = y + (v * 1.402f);
-		float g = y - (u * 0.34413f) - (v * (0.71414f));
-		float b = y + (u * 1.772f);
-		c0[i] = r;
-		c1[i] = g;
-		c2[i] = b;
-	}
+    for(i = 0; i < n; ++i) {
+        float y = c0[i];
+        float u = c1[i];
+        float v = c2[i];
+        float r = y + (v * 1.402f);
+        float g = y - (u * 0.34413f) - (v * (0.71414f));
+        float b = y + (u * 1.772f);
+        c0[i] = r;
+        c1[i] = g;
+        c2[i] = b;
+    }
 }
 
 /* <summary> */
 /* Get norm of basis function of irreversible MCT. */
 /* </summary> */
-double mct_getnorm_real(int compno) {
-	return mct_norms_real[compno];
+double mct_getnorm_real(int compno)
+{
+    return mct_norms_real[compno];
 }
diff --git a/src/lib/openmj2/mct.h b/src/lib/openmj2/mct.h
index 08f18474..3c1e1b79 100644
--- a/src/lib/openmj2/mct.h
+++ b/src/lib/openmj2/mct.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -70,7 +70,7 @@ void mct_decode(int *c0, int *c1, int *c2, int n);
 /**
 Get norm of the basis function used for the reversible multi-component transform
 @param compno Number of the component (0->Y, 1->U, 2->V)
-@return 
+@return
 */
 double mct_getnorm(int compno);
 
@@ -93,7 +93,7 @@ void mct_decode_real(float* c0, float* c1, float* c2, int n);
 /**
 Get norm of the basis function used for the irreversible multi-component transform
 @param compno Number of the component (0->Y, 1->U, 2->V)
-@return 
+@return
 */
 double mct_getnorm_real(int compno);
 /* ----------------------------------------------------------------------- */
diff --git a/src/lib/openmj2/mj2.c b/src/lib/openmj2/mj2.c
index b9034a30..de982a24 100644
--- a/src/lib/openmj2/mj2.c
+++ b/src/lib/openmj2/mj2.c
@@ -1,12 +1,12 @@
 /*
- * 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.
  *
  * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2014, Professor Benoit Macq
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,38 +41,37 @@
 /*@{*/
 
 /*
-* 
+*
 * Read box headers
 *
 */
 
 int mj2_read_boxhdr(mj2_box_t * box, opj_cio_t *cio)
 {
-  box->init_pos = cio_tell(cio);
-  box->length = cio_read(cio, 4);
-  box->type = cio_read(cio, 4);
-  if (box->length == 1) {
-    if (cio_read(cio, 4) != 0) {
-      opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Cannot handle box sizes higher than 2^32\n");
-      return 1;
-    };
+    box->init_pos = cio_tell(cio);
     box->length = cio_read(cio, 4);
-    if (box->length == 0) 
-      box->length = cio_numbytesleft(cio) + 12;
-  }
-  else if (box->length == 0) {
-    box->length = cio_numbytesleft(cio) + 8;
-  }
-  return 0;
+    box->type = cio_read(cio, 4);
+    if (box->length == 1) {
+        if (cio_read(cio, 4) != 0) {
+            opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Cannot handle box sizes higher than 2^32\n");
+            return 1;
+        };
+        box->length = cio_read(cio, 4);
+        if (box->length == 0)
+            box->length = cio_numbytesleft(cio) + 12;
+    } else if (box->length == 0) {
+        box->length = cio_numbytesleft(cio) + 8;
+    }
+    return 0;
 }
 
 /*
-* 
-* Initialisation of a Standard Movie, given a simple movie structure defined by the user 
+*
+* Initialisation of a Standard Movie, given a simple movie structure defined by the user
 * The movie will have one sample per chunk
-* 
+*
 * Arguments: opj_mj2_t * movie
-* Several variables of "movie" must be defined in order to enable a correct execution of 
+* Several variables of "movie" must be defined in order to enable a correct execution of
 * this function:
 *   - The number of tracks of each type (movie->num_vtk, movie->num_stk, movie->num_htk)
 *   - The memory for each must be allocated (movie->tk)
@@ -85,137 +84,136 @@ int mj2_read_boxhdr(mj2_box_t * box, opj_cio_t *cio)
 
 int OPJ_CALLCONV mj2_init_stdmovie(opj_mj2_t * movie)
 {
-  mj2_tk_t *tk0;
-  int i, w, h, prec;
-  unsigned int j;
-  time_t ltime;
-	
-  movie->brand = MJ2_MJ2;
-  movie->minversion = 0;
-  movie->num_cl = 2;
-  movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
-
-  movie->cl[0] = MJ2_MJ2;
-  movie->cl[1] = MJ2_MJ2S;
-  time(&ltime);			/* Time since 1/1/70 */
-  movie->creation_time = (unsigned int) ltime + 2082844800;	/* Seconds between 1/1/04 and 1/1/70 */
-  movie->timescale = 1000;
-	
-  movie->rate = 1 << 16;		/* Rate to play presentation  (default = 0x00010000)          */
-  movie->volume = 1 << 8;		/* Movie volume (default = 0x0100)                            */
-  movie->trans_matrix[0] = 0x00010000;	/* Transformation matrix for video                            */
-  movie->trans_matrix[1] = 0;	/* Unity is { 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 }  */
-  movie->trans_matrix[2] = 0;
-  movie->trans_matrix[3] = 0;
-  movie->trans_matrix[4] = 0x00010000;
-  movie->trans_matrix[5] = 0;
-  movie->trans_matrix[6] = 0;
-  movie->trans_matrix[7] = 0;
-  movie->trans_matrix[8] = 0x40000000;
-  movie->next_tk_id = 1;
-
-  tk0 = &movie->tk[0];
-  w = tk0->w; h = tk0->h; prec = tk0->depth;
-
-	for (i = 0; i < movie->num_htk + movie->num_stk + movie->num_vtk; i++) 
-   {
-    mj2_tk_t *tk = &movie->tk[i];
-
-    movie->next_tk_id++;
-    tk->jp2_struct.comps = NULL;
-    tk->jp2_struct.cl = NULL;
-  
-    if (tk->track_type == 0) /* no sound or hint track */
-   {
-    if (tk->num_samples == 0)
-				return 1;
-			
-    tk->w = w; tk->h = h; tk->depth = prec;
-      tk->Dim[0] = 0;
-      tk->Dim[1] = 0;
-			
-      tk->timescale = 1000;	/* Timescale = 1 ms                                          */
-			
-      tk->chunk[0].num_samples = 1;
-      tk->chunk[0].sample_descr_idx = 1;
-			
-      tk->same_sample_size = 0;
-			
-      tk->num_samplestochunk = 1;	/* One sample per chunk  */
-		tk->sampletochunk = (mj2_sampletochunk_t*) opj_malloc(tk->num_samplestochunk * sizeof(mj2_sampletochunk_t));
-      tk->sampletochunk[0].first_chunk = 1;
-      tk->sampletochunk[0].samples_per_chunk = 1;
-      tk->sampletochunk[0].sample_descr_idx = 1;
-      
-      if (tk->sample_rate == 0) 
-  {
-	opj_event_msg(tk->cinfo, EVT_ERROR,
-	"Error while initializing MJ2 movie: Sample rate of track"
-	" %d must be different from zero\n", tk->track_ID);
-	return 1;
-  }
-			
-      for (j = 0; j < tk->num_samples; j++) 
-  {
-	tk->sample[j].sample_delta = tk->timescale / tk->sample_rate;
-  }
-			
-      tk->num_tts = 1;
-		tk->tts = (mj2_tts_t*) opj_malloc(tk->num_tts * sizeof(mj2_tts_t));
-      tk->tts[0].sample_count = tk->num_samples;
-      tk->tts[0].sample_delta = tk->timescale / tk->sample_rate;
-			
-      tk->horizresolution = 0x00480000;	/* Horizontal resolution (typically 72)                       */
-      tk->vertresolution = 0x00480000;	/* Vertical resolution (typically 72)                         */
-      tk->compressorname[0] = 0x0f4d6f74;	/* Compressor Name[]: Motion JPEG2000                         */
-      tk->compressorname[1] = 0x696f6e20;
-      tk->compressorname[2] = 0x4a504547;
-      tk->compressorname[3] = 0x32303030;
-      tk->compressorname[4] = 0x00120000;
-      tk->compressorname[5] = 0;
-      tk->compressorname[6] = 0x00000042;
-      tk->compressorname[7] = 0x000000DC;
-      tk->num_url = 0;		/* Number of URL                                              */
-      tk->num_urn = 0;		/* Number of URN                                              */
-      tk->graphicsmode = 0;	/* Graphicsmode                                               */
-      tk->opcolor[0] = 0;	/* OpColor                                                    */
-      tk->opcolor[1] = 0;	/* OpColor                                                    */
-      tk->opcolor[2] = 0;	/* OpColor                                                    */
-      tk->creation_time = movie->creation_time;	/* Seconds between 1/1/04 and 1/1/70          */
-      tk->language = 0;		/* Language (undefined)					      */
-      tk->layer = 0;
-      tk->volume = 1 << 8;		/* Movie volume (default = 0x0100) */
-      tk->trans_matrix[0] = 0x00010000;	/* Transformation matrix for track */
-      tk->trans_matrix[1] = 0;	/* Unity is { 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 }  */
-      tk->trans_matrix[2] = 0;
-      tk->trans_matrix[3] = 0;
-      tk->trans_matrix[4] = 0x00010000;
-      tk->trans_matrix[5] = 0;
-      tk->trans_matrix[6] = 0;
-      tk->trans_matrix[7] = 0;
-      tk->trans_matrix[8] = 0x40000000;
-      tk->fieldcount = 1;
-      tk->fieldorder = 0;
-      tk->or_fieldcount = 1;
-      tk->or_fieldorder = 0;
-      tk->num_br = 2;
-		tk->br = (unsigned int*) opj_malloc(tk->num_br * sizeof(unsigned int));
-      tk->br[0] = MJ2_JP2;
-      tk->br[1] = MJ2_J2P0;
-      tk->num_jp2x = 0;
-      tk->hsub = 2;		/* 4:2:0                                                      */
-      tk->vsub = 2;		/* 4:2:0                                                      */
-      tk->hoff = 0;
-      tk->voff = 0;
-      tk->visual_w = tk->w << 16;
-      tk->visual_h = tk->h << 16;
-    }
-    else {
-      tk->num_br = 0;
-      tk->jp2xdata = NULL;
+    mj2_tk_t *tk0;
+    int i, w, h, prec;
+    unsigned int j;
+    time_t ltime;
+
+    movie->brand = MJ2_MJ2;
+    movie->minversion = 0;
+    movie->num_cl = 2;
+    movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
+
+    movie->cl[0] = MJ2_MJ2;
+    movie->cl[1] = MJ2_MJ2S;
+    time(&ltime);			/* Time since 1/1/70 */
+    movie->creation_time = (unsigned int) ltime + 2082844800;	/* Seconds between 1/1/04 and 1/1/70 */
+    movie->timescale = 1000;
+
+    movie->rate = 1 << 16;		/* Rate to play presentation  (default = 0x00010000)          */
+    movie->volume = 1 << 8;		/* Movie volume (default = 0x0100)                            */
+    movie->trans_matrix[0] = 0x00010000;	/* Transformation matrix for video                            */
+    movie->trans_matrix[1] = 0;	/* Unity is { 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 }  */
+    movie->trans_matrix[2] = 0;
+    movie->trans_matrix[3] = 0;
+    movie->trans_matrix[4] = 0x00010000;
+    movie->trans_matrix[5] = 0;
+    movie->trans_matrix[6] = 0;
+    movie->trans_matrix[7] = 0;
+    movie->trans_matrix[8] = 0x40000000;
+    movie->next_tk_id = 1;
+
+    tk0 = &movie->tk[0];
+    w = tk0->w;
+    h = tk0->h;
+    prec = tk0->depth;
+
+    for (i = 0; i < movie->num_htk + movie->num_stk + movie->num_vtk; i++) {
+        mj2_tk_t *tk = &movie->tk[i];
+
+        movie->next_tk_id++;
+        tk->jp2_struct.comps = NULL;
+        tk->jp2_struct.cl = NULL;
+
+        if (tk->track_type == 0) { /* no sound or hint track */
+            if (tk->num_samples == 0)
+                return 1;
+
+            tk->w = w;
+            tk->h = h;
+            tk->depth = prec;
+            tk->Dim[0] = 0;
+            tk->Dim[1] = 0;
+
+            tk->timescale = 1000;	/* Timescale = 1 ms                                          */
+
+            tk->chunk[0].num_samples = 1;
+            tk->chunk[0].sample_descr_idx = 1;
+
+            tk->same_sample_size = 0;
+
+            tk->num_samplestochunk = 1;	/* One sample per chunk  */
+            tk->sampletochunk = (mj2_sampletochunk_t*) opj_malloc(tk->num_samplestochunk * sizeof(mj2_sampletochunk_t));
+            tk->sampletochunk[0].first_chunk = 1;
+            tk->sampletochunk[0].samples_per_chunk = 1;
+            tk->sampletochunk[0].sample_descr_idx = 1;
+
+            if (tk->sample_rate == 0) {
+                opj_event_msg(tk->cinfo, EVT_ERROR,
+                              "Error while initializing MJ2 movie: Sample rate of track"
+                              " %d must be different from zero\n", tk->track_ID);
+                return 1;
+            }
+
+            for (j = 0; j < tk->num_samples; j++) {
+                tk->sample[j].sample_delta = tk->timescale / tk->sample_rate;
+            }
+
+            tk->num_tts = 1;
+            tk->tts = (mj2_tts_t*) opj_malloc(tk->num_tts * sizeof(mj2_tts_t));
+            tk->tts[0].sample_count = tk->num_samples;
+            tk->tts[0].sample_delta = tk->timescale / tk->sample_rate;
+
+            tk->horizresolution = 0x00480000;	/* Horizontal resolution (typically 72)                       */
+            tk->vertresolution = 0x00480000;	/* Vertical resolution (typically 72)                         */
+            tk->compressorname[0] = 0x0f4d6f74;	/* Compressor Name[]: Motion JPEG2000                         */
+            tk->compressorname[1] = 0x696f6e20;
+            tk->compressorname[2] = 0x4a504547;
+            tk->compressorname[3] = 0x32303030;
+            tk->compressorname[4] = 0x00120000;
+            tk->compressorname[5] = 0;
+            tk->compressorname[6] = 0x00000042;
+            tk->compressorname[7] = 0x000000DC;
+            tk->num_url = 0;		/* Number of URL                                              */
+            tk->num_urn = 0;		/* Number of URN                                              */
+            tk->graphicsmode = 0;	/* Graphicsmode                                               */
+            tk->opcolor[0] = 0;	/* OpColor                                                    */
+            tk->opcolor[1] = 0;	/* OpColor                                                    */
+            tk->opcolor[2] = 0;	/* OpColor                                                    */
+            tk->creation_time = movie->creation_time;	/* Seconds between 1/1/04 and 1/1/70          */
+            tk->language = 0;		/* Language (undefined)					      */
+            tk->layer = 0;
+            tk->volume = 1 << 8;		/* Movie volume (default = 0x0100) */
+            tk->trans_matrix[0] = 0x00010000;	/* Transformation matrix for track */
+            tk->trans_matrix[1] = 0;	/* Unity is { 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 }  */
+            tk->trans_matrix[2] = 0;
+            tk->trans_matrix[3] = 0;
+            tk->trans_matrix[4] = 0x00010000;
+            tk->trans_matrix[5] = 0;
+            tk->trans_matrix[6] = 0;
+            tk->trans_matrix[7] = 0;
+            tk->trans_matrix[8] = 0x40000000;
+            tk->fieldcount = 1;
+            tk->fieldorder = 0;
+            tk->or_fieldcount = 1;
+            tk->or_fieldorder = 0;
+            tk->num_br = 2;
+            tk->br = (unsigned int*) opj_malloc(tk->num_br * sizeof(unsigned int));
+            tk->br[0] = MJ2_JP2;
+            tk->br[1] = MJ2_J2P0;
+            tk->num_jp2x = 0;
+            tk->hsub = 2;		/* 4:2:0                                                      */
+            tk->vsub = 2;		/* 4:2:0                                                      */
+            tk->hoff = 0;
+            tk->voff = 0;
+            tk->visual_w = tk->w << 16;
+            tk->visual_h = tk->h << 16;
+        } else {
+            tk->num_br = 0;
+            tk->jp2xdata = NULL;
+        }
     }
-  }
-  return 0;
+    return 0;
 }
 
 /*
@@ -224,19 +222,19 @@ int OPJ_CALLCONV mj2_init_stdmovie(opj_mj2_t * movie)
 */
 void mj2_tts_decompact(mj2_tk_t * tk)
 {
-  int i, j;
-  tk->num_samples = 0;
-  for (i = 0; i < tk->num_tts; i++) {
-    tk->num_samples += tk->tts[i].sample_count;
-  }
+    int i, j;
+    tk->num_samples = 0;
+    for (i = 0; i < tk->num_tts; i++) {
+        tk->num_samples += tk->tts[i].sample_count;
+    }
 
-  tk->sample = (mj2_sample_t*) opj_malloc(tk->num_samples * sizeof(mj2_sample_t));
+    tk->sample = (mj2_sample_t*) opj_malloc(tk->num_samples * sizeof(mj2_sample_t));
 
-  for (i = 0; i < tk->num_tts; i++) {
-    for (j = 0; j < tk->tts[i].sample_count; j++) {
-      tk->sample[j].sample_delta = tk->tts[i].sample_delta;
+    for (i = 0; i < tk->num_tts; i++) {
+        for (j = 0; j < tk->tts[i].sample_count; j++) {
+            tk->sample[j].sample_delta = tk->tts[i].sample_delta;
+        }
     }
-  }
 }
 
 /*
@@ -245,38 +243,38 @@ void mj2_tts_decompact(mj2_tk_t * tk)
 */
 void mj2_stsc_decompact(mj2_tk_t * tk)
 {
-  unsigned int i, j, k, sampleno = 0;
-  
-  if (tk->num_samplestochunk == 1) {
-    tk->num_chunks =
-      (unsigned int) ceil((double) tk->num_samples /
-      (double) tk->sampletochunk[0].samples_per_chunk);
-	 tk->chunk = (mj2_chunk_t*) opj_malloc(tk->num_chunks * sizeof(mj2_chunk_t));
-    for (k = 0; k < tk->num_chunks; k++) {
-      tk->chunk[k].num_samples = tk->sampletochunk[0].samples_per_chunk;
-    }
-    
-  } else {
-    tk->chunk = (mj2_chunk_t*) opj_malloc(tk->num_samples * sizeof(mj2_chunk_t));
-    tk->num_chunks = 0;
-    for (i = 0; i < tk->num_samplestochunk -1 ; i++) {
-      for (j = tk->sampletochunk[i].first_chunk - 1;
-      j < tk->sampletochunk[i + 1].first_chunk - 1; j++) {
-				tk->chunk[j].num_samples = tk->sampletochunk[i].samples_per_chunk;
-				tk->num_chunks++;
-				sampleno += tk->chunk[j].num_samples;
-      }
-    }
-    tk->num_chunks += (int)(tk->num_samples  - sampleno) / tk->sampletochunk[tk->num_samplestochunk - 1].samples_per_chunk;
-    for (k = tk->sampletochunk[tk->num_samplestochunk - 1].first_chunk - 1;
-    k < tk->num_chunks; k++) {
-      tk->chunk[k].num_samples =
-				tk->sampletochunk[tk->num_samplestochunk - 1].samples_per_chunk;
+    unsigned int i, j, k, sampleno = 0;
+
+    if (tk->num_samplestochunk == 1) {
+        tk->num_chunks =
+            (unsigned int) ceil((double) tk->num_samples /
+                                (double) tk->sampletochunk[0].samples_per_chunk);
+        tk->chunk = (mj2_chunk_t*) opj_malloc(tk->num_chunks * sizeof(mj2_chunk_t));
+        for (k = 0; k < tk->num_chunks; k++) {
+            tk->chunk[k].num_samples = tk->sampletochunk[0].samples_per_chunk;
+        }
+
+    } else {
+        tk->chunk = (mj2_chunk_t*) opj_malloc(tk->num_samples * sizeof(mj2_chunk_t));
+        tk->num_chunks = 0;
+        for (i = 0; i < tk->num_samplestochunk -1 ; i++) {
+            for (j = tk->sampletochunk[i].first_chunk - 1;
+                    j < tk->sampletochunk[i + 1].first_chunk - 1; j++) {
+                tk->chunk[j].num_samples = tk->sampletochunk[i].samples_per_chunk;
+                tk->num_chunks++;
+                sampleno += tk->chunk[j].num_samples;
+            }
+        }
+        tk->num_chunks += (int)(tk->num_samples  - sampleno) / tk->sampletochunk[tk->num_samplestochunk - 1].samples_per_chunk;
+        for (k = tk->sampletochunk[tk->num_samplestochunk - 1].first_chunk - 1;
+                k < tk->num_chunks; k++) {
+            tk->chunk[k].num_samples =
+                tk->sampletochunk[tk->num_samplestochunk - 1].samples_per_chunk;
+        }
+        tk->chunk = (mj2_chunk_t*)
+                    opj_realloc(tk->chunk, tk->num_chunks * sizeof(mj2_chunk_t));
     }
-    tk->chunk = (mj2_chunk_t*)
-	 opj_realloc(tk->chunk, tk->num_chunks * sizeof(mj2_chunk_t));
-  }
-  
+
 }
 
 
@@ -286,17 +284,17 @@ void mj2_stsc_decompact(mj2_tk_t * tk)
 */
 void mj2_stco_decompact(mj2_tk_t * tk)
 {
-  unsigned int i, j, k = 0;
-  unsigned int intra_chunk_offset;
-	
-  for (i = 0; i < tk->num_chunks; i++) {
-    intra_chunk_offset = 0;
-    for (j = 0; j < tk->chunk[i].num_samples; j++) {
-      tk->sample[k].offset = intra_chunk_offset + tk->chunk[i].offset;
-      intra_chunk_offset += tk->sample[k].sample_size;
-      k++;
+    unsigned int i, j, k = 0;
+    unsigned int intra_chunk_offset;
+
+    for (i = 0; i < tk->num_chunks; i++) {
+        intra_chunk_offset = 0;
+        for (j = 0; j < tk->chunk[i].num_samples; j++) {
+            tk->sample[k].offset = intra_chunk_offset + tk->chunk[i].offset;
+            intra_chunk_offset += tk->sample[k].sample_size;
+            k++;
+        }
     }
-  }
 }
 
 /*
@@ -307,17 +305,17 @@ void mj2_stco_decompact(mj2_tk_t * tk)
 */
 void OPJ_CALLCONV mj2_write_jp(opj_cio_t *cio)
 {
-  mj2_box_t box;
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-	
-  cio_write(cio, MJ2_JP, 4);		/* JP */
-  cio_write(cio, 0x0d0a870a, 4);	/* 0x0d0a870a required in a JP box */
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+
+    cio_write(cio, MJ2_JP, 4);		/* JP */
+    cio_write(cio, 0x0d0a870a, 4);	/* 0x0d0a870a required in a JP box */
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -328,23 +326,23 @@ void OPJ_CALLCONV mj2_write_jp(opj_cio_t *cio)
 */
 int mj2_read_jp(opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_JP != box.type) {	/* Check Marker */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP Marker\n");
-    return 1;
-  }
-  if (0x0d0a870a != cio_read(cio, 4)) {	/* read the 0x0d0a870a required in a JP box */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP Marker\n");
-    return 1;
-  }
-  if (cio_tell(cio) - box.init_pos != box.length) {	/* Check box length */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP Box size \n");
-    return 1;
-  }
-  return 0;
-	
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_JP != box.type) {	/* Check Marker */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP Marker\n");
+        return 1;
+    }
+    if (0x0d0a870a != cio_read(cio, 4)) {	/* read the 0x0d0a870a required in a JP box */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP Marker\n");
+        return 1;
+    }
+    if (cio_tell(cio) - box.init_pos != box.length) {	/* Check box length */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP Box size \n");
+        return 1;
+    }
+    return 0;
+
 }
 
 /*
@@ -355,22 +353,22 @@ int mj2_read_jp(opj_cio_t *cio)
 */
 void OPJ_CALLCONV mj2_write_ftyp(opj_mj2_t * movie, opj_cio_t *cio)
 {
-  int i;
-  mj2_box_t box;
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-	
-  cio_write(cio, MJ2_FTYP, 4);	/* FTYP       */
-  cio_write(cio, movie->brand, 4);	/* BR         */
-  cio_write(cio, movie->minversion, 4);	/* MinV       */
-	
-  for (i = 0; i < movie->num_cl; i++)
-    cio_write(cio, movie->cl[i], 4);	/* CL         */
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* Length     */
-  cio_seek(cio, box.init_pos + box.length);
+    int i;
+    mj2_box_t box;
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+
+    cio_write(cio, MJ2_FTYP, 4);	/* FTYP       */
+    cio_write(cio, movie->brand, 4);	/* BR         */
+    cio_write(cio, movie->minversion, 4);	/* MinV       */
+
+    for (i = 0; i < movie->num_cl; i++)
+        cio_write(cio, movie->cl[i], 4);	/* CL         */
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* Length     */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -381,28 +379,28 @@ void OPJ_CALLCONV mj2_write_ftyp(opj_mj2_t * movie, opj_cio_t *cio)
 */
 int mj2_read_ftyp(opj_mj2_t * movie, opj_cio_t *cio)
 {
-  int i;
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);	/* Box Size */
-  if (MJ2_FTYP != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected FTYP Marker\n");
-    return 1;
-  }
-	
-  movie->brand = cio_read(cio, 4);	/* BR              */
-  movie->minversion = cio_read(cio, 4);	/* MinV            */
-  movie->num_cl = (box.length - 16) / 4;
-  movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
+    int i;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);	/* Box Size */
+    if (MJ2_FTYP != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected FTYP Marker\n");
+        return 1;
+    }
+
+    movie->brand = cio_read(cio, 4);	/* BR              */
+    movie->minversion = cio_read(cio, 4);	/* MinV            */
+    movie->num_cl = (box.length - 16) / 4;
+    movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
+
+    for (i = movie->num_cl - 1; i > -1; i--)
+        movie->cl[i] = cio_read(cio, 4);	/* CLi */
 
-  for (i = movie->num_cl - 1; i > -1; i--)
-    movie->cl[i] = cio_read(cio, 4);	/* CLi */
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with FTYP Box\n");
-    return 1;
-  }
-  return 0;
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with FTYP Box\n");
+        return 1;
+    }
+    return 0;
 }
 
 
@@ -414,25 +412,25 @@ int mj2_read_ftyp(opj_mj2_t * movie, opj_cio_t *cio)
 */
 void mj2_write_stco(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-  unsigned int i;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_STCO, 4);	/* STCO       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, tk->num_chunks, 4);	/* Entry Count */
-	
-  for (i = 0; i < tk->num_chunks; i++) {
-    cio_write(cio, tk->chunk[i].offset, 4);	/* Entry offset */
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+    unsigned int i;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_STCO, 4);	/* STCO       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, tk->num_chunks, 4);	/* Entry Count */
+
+    for (i = 0; i < tk->num_chunks; i++) {
+        cio_write(cio, tk->chunk[i].offset, 4);	/* Entry offset */
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -443,43 +441,43 @@ void mj2_write_stco(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_stco(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  unsigned int i;
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);	/* Box Size */
-  if (MJ2_STCO != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STCO Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STCO box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STCO box. Expected flag 0\n");
-    return 1;
-  }
-	
-	
-  if (cio_read(cio, 4) != tk->num_chunks) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, 
-			"Error in STCO box: expecting same amount of entry-count as chunks \n");
-  } else {
-    for (i = 0; i < tk->num_chunks; i++) {
-      tk->chunk[i].offset = cio_read(cio, 4);	/* Entry offset */
+    unsigned int i;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);	/* Box Size */
+    if (MJ2_STCO != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STCO Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STCO box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STCO box. Expected flag 0\n");
+        return 1;
     }
-  }
-	
-  mj2_stco_decompact(tk);
-	
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STCO Box size\n");
-    return 1;
-  }
-  return 0;
+
+
+    if (cio_read(cio, 4) != tk->num_chunks) {
+        opj_event_msg(cio->cinfo, EVT_ERROR,
+                      "Error in STCO box: expecting same amount of entry-count as chunks \n");
+    } else {
+        for (i = 0; i < tk->num_chunks; i++) {
+            tk->chunk[i].offset = cio_read(cio, 4);	/* Entry offset */
+        }
+    }
+
+    mj2_stco_decompact(tk);
+
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STCO Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -490,35 +488,35 @@ int mj2_read_stco(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_stsz(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-  unsigned int i;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_STSZ, 4);	/* STSZ       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  if (tk->same_sample_size == 1) {	/* If they all have the same size */
-    cio_write(cio, tk->sample[0].sample_size, 4);	/* Size */
-		
-    cio_write(cio, 1, 4);		/* Entry count = 1 */
-  }
-	
-  else {
-    cio_write(cio, 0, 4);		/* Sample Size = 0 becase they all have different sizes */
-		
-    cio_write(cio, tk->num_samples, 4);	/* Sample Count */
-		
-    for (i = 0; i < tk->num_samples; i++) {
-      cio_write(cio, tk->sample[i].sample_size, 4);
-    }
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+    unsigned int i;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_STSZ, 4);	/* STSZ       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    if (tk->same_sample_size == 1) {	/* If they all have the same size */
+        cio_write(cio, tk->sample[0].sample_size, 4);	/* Size */
+
+        cio_write(cio, 1, 4);		/* Entry count = 1 */
+    }
+
+    else {
+        cio_write(cio, 0, 4);		/* Sample Size = 0 becase they all have different sizes */
+
+        cio_write(cio, tk->num_samples, 4);	/* Sample Count */
+
+        for (i = 0; i < tk->num_samples; i++) {
+            cio_write(cio, tk->sample[i].sample_size, 4);
+        }
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -529,53 +527,53 @@ void mj2_write_stsz(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_stsz(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  int sample_size;
-  unsigned int i;
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);	/* Box Size */
-  if (MJ2_STSZ != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSZ Marker\n");
-    return 1;
-  }
-	
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSZ box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSZ box. Expected flag 0\n");
-    return 1;
-  }
-	
-  sample_size = cio_read(cio, 4);
-	
-  if (sample_size != 0) {	/* Samples do have the same size */
-    tk->same_sample_size = 1;
-    for (i = 0; i < tk->num_samples; i++) {
-      tk->sample[i].sample_size = sample_size;
-    }
-    cio_skip(cio,4);		/* Sample count = 1 */
-  } else {
-    tk->same_sample_size = 0;
-    if (tk->num_samples != cio_read(cio, 4)) {	/* Sample count */
-      opj_event_msg(cio->cinfo, EVT_ERROR,
-				"Error in STSZ box. Expected that sample-count is number of samples in track\n");
-      return 1;
-    }
-    for (i = 0; i < tk->num_samples; i++) {
-      tk->sample[i].sample_size = cio_read(cio, 4);	/* Sample Size */
-    }
-		
-    if (cio_tell(cio) - box.init_pos != box.length) {
-      opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSZ Box size\n");
-      return 1;
+    int sample_size;
+    unsigned int i;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);	/* Box Size */
+    if (MJ2_STSZ != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSZ Marker\n");
+        return 1;
     }
-  }
-  return 0;
-	
+
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSZ box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSZ box. Expected flag 0\n");
+        return 1;
+    }
+
+    sample_size = cio_read(cio, 4);
+
+    if (sample_size != 0) {	/* Samples do have the same size */
+        tk->same_sample_size = 1;
+        for (i = 0; i < tk->num_samples; i++) {
+            tk->sample[i].sample_size = sample_size;
+        }
+        cio_skip(cio,4);		/* Sample count = 1 */
+    } else {
+        tk->same_sample_size = 0;
+        if (tk->num_samples != cio_read(cio, 4)) {	/* Sample count */
+            opj_event_msg(cio->cinfo, EVT_ERROR,
+                          "Error in STSZ box. Expected that sample-count is number of samples in track\n");
+            return 1;
+        }
+        for (i = 0; i < tk->num_samples; i++) {
+            tk->sample[i].sample_size = cio_read(cio, 4);	/* Sample Size */
+        }
+
+        if (cio_tell(cio) - box.init_pos != box.length) {
+            opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSZ Box size\n");
+            return 1;
+        }
+    }
+    return 0;
+
 }
 
 /*
@@ -586,28 +584,28 @@ int mj2_read_stsz(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_stsc(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  unsigned int i;
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_STSC, 4);	/* STSC       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, tk->num_samplestochunk, 4);	/* Entry Count */
-	
-  for (i = 0; i < tk->num_samplestochunk; i++) {
-    cio_write(cio, tk->sampletochunk[i].first_chunk, 4);	/* First Chunk */
-    cio_write(cio, tk->sampletochunk[i].samples_per_chunk, 4);	/* Samples per chunk */
-    cio_write(cio, tk->sampletochunk[i].sample_descr_idx, 4);	/* Samples description index */
-  }
-	
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    unsigned int i;
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_STSC, 4);	/* STSC       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, tk->num_samplestochunk, 4);	/* Entry Count */
+
+    for (i = 0; i < tk->num_samplestochunk; i++) {
+        cio_write(cio, tk->sampletochunk[i].first_chunk, 4);	/* First Chunk */
+        cio_write(cio, tk->sampletochunk[i].samples_per_chunk, 4);	/* Samples per chunk */
+        cio_write(cio, tk->sampletochunk[i].sample_descr_idx, 4);	/* Samples description index */
+    }
+
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -618,44 +616,44 @@ void mj2_write_stsc(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_stsc(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  unsigned int i;
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);	/* Box Size */
-  if (MJ2_STSC != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSC Marker\n");
-    return 1;
-  }
-	
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSC box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSC box. Expected flag 0\n");
-    return 1;
-  }
-	
-  tk->num_samplestochunk = cio_read(cio, 4);
-
-  tk->sampletochunk = (mj2_sampletochunk_t*) opj_malloc(tk->num_samplestochunk * sizeof(mj2_sampletochunk_t));
-
-  for (i = 0; i < tk->num_samplestochunk; i++) {
-    tk->sampletochunk[i].first_chunk = cio_read(cio, 4);
-    tk->sampletochunk[i].samples_per_chunk = cio_read(cio, 4);
-    tk->sampletochunk[i].sample_descr_idx = cio_read(cio, 4);
-  }
-	
-  mj2_stsc_decompact(tk);	/* decompact sample to chunk box */
-	
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSC Box size\n");
-    return 1;
-  }
-  return 0;
+    unsigned int i;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);	/* Box Size */
+    if (MJ2_STSC != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSC Marker\n");
+        return 1;
+    }
+
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSC box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSC box. Expected flag 0\n");
+        return 1;
+    }
+
+    tk->num_samplestochunk = cio_read(cio, 4);
+
+    tk->sampletochunk = (mj2_sampletochunk_t*) opj_malloc(tk->num_samplestochunk * sizeof(mj2_sampletochunk_t));
+
+    for (i = 0; i < tk->num_samplestochunk; i++) {
+        tk->sampletochunk[i].first_chunk = cio_read(cio, 4);
+        tk->sampletochunk[i].samples_per_chunk = cio_read(cio, 4);
+        tk->sampletochunk[i].sample_descr_idx = cio_read(cio, 4);
+    }
+
+    mj2_stsc_decompact(tk);	/* decompact sample to chunk box */
+
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSC Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -666,73 +664,73 @@ int mj2_read_stsc(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_stts(mj2_tk_t * tk, opj_cio_t *cio)
 {
-	
-  int i;
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_STTS, 4);	/* STTS       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, tk->num_tts, 4);	/* entry_count */
-  for (i = 0; i < tk->num_tts; i++) {
-    cio_write(cio, tk->tts[i].sample_count, 4);	/* Sample-count */
-    cio_write(cio, tk->tts[i].sample_delta, 4);	/* Sample-Delta */
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+
+    int i;
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_STTS, 4);	/* STTS       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, tk->num_tts, 4);	/* entry_count */
+    for (i = 0; i < tk->num_tts; i++) {
+        cio_write(cio, tk->tts[i].sample_count, 4);	/* Sample-count */
+        cio_write(cio, tk->tts[i].sample_delta, 4);	/* Sample-Delta */
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
 * Read the STTS box
 *
-* 
+*
 *
 */
 int mj2_read_stts(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  int i;
-	
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_STTS != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STTS Marker\n");
-    return 1;
-  }
-	
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STTS box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STTS box. Expected flag 0\n");
-    return 1;
-  }
-	
-  tk->num_tts = cio_read(cio, 4);
-
-  tk->tts = (mj2_tts_t*) opj_malloc(tk->num_tts * sizeof(mj2_tts_t));
-
-  for (i = 0; i < tk->num_tts; i++) {
-    tk->tts[i].sample_count = cio_read(cio, 4);
-    tk->tts[i].sample_delta = cio_read(cio, 4);
-  }
-	
-  mj2_tts_decompact(tk);
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STTS Box size\n");
-    return 1;
-  }
-  return 0;
+    int i;
+
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_STTS != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STTS Marker\n");
+        return 1;
+    }
+
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STTS box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STTS box. Expected flag 0\n");
+        return 1;
+    }
+
+    tk->num_tts = cio_read(cio, 4);
+
+    tk->tts = (mj2_tts_t*) opj_malloc(tk->num_tts * sizeof(mj2_tts_t));
+
+    for (i = 0; i < tk->num_tts; i++) {
+        tk->tts[i].sample_count = cio_read(cio, 4);
+        tk->tts[i].sample_delta = cio_read(cio, 4);
+    }
+
+    mj2_tts_decompact(tk);
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STTS Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -743,21 +741,21 @@ int mj2_read_stts(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_fiel(mj2_tk_t * tk, opj_cio_t *cio)
 {
-	
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_FIEL, 4);	/* STTS       */
-	
-  cio_write(cio, tk->fieldcount, 1);	/* Field count */
-  cio_write(cio, tk->fieldorder, 1);	/* Field order */
-	
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_FIEL, 4);	/* STTS       */
+
+    cio_write(cio, tk->fieldcount, 1);	/* Field count */
+    cio_write(cio, tk->fieldorder, 1);	/* Field order */
+
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -768,24 +766,24 @@ void mj2_write_fiel(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_fiel(mj2_tk_t * tk, opj_cio_t *cio)
 {
-	
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_FIEL != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected FIEL Marker\n");
-    return 1;
-  }
-	
-	
-  tk->fieldcount = cio_read(cio, 1);
-  tk->fieldorder = cio_read(cio, 1);
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with FIEL Box size\n");
-    return 1;
-  }
-  return 0;
+
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_FIEL != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected FIEL Marker\n");
+        return 1;
+    }
+
+
+    tk->fieldcount = cio_read(cio, 1);
+    tk->fieldorder = cio_read(cio, 1);
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with FIEL Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -796,20 +794,20 @@ int mj2_read_fiel(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_orfo(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_ORFO, 4);
-	
-  cio_write(cio, tk->or_fieldcount, 1);	/* Original Field count */
-  cio_write(cio, tk->or_fieldorder, 1);	/* Original Field order */
-	
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_ORFO, 4);
+
+    cio_write(cio, tk->or_fieldcount, 1);	/* Original Field count */
+    cio_write(cio, tk->or_fieldorder, 1);	/* Original Field order */
+
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -820,24 +818,24 @@ void mj2_write_orfo(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_orfo(mj2_tk_t * tk, opj_cio_t *cio)
 {
-	
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_ORFO != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected ORFO Marker\n");
-    return 1;
-  }
-	
-	
-  tk->or_fieldcount = cio_read(cio, 1);
-  tk->or_fieldorder = cio_read(cio, 1);
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with ORFO Box size\n");
-    return 1;
-  }
-  return 0;
+
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_ORFO != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected ORFO Marker\n");
+        return 1;
+    }
+
+
+    tk->or_fieldcount = cio_read(cio, 1);
+    tk->or_fieldorder = cio_read(cio, 1);
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with ORFO Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -848,24 +846,24 @@ int mj2_read_orfo(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_jp2p(mj2_tk_t * tk, opj_cio_t *cio)
 {
-	
-  int i;
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_JP2P, 4);
-	
-  cio_write(cio, 0, 4);		/* Version 0, flags =0 */
-	
-  for (i = 0; i < tk->num_br; i++) {
-    cio_write(cio, tk->br[i], 4);
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+
+    int i;
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_JP2P, 4);
+
+    cio_write(cio, 0, 4);		/* Version 0, flags =0 */
+
+    for (i = 0; i < tk->num_br; i++) {
+        cio_write(cio, tk->br[i], 4);
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -876,39 +874,39 @@ void mj2_write_jp2p(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_jp2p(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  int i;
-	
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_JP2P != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP2P Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in JP2P box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in JP2P box. Expected flag 0\n");
-    return 1;
-  }
-	
-	
-  tk->num_br = (box.length - 12) / 4;
-  tk->br = (unsigned int*) opj_malloc(tk->num_br * sizeof(unsigned int));
-
-  for (i = 0; i < tk->num_br; i++) {
-    tk->br[i] = cio_read(cio, 4);
-  }
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP2P Box size\n");
-    return 1;
-  }
-  return 0;
+    int i;
+
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_JP2P != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP2P Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in JP2P box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in JP2P box. Expected flag 0\n");
+        return 1;
+    }
+
+
+    tk->num_br = (box.length - 12) / 4;
+    tk->br = (unsigned int*) opj_malloc(tk->num_br * sizeof(unsigned int));
+
+    for (i = 0; i < tk->num_br; i++) {
+        tk->br[i] = cio_read(cio, 4);
+    }
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP2P Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -919,22 +917,22 @@ int mj2_read_jp2p(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_jp2x(mj2_tk_t * tk, opj_cio_t *cio)
 {
-	
-  int i;
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_JP2X, 4);
-	
-  for (i = 0; i < tk->num_jp2x; i++) {
-    cio_write(cio, tk->jp2xdata[i], 1);
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+
+    int i;
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_JP2X, 4);
+
+    for (i = 0; i < tk->num_jp2x; i++) {
+        cio_write(cio, tk->jp2xdata[i], 1);
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -945,29 +943,29 @@ void mj2_write_jp2x(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_jp2x(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  unsigned int i;
-	
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_JP2X != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP2X Marker\n");
-    return 1;
-  }
-	
-	
-  tk->num_jp2x = (box.length - 8);
-  tk->jp2xdata = (unsigned char*) opj_malloc(tk->num_jp2x * sizeof(unsigned char));
-
-  for (i = 0; i < tk->num_jp2x; i++) {
-    tk->jp2xdata[i] = cio_read(cio, 1);
-  }
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP2X Box size\n");
-    return 1;
-  }
-  return 0;
+    unsigned int i;
+
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_JP2X != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JP2X Marker\n");
+        return 1;
+    }
+
+
+    tk->num_jp2x = (box.length - 8);
+    tk->jp2xdata = (unsigned char*) opj_malloc(tk->num_jp2x * sizeof(unsigned char));
+
+    for (i = 0; i < tk->num_jp2x; i++) {
+        tk->jp2xdata[i] = cio_read(cio, 1);
+    }
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JP2X Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -978,22 +976,22 @@ int mj2_read_jp2x(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_jsub(mj2_tk_t * tk, opj_cio_t *cio)
 {
-	
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_JSUB, 4);
-	
-  cio_write(cio, tk->hsub, 1);
-  cio_write(cio, tk->vsub, 1);
-  cio_write(cio, tk->hoff, 1);
-  cio_write(cio, tk->voff, 1);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_JSUB, 4);
+
+    cio_write(cio, tk->hsub, 1);
+    cio_write(cio, tk->vsub, 1);
+    cio_write(cio, tk->hoff, 1);
+    cio_write(cio, tk->voff, 1);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1004,24 +1002,24 @@ void mj2_write_jsub(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_jsub(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_JSUB != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JSUB Marker\n");
-    return 1;
-  }
-	
-  tk->hsub = cio_read(cio, 1);
-  tk->vsub = cio_read(cio, 1);
-  tk->hoff = cio_read(cio, 1);;
-  tk->voff = cio_read(cio, 1);
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JSUB Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_JSUB != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected JSUB Marker\n");
+        return 1;
+    }
+
+    tk->hsub = cio_read(cio, 1);
+    tk->vsub = cio_read(cio, 1);
+    tk->hoff = cio_read(cio, 1);;
+    tk->voff = cio_read(cio, 1);
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with JSUB Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1032,63 +1030,63 @@ int mj2_read_jsub(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_smj2(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_MJ2, 4);	/* MJ2       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, 1, 4);
-	
-  cio_write(cio, 0, 2);		/* Pre-defined */
-	
-  cio_write(cio, 0, 2);		/* Reserved */
-	
-  cio_write(cio, 0, 4);		/* Pre-defined */
-  cio_write(cio, 0, 4);		/* Pre-defined */
-  cio_write(cio, 0, 4);		/* Pre-defined */
-	
-  cio_write(cio, tk->w, 2);		/* Width  */
-  cio_write(cio, tk->h, 2);		/* Height */
-	
-  cio_write(cio, tk->horizresolution, 4);	/* Horizontal resolution */
-  cio_write(cio, tk->vertresolution, 4);	/* Vertical resolution   */
-	
-  cio_write(cio, 0, 4);		/* Reserved */
-	
-  cio_write(cio, 1, 2);		/* Pre-defined = 1 */
-	
-  cio_write(cio, tk->compressorname[0], 4);	/* Compressor Name */
-  cio_write(cio, tk->compressorname[1], 4);
-  cio_write(cio, tk->compressorname[2], 4);
-  cio_write(cio, tk->compressorname[3], 4);
-  cio_write(cio, tk->compressorname[4], 4);
-  cio_write(cio, tk->compressorname[5], 4);
-  cio_write(cio, tk->compressorname[6], 4);
-  cio_write(cio, tk->compressorname[7], 4);
-	
-  cio_write(cio, tk->depth, 2);	/* Depth */
-	
-  cio_write(cio, 0xffff, 2);		/* Pre-defined = -1 */
-	
-  jp2_write_jp2h(&tk->jp2_struct, cio);
-	
-  mj2_write_fiel(tk, cio);
-	
-  if (tk->num_br != 0)
-    mj2_write_jp2p(tk, cio);
-  if (tk->num_jp2x != 0)
-    mj2_write_jp2x(tk, cio);
-	
-  mj2_write_jsub(tk, cio);
-  mj2_write_orfo(tk, cio);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_MJ2, 4);	/* MJ2       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, 1, 4);
+
+    cio_write(cio, 0, 2);		/* Pre-defined */
+
+    cio_write(cio, 0, 2);		/* Reserved */
+
+    cio_write(cio, 0, 4);		/* Pre-defined */
+    cio_write(cio, 0, 4);		/* Pre-defined */
+    cio_write(cio, 0, 4);		/* Pre-defined */
+
+    cio_write(cio, tk->w, 2);		/* Width  */
+    cio_write(cio, tk->h, 2);		/* Height */
+
+    cio_write(cio, tk->horizresolution, 4);	/* Horizontal resolution */
+    cio_write(cio, tk->vertresolution, 4);	/* Vertical resolution   */
+
+    cio_write(cio, 0, 4);		/* Reserved */
+
+    cio_write(cio, 1, 2);		/* Pre-defined = 1 */
+
+    cio_write(cio, tk->compressorname[0], 4);	/* Compressor Name */
+    cio_write(cio, tk->compressorname[1], 4);
+    cio_write(cio, tk->compressorname[2], 4);
+    cio_write(cio, tk->compressorname[3], 4);
+    cio_write(cio, tk->compressorname[4], 4);
+    cio_write(cio, tk->compressorname[5], 4);
+    cio_write(cio, tk->compressorname[6], 4);
+    cio_write(cio, tk->compressorname[7], 4);
+
+    cio_write(cio, tk->depth, 2);	/* Depth */
+
+    cio_write(cio, 0xffff, 2);		/* Pre-defined = -1 */
+
+    jp2_write_jp2h(&tk->jp2_struct, cio);
+
+    mj2_write_fiel(tk, cio);
+
+    if (tk->num_br != 0)
+        mj2_write_jp2p(tk, cio);
+    if (tk->num_jp2x != 0)
+        mj2_write_jp2x(tk, cio);
+
+    mj2_write_jsub(tk, cio);
+    mj2_write_orfo(tk, cio);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1099,124 +1097,123 @@ void mj2_write_smj2(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_smj2(opj_image_t * img, mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-  mj2_box_t box2;
-  opj_jp2_color_t color;
-  int i;
-  opj_bool ok;
-
-  mj2_read_boxhdr(&box, cio);
-	
-  if (MJ2_MJ2 != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error in SMJ2 box: Expected MJ2 Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MJP2 box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in MJP2 box. Expected flag 0\n");
-    return 1;
-  }
-	
-  cio_skip(cio,4);
-	
-  cio_skip(cio,2);			/* Pre-defined */
-	
-  cio_skip(cio,2);			/* Reserved */
-	
-  cio_skip(cio,4);			/* Pre-defined */
-  cio_skip(cio,4);			/* Pre-defined */
-  cio_skip(cio,4);			/* Pre-defined */
-	
-  tk->w = cio_read(cio, 2);		/* Width  */
-  tk->h = cio_read(cio, 2);		/* Height */
-	
-  tk->horizresolution = cio_read(cio, 4);	/* Horizontal resolution */
-  tk->vertresolution = cio_read(cio, 4);	/* Vertical resolution   */
-	
-  cio_skip(cio,4);			/* Reserved */
-	
-  cio_skip(cio,2);			/* Pre-defined = 1 */
-	
-  tk->compressorname[0] = cio_read(cio, 4);	/* Compressor Name */
-  tk->compressorname[1] = cio_read(cio, 4);
-  tk->compressorname[2] = cio_read(cio, 4);
-  tk->compressorname[3] = cio_read(cio, 4);
-  tk->compressorname[4] = cio_read(cio, 4);
-  tk->compressorname[5] = cio_read(cio, 4);
-  tk->compressorname[6] = cio_read(cio, 4);
-  tk->compressorname[7] = cio_read(cio, 4);
-	
-  tk->depth = cio_read(cio, 2);	/* Depth */
-	
-  /* Init std value */
-  tk->num_jp2x = 0;
-  tk->fieldcount = 1;
-  tk->fieldorder = 0;
-  tk->or_fieldcount = 1;
-  tk->or_fieldorder = 0;
-	
-  cio_skip(cio,2);			/* Pre-defined = -1 */
-  memset(&color, 0, sizeof(opj_jp2_color_t));
-  tk->jp2_struct.cinfo = tk->cinfo;
-
-  ok = jp2_read_jp2h(&tk->jp2_struct, cio, &color);
-
-  tk->jp2_struct.cinfo = NULL;
-
-  if(ok == OPJ_FALSE)
- {
-	opj_event_msg(tk->cinfo, EVT_ERROR, "Error reading JP2H Box\n");
-    return 1;
- }
-
-  tk->jp2_struct.comps = (opj_jp2_comps_t*) opj_malloc(tk->jp2_struct.numcomps * sizeof(opj_jp2_comps_t));
-  tk->jp2_struct.cl = (unsigned int*) opj_malloc(sizeof(unsigned int));
-
-  tk->num_br = 0;
-  tk->num_jp2x = 0;
-	
-  for (i = 0; cio_tell(cio) - box.init_pos < box.length; i++) {
-    mj2_read_boxhdr(&box2, cio);
-    cio_seek(cio, box2.init_pos);
-    switch (box2.type) {
-    case MJ2_FIEL:
-      if (mj2_read_fiel(tk, cio))
-				return 1;
-      break;
-			
-    case MJ2_JP2P:
-      if (mj2_read_jp2p(tk, cio))
-				return 1;
-      break;
-			
-    case MJ2_JP2X:
-      if (mj2_read_jp2x(tk, cio))
-				return 1;
-      break;
-			
-    case MJ2_JSUB:
-      if (mj2_read_jsub(tk, cio))
-				return 1;
-      break;
-			
-    case MJ2_ORFO:
-      if (mj2_read_orfo(tk, cio))
-				return 1;
-      break;
-			
-    default:
-      opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MJP2 Box size\n");
-      return 1;
-      break;
-			
-    }
-  }
-  return 0;
+    mj2_box_t box;
+    mj2_box_t box2;
+    opj_jp2_color_t color;
+    int i;
+    opj_bool ok;
+
+    mj2_read_boxhdr(&box, cio);
+
+    if (MJ2_MJ2 != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error in SMJ2 box: Expected MJ2 Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MJP2 box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in MJP2 box. Expected flag 0\n");
+        return 1;
+    }
+
+    cio_skip(cio,4);
+
+    cio_skip(cio,2);			/* Pre-defined */
+
+    cio_skip(cio,2);			/* Reserved */
+
+    cio_skip(cio,4);			/* Pre-defined */
+    cio_skip(cio,4);			/* Pre-defined */
+    cio_skip(cio,4);			/* Pre-defined */
+
+    tk->w = cio_read(cio, 2);		/* Width  */
+    tk->h = cio_read(cio, 2);		/* Height */
+
+    tk->horizresolution = cio_read(cio, 4);	/* Horizontal resolution */
+    tk->vertresolution = cio_read(cio, 4);	/* Vertical resolution   */
+
+    cio_skip(cio,4);			/* Reserved */
+
+    cio_skip(cio,2);			/* Pre-defined = 1 */
+
+    tk->compressorname[0] = cio_read(cio, 4);	/* Compressor Name */
+    tk->compressorname[1] = cio_read(cio, 4);
+    tk->compressorname[2] = cio_read(cio, 4);
+    tk->compressorname[3] = cio_read(cio, 4);
+    tk->compressorname[4] = cio_read(cio, 4);
+    tk->compressorname[5] = cio_read(cio, 4);
+    tk->compressorname[6] = cio_read(cio, 4);
+    tk->compressorname[7] = cio_read(cio, 4);
+
+    tk->depth = cio_read(cio, 2);	/* Depth */
+
+    /* Init std value */
+    tk->num_jp2x = 0;
+    tk->fieldcount = 1;
+    tk->fieldorder = 0;
+    tk->or_fieldcount = 1;
+    tk->or_fieldorder = 0;
+
+    cio_skip(cio,2);			/* Pre-defined = -1 */
+    memset(&color, 0, sizeof(opj_jp2_color_t));
+    tk->jp2_struct.cinfo = tk->cinfo;
+
+    ok = jp2_read_jp2h(&tk->jp2_struct, cio, &color);
+
+    tk->jp2_struct.cinfo = NULL;
+
+    if(ok == OPJ_FALSE) {
+        opj_event_msg(tk->cinfo, EVT_ERROR, "Error reading JP2H Box\n");
+        return 1;
+    }
+
+    tk->jp2_struct.comps = (opj_jp2_comps_t*) opj_malloc(tk->jp2_struct.numcomps * sizeof(opj_jp2_comps_t));
+    tk->jp2_struct.cl = (unsigned int*) opj_malloc(sizeof(unsigned int));
+
+    tk->num_br = 0;
+    tk->num_jp2x = 0;
+
+    for (i = 0; cio_tell(cio) - box.init_pos < box.length; i++) {
+        mj2_read_boxhdr(&box2, cio);
+        cio_seek(cio, box2.init_pos);
+        switch (box2.type) {
+        case MJ2_FIEL:
+            if (mj2_read_fiel(tk, cio))
+                return 1;
+            break;
+
+        case MJ2_JP2P:
+            if (mj2_read_jp2p(tk, cio))
+                return 1;
+            break;
+
+        case MJ2_JP2X:
+            if (mj2_read_jp2x(tk, cio))
+                return 1;
+            break;
+
+        case MJ2_JSUB:
+            if (mj2_read_jsub(tk, cio))
+                return 1;
+            break;
+
+        case MJ2_ORFO:
+            if (mj2_read_orfo(tk, cio))
+                return 1;
+            break;
+
+        default:
+            opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MJP2 Box size\n");
+            return 1;
+            break;
+
+        }
+    }
+    return 0;
 }
 
 
@@ -1228,30 +1225,30 @@ int mj2_read_smj2(opj_image_t * img, mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_stsd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_STSD, 4);	/* STSD       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, 1, 4);		/* entry_count = 1 (considering same JP2 headerboxes) */
-	
-  if (tk->track_type == 0) {
-    mj2_write_smj2(tk, cio);
-  } else if (tk->track_type == 1) {
-    /* Not implemented*/
-  }
-  if (tk->track_type == 2) {
-    /* Not implemented*/
-  }
-	
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_STSD, 4);	/* STSD       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, 1, 4);		/* entry_count = 1 (considering same JP2 headerboxes) */
+
+    if (tk->track_type == 0) {
+        mj2_write_smj2(tk, cio);
+    } else if (tk->track_type == 1) {
+        /* Not implemented*/
+    }
+    if (tk->track_type == 2) {
+        /* Not implemented*/
+    }
+
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1262,49 +1259,49 @@ void mj2_write_stsd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_stsd(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 {
-  int i;
-  int entry_count, len_2skip;
-	
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-	
-  if (MJ2_STSD != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSD Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSD box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSD box. Expected flag 0\n");
-    return 1;
-  }
-	
-  entry_count = cio_read(cio, 4);
-	
-  if (tk->track_type == 0) {
-    for (i = 0; i < entry_count; i++) {
-      if (mj2_read_smj2(img, tk, cio))
-				return 1;
-    }
-  } else if (tk->track_type == 1) {
-    len_2skip = cio_read(cio, 4);	/* Not implemented -> skipping box*/
-    cio_skip(cio,len_2skip - 4);
-  } else if (tk->track_type == 2) {
-    len_2skip = cio_read(cio, 4);	/* Not implemented -> skipping box*/
-    cio_skip(cio,len_2skip - 4);
-  }
-	
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSD Box size\n");
-    return 1;
-  }
-  return 0;
+    int i;
+    int entry_count, len_2skip;
+
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+
+    if (MJ2_STSD != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STSD Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in STSD box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in STSD box. Expected flag 0\n");
+        return 1;
+    }
+
+    entry_count = cio_read(cio, 4);
+
+    if (tk->track_type == 0) {
+        for (i = 0; i < entry_count; i++) {
+            if (mj2_read_smj2(img, tk, cio))
+                return 1;
+        }
+    } else if (tk->track_type == 1) {
+        len_2skip = cio_read(cio, 4);	/* Not implemented -> skipping box*/
+        cio_skip(cio,len_2skip - 4);
+    } else if (tk->track_type == 2) {
+        len_2skip = cio_read(cio, 4);	/* Not implemented -> skipping box*/
+        cio_skip(cio,len_2skip - 4);
+    }
+
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STSD Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1315,22 +1312,22 @@ int mj2_read_stsd(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 */
 void mj2_write_stbl(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_STBL, 4);	/* STBL       */
-	
-  mj2_write_stsd(tk, cio);
-  mj2_write_stts(tk, cio);
-  mj2_write_stsc(tk, cio);
-  mj2_write_stsz(tk, cio);
-  mj2_write_stco(tk, cio);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_STBL, 4);	/* STBL       */
+
+    mj2_write_stsd(tk, cio);
+    mj2_write_stts(tk, cio);
+    mj2_write_stsc(tk, cio);
+    mj2_write_stsz(tk, cio);
+    mj2_write_stco(tk, cio);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1341,30 +1338,30 @@ void mj2_write_stbl(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_stbl(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_STBL != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STBL Marker\n");
-    return 1;
-  }
-	
-  if (mj2_read_stsd(tk, img, cio))
-    return 1;
-  if (mj2_read_stts(tk, cio))
-    return 1;
-  if (mj2_read_stsc(tk, cio))
-    return 1;
-  if (mj2_read_stsz(tk, cio))
-    return 1;
-  if (mj2_read_stco(tk, cio))
-    return 1;
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STBL Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_STBL != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected STBL Marker\n");
+        return 1;
+    }
+
+    if (mj2_read_stsd(tk, img, cio))
+        return 1;
+    if (mj2_read_stts(tk, cio))
+        return 1;
+    if (mj2_read_stsc(tk, cio))
+        return 1;
+    if (mj2_read_stsz(tk, cio))
+        return 1;
+    if (mj2_read_stco(tk, cio))
+        return 1;
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with STBL Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1375,26 +1372,26 @@ int mj2_read_stbl(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 */
 void mj2_write_url(mj2_tk_t * tk, int url_num, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_URL, 4);	/* URL       */
-	
-  if (url_num == 0)
-    cio_write(cio, 1, 4);		/* Version = 0, flags = 1 because stored in same file */
-  else {
-    cio_write(cio, 0, 4);		/* Version = 0, flags =  0 */
-    cio_write(cio, tk->url[url_num - 1].location[0], 4);
-    cio_write(cio, tk->url[url_num - 1].location[1], 4);
-    cio_write(cio, tk->url[url_num - 1].location[2], 4);
-    cio_write(cio, tk->url[url_num - 1].location[3], 4);
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_URL, 4);	/* URL       */
+
+    if (url_num == 0)
+        cio_write(cio, 1, 4);		/* Version = 0, flags = 1 because stored in same file */
+    else {
+        cio_write(cio, 0, 4);		/* Version = 0, flags =  0 */
+        cio_write(cio, tk->url[url_num - 1].location[0], 4);
+        cio_write(cio, tk->url[url_num - 1].location[1], 4);
+        cio_write(cio, tk->url[url_num - 1].location[2], 4);
+        cio_write(cio, tk->url[url_num - 1].location[3], 4);
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1405,34 +1402,34 @@ void mj2_write_url(mj2_tk_t * tk, int url_num, opj_cio_t *cio)
 */
 int mj2_read_url(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_URL != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected URL Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in URL box\n");
-    return 1;
-  }
-	
-  if (1 != cio_read(cio, 3)) {	/* If flags = 1 --> media data in file */
-    tk->url[urn_num].location[0] = cio_read(cio, 4);
-    tk->url[urn_num].location[1] = cio_read(cio, 4);
-    tk->url[urn_num].location[2] = cio_read(cio, 4);
-    tk->url[urn_num].location[3] = cio_read(cio, 4);
-  } else {
-    tk->num_url--;
-  }
-	
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with URL Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_URL != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected URL Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in URL box\n");
+        return 1;
+    }
+
+    if (1 != cio_read(cio, 3)) {	/* If flags = 1 --> media data in file */
+        tk->url[urn_num].location[0] = cio_read(cio, 4);
+        tk->url[urn_num].location[1] = cio_read(cio, 4);
+        tk->url[urn_num].location[2] = cio_read(cio, 4);
+        tk->url[urn_num].location[3] = cio_read(cio, 4);
+    } else {
+        tk->num_url--;
+    }
+
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with URL Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1443,27 +1440,27 @@ int mj2_read_url(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
 */
 void mj2_write_urn(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_URN, 4);	/* URN       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags =  0 */
-	
-  cio_write(cio, tk->urn[urn_num].name[0], 4);
-  cio_write(cio, tk->urn[urn_num].name[1], 4);
-  cio_write(cio, tk->urn[urn_num].name[2], 4);
-  cio_write(cio, tk->urn[urn_num].name[3], 4);
-  cio_write(cio, tk->urn[urn_num].location[0], 4);
-  cio_write(cio, tk->urn[urn_num].location[1], 4);
-  cio_write(cio, tk->urn[urn_num].location[2], 4);
-  cio_write(cio, tk->urn[urn_num].location[3], 4);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_URN, 4);	/* URN       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags =  0 */
+
+    cio_write(cio, tk->urn[urn_num].name[0], 4);
+    cio_write(cio, tk->urn[urn_num].name[1], 4);
+    cio_write(cio, tk->urn[urn_num].name[2], 4);
+    cio_write(cio, tk->urn[urn_num].name[3], 4);
+    cio_write(cio, tk->urn[urn_num].location[0], 4);
+    cio_write(cio, tk->urn[urn_num].location[1], 4);
+    cio_write(cio, tk->urn[urn_num].location[2], 4);
+    cio_write(cio, tk->urn[urn_num].location[3], 4);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1474,37 +1471,37 @@ void mj2_write_urn(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
 */
 int mj2_read_urn(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
 {
-	
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_URN != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected URN Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in URN box\n");
-    return 1;
-  }
-	
-  if (1 != cio_read(cio, 3)) {	/* If flags = 1 --> media data in file */
-    tk->urn[urn_num].name[0] = cio_read(cio, 4);
-    tk->urn[urn_num].name[1] = cio_read(cio, 4);
-    tk->urn[urn_num].name[2] = cio_read(cio, 4);
-    tk->urn[urn_num].name[3] = cio_read(cio, 4);
-    tk->urn[urn_num].location[0] = cio_read(cio, 4);
-    tk->urn[urn_num].location[1] = cio_read(cio, 4);
-    tk->urn[urn_num].location[2] = cio_read(cio, 4);
-    tk->urn[urn_num].location[3] = cio_read(cio, 4);
-  }
-	
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with URN Box size\n");
-    return 1;
-  }
-  return 0;
+
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_URN != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected URN Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in URN box\n");
+        return 1;
+    }
+
+    if (1 != cio_read(cio, 3)) {	/* If flags = 1 --> media data in file */
+        tk->urn[urn_num].name[0] = cio_read(cio, 4);
+        tk->urn[urn_num].name[1] = cio_read(cio, 4);
+        tk->urn[urn_num].name[2] = cio_read(cio, 4);
+        tk->urn[urn_num].name[3] = cio_read(cio, 4);
+        tk->urn[urn_num].location[0] = cio_read(cio, 4);
+        tk->urn[urn_num].location[1] = cio_read(cio, 4);
+        tk->urn[urn_num].location[2] = cio_read(cio, 4);
+        tk->urn[urn_num].location[3] = cio_read(cio, 4);
+    }
+
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with URN Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 
@@ -1516,32 +1513,32 @@ int mj2_read_urn(mj2_tk_t * tk, int urn_num, opj_cio_t *cio)
 */
 void mj2_write_dref(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  int i;
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_DREF, 4);	/* DREF       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  if (tk->num_url + tk->num_urn == 0) {	/* Media data in same file */
-    cio_write(cio, 1, 4);		/* entry_count = 1 */
-    mj2_write_url(tk, 0, cio);
-  } else {
-    cio_write(cio, tk->num_url + tk->num_urn, 4);	/* entry_count */
-		
-    for (i = 0; i < tk->num_url; i++)
-      mj2_write_url(tk, i + 1, cio);
-		
-    for (i = 0; i < tk->num_urn; i++)
-      mj2_write_urn(tk, i, cio);
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    int i;
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_DREF, 4);	/* DREF       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    if (tk->num_url + tk->num_urn == 0) {	/* Media data in same file */
+        cio_write(cio, 1, 4);		/* entry_count = 1 */
+        mj2_write_url(tk, 0, cio);
+    } else {
+        cio_write(cio, tk->num_url + tk->num_urn, 4);	/* entry_count */
+
+        for (i = 0; i < tk->num_url; i++)
+            mj2_write_url(tk, i + 1, cio);
+
+        for (i = 0; i < tk->num_urn; i++)
+            mj2_write_urn(tk, i, cio);
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1552,57 +1549,57 @@ void mj2_write_dref(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_dref(mj2_tk_t * tk, opj_cio_t *cio)
 {
-	
-  int i;
-  int entry_count, marker;
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_DREF != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected DREF Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in DREF box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in DREF box. Expected flag 0\n");
-    return 1;
-  }
-	
-  entry_count = cio_read(cio, 4);
-  tk->num_url = 0;
-  tk->num_urn = 0;
-	
-  for (i = 0; i < entry_count; i++) {
-    cio_skip(cio,4);
-    marker = cio_read(cio, 4);
-    if (marker == MJ2_URL) {
-      cio_skip(cio,-8);
-      tk->num_url++;
-      if (mj2_read_url(tk, tk->num_url, cio))
-				return 1;
-    } else if (marker == MJ2_URN) {
-      cio_skip(cio,-8);
-      tk->num_urn++;
-      if (mj2_read_urn(tk, tk->num_urn, cio))
-				return 1;
-    } else {
-      opj_event_msg(cio->cinfo, EVT_ERROR, "Error with in DREF box. Expected URN or URL box\n");
-      return 1;
+
+    int i;
+    int entry_count, marker;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_DREF != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected DREF Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in DREF box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in DREF box. Expected flag 0\n");
+        return 1;
+    }
+
+    entry_count = cio_read(cio, 4);
+    tk->num_url = 0;
+    tk->num_urn = 0;
+
+    for (i = 0; i < entry_count; i++) {
+        cio_skip(cio,4);
+        marker = cio_read(cio, 4);
+        if (marker == MJ2_URL) {
+            cio_skip(cio,-8);
+            tk->num_url++;
+            if (mj2_read_url(tk, tk->num_url, cio))
+                return 1;
+        } else if (marker == MJ2_URN) {
+            cio_skip(cio,-8);
+            tk->num_urn++;
+            if (mj2_read_urn(tk, tk->num_urn, cio))
+                return 1;
+        } else {
+            opj_event_msg(cio->cinfo, EVT_ERROR, "Error with in DREF box. Expected URN or URL box\n");
+            return 1;
+        }
+
+    }
+
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with DREF Box size\n");
+        return 1;
     }
-		
-  }
-	
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with DREF Box size\n");
-    return 1;
-  }
-  return 0;
+    return 0;
 }
 
 /*
@@ -1613,18 +1610,18 @@ int mj2_read_dref(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_dinf(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_DINF, 4);	/* DINF       */
-	
-  mj2_write_dref(tk, cio);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_DINF, 4);	/* DINF       */
+
+    mj2_write_dref(tk, cio);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1635,22 +1632,22 @@ void mj2_write_dinf(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_dinf(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_DINF != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected DINF Marker\n");
-    return 1;
-  }
-	
-  if (mj2_read_dref(tk, cio))
-    return 1;
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with DINF Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_DINF != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected DINF Marker\n");
+        return 1;
+    }
+
+    if (mj2_read_dref(tk, cio))
+        return 1;
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with DINF Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1661,23 +1658,23 @@ int mj2_read_dinf(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_vmhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_VMHD, 4);	/* VMHD       */
-	
-  cio_write(cio, 1, 4);		/* Version = 0, flags = 1 */
-	
-  cio_write(cio, tk->graphicsmode, 2);
-  cio_write(cio, tk->opcolor[0], 2);
-  cio_write(cio, tk->opcolor[1], 2);
-  cio_write(cio, tk->opcolor[2], 2);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_VMHD, 4);	/* VMHD       */
+
+    cio_write(cio, 1, 4);		/* Version = 0, flags = 1 */
+
+    cio_write(cio, tk->graphicsmode, 2);
+    cio_write(cio, tk->opcolor[0], 2);
+    cio_write(cio, tk->opcolor[1], 2);
+    cio_write(cio, tk->opcolor[2], 2);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1688,35 +1685,35 @@ void mj2_write_vmhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_vmhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_VMHD != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected VMHD Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in VMHD box\n");
-    return 1;
-  }
-	
-  if (1 != cio_read(cio, 3)) {	/* Flags = 1  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in VMHD box. Expected flag 1\n");
-    return 1;
-  }
-	
-  tk->track_type = 0;
-  tk->graphicsmode = cio_read(cio, 2);
-  tk->opcolor[0] = cio_read(cio, 2);
-  tk->opcolor[1] = cio_read(cio, 2);
-  tk->opcolor[2] = cio_read(cio, 2);
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with VMHD Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_VMHD != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected VMHD Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in VMHD box\n");
+        return 1;
+    }
+
+    if (1 != cio_read(cio, 3)) {	/* Flags = 1  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in VMHD box. Expected flag 1\n");
+        return 1;
+    }
+
+    tk->track_type = 0;
+    tk->graphicsmode = cio_read(cio, 2);
+    tk->opcolor[0] = cio_read(cio, 2);
+    tk->opcolor[1] = cio_read(cio, 2);
+    tk->opcolor[2] = cio_read(cio, 2);
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with VMHD Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1727,22 +1724,22 @@ int mj2_read_vmhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_smhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_SMHD, 4);	/* SMHD       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, tk->balance, 2);
-	
-  cio_write(cio, 0, 2);		/* Reserved */
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_SMHD, 4);	/* SMHD       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, tk->balance, 2);
+
+    cio_write(cio, 0, 2);		/* Reserved */
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1753,44 +1750,44 @@ void mj2_write_smhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_smhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_SMHD != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected SMHD Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in SMHD box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in SMHD box. Expected flag 0\n");
-    return 1;
-  }
-	
-  tk->track_type = 1;
-  tk->balance = cio_read(cio, 2);
-	
-  /* Init variables to zero to avoid problems when freeeing memory
-  The values will possibly be overidded when decoding the track structure */
-  tk->num_br = 0;
-  tk->num_url = 0;
-  tk->num_urn = 0;
-  tk->num_chunks = 0;
-  tk->num_tts = 0;
-  tk->num_samplestochunk = 0;
-  tk->num_samples = 0;
-	
-  cio_skip(cio,2);			/* Reserved */
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with SMHD Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_SMHD != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected SMHD Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in SMHD box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in SMHD box. Expected flag 0\n");
+        return 1;
+    }
+
+    tk->track_type = 1;
+    tk->balance = cio_read(cio, 2);
+
+    /* Init variables to zero to avoid problems when freeeing memory
+    The values will possibly be overidded when decoding the track structure */
+    tk->num_br = 0;
+    tk->num_url = 0;
+    tk->num_urn = 0;
+    tk->num_chunks = 0;
+    tk->num_tts = 0;
+    tk->num_samplestochunk = 0;
+    tk->num_samples = 0;
+
+    cio_skip(cio,2);			/* Reserved */
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with SMHD Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1801,24 +1798,24 @@ int mj2_read_smhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_hmhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_HMHD, 4);	/* HMHD       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, tk->maxPDUsize, 2);
-  cio_write(cio, tk->avgPDUsize, 2);
-  cio_write(cio, tk->maxbitrate, 4);
-  cio_write(cio, tk->avgbitrate, 4);
-  cio_write(cio, tk->slidingavgbitrate, 4);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_HMHD, 4);	/* HMHD       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, tk->maxPDUsize, 2);
+    cio_write(cio, tk->avgPDUsize, 2);
+    cio_write(cio, tk->maxbitrate, 4);
+    cio_write(cio, tk->avgbitrate, 4);
+    cio_write(cio, tk->slidingavgbitrate, 4);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1829,47 +1826,47 @@ void mj2_write_hmhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_hmhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_HMHD != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected HMHD Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in HMHD box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in HMHD box. Expected flag 0\n");
-    return 1;
-  }
-	
-  tk->track_type = 2;
-  tk->maxPDUsize = cio_read(cio, 2);
-  tk->avgPDUsize = cio_read(cio, 2);
-  tk->maxbitrate = cio_read(cio, 4);
-  tk->avgbitrate = cio_read(cio, 4);
-  tk->slidingavgbitrate = cio_read(cio, 4);
-	
-  /* Init variables to zero to avoid problems when freeeing memory
-  The values will possibly be overidded when decoding the track structure */
-  tk->num_br = 0;
-  tk->num_url = 0;
-  tk->num_urn = 0;
-  tk->num_chunks = 0;
-  tk->num_tts = 0;
-  tk->num_samplestochunk = 0;
-  tk->num_samples = 0;
-	
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with HMHD Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_HMHD != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected HMHD Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in HMHD box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in HMHD box. Expected flag 0\n");
+        return 1;
+    }
+
+    tk->track_type = 2;
+    tk->maxPDUsize = cio_read(cio, 2);
+    tk->avgPDUsize = cio_read(cio, 2);
+    tk->maxbitrate = cio_read(cio, 4);
+    tk->avgbitrate = cio_read(cio, 4);
+    tk->slidingavgbitrate = cio_read(cio, 4);
+
+    /* Init variables to zero to avoid problems when freeeing memory
+    The values will possibly be overidded when decoding the track structure */
+    tk->num_br = 0;
+    tk->num_url = 0;
+    tk->num_urn = 0;
+    tk->num_chunks = 0;
+    tk->num_tts = 0;
+    tk->num_samplestochunk = 0;
+    tk->num_samples = 0;
+
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with HMHD Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1880,27 +1877,27 @@ int mj2_read_hmhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_minf(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_MINF, 4);	/* MINF       */
-	
-  if (tk->track_type == 0) {
-    mj2_write_vmhd(tk, cio);
-  } else if (tk->track_type == 1) {
-    mj2_write_smhd(tk, cio);
-  } else if (tk->track_type == 2) {
-    mj2_write_hmhd(tk, cio);
-  }
-	
-  mj2_write_dinf(tk, cio);
-  mj2_write_stbl(tk, cio);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_MINF, 4);	/* MINF       */
+
+    if (tk->track_type == 0) {
+        mj2_write_vmhd(tk, cio);
+    } else if (tk->track_type == 1) {
+        mj2_write_smhd(tk, cio);
+    } else if (tk->track_type == 2) {
+        mj2_write_hmhd(tk, cio);
+    }
+
+    mj2_write_dinf(tk, cio);
+    mj2_write_stbl(tk, cio);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -1911,45 +1908,45 @@ void mj2_write_minf(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_minf(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 {
-	
-  unsigned int box_type;
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_MINF != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MINF Marker\n");
-    return 1;
-  }
-	
-  cio_skip(cio,4);
-  box_type = cio_read(cio, 4);
-  cio_skip(cio,-8);
-	
-  if (box_type == MJ2_VMHD) {
-    if (mj2_read_vmhd(tk, cio))
-      return 1;
-  } else if (box_type == MJ2_SMHD) {
-    if (mj2_read_smhd(tk, cio))
-      return 1;
-  } else if (box_type == MJ2_HMHD) {
-    if (mj2_read_hmhd(tk, cio))
-      return 1;
-  } else {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error in MINF box expected vmhd, smhd or hmhd\n");
-    return 1;
-  }
-	
-  if (mj2_read_dinf(tk, cio))
-    return 1;
-	
-  if (mj2_read_stbl(tk, img, cio))
-    return 1;
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MINF Box size\n");
-    return 1;
-  }
-  return 0;
+
+    unsigned int box_type;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_MINF != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MINF Marker\n");
+        return 1;
+    }
+
+    cio_skip(cio,4);
+    box_type = cio_read(cio, 4);
+    cio_skip(cio,-8);
+
+    if (box_type == MJ2_VMHD) {
+        if (mj2_read_vmhd(tk, cio))
+            return 1;
+    } else if (box_type == MJ2_SMHD) {
+        if (mj2_read_smhd(tk, cio))
+            return 1;
+    } else if (box_type == MJ2_HMHD) {
+        if (mj2_read_hmhd(tk, cio))
+            return 1;
+    } else {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error in MINF box expected vmhd, smhd or hmhd\n");
+        return 1;
+    }
+
+    if (mj2_read_dinf(tk, cio))
+        return 1;
+
+    if (mj2_read_stbl(tk, img, cio))
+        return 1;
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MINF Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -1960,57 +1957,57 @@ int mj2_read_minf(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 */
 void mj2_write_hdlr(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_HDLR, 4);	/* HDLR       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, 0, 4);		/* Predefine */
-	
-  tk->name = 0;			/* The track name is immediately determined by the track type */
-	
-  if (tk->track_type == 0) {
-    tk->handler_type = 0x76696465;	/* Handler type: vide */
-    cio_write(cio, tk->handler_type, 4);
-		
-    cio_write(cio, 0, 4);
-    cio_write(cio, 0, 4);
-    cio_write(cio, 0, 4);		/* Reserved */
-		
-    cio_write(cio, 0x76696465, 4);
-    cio_write(cio, 0x6F206d65, 4);
-    cio_write(cio, 0x64696120, 4);
-    cio_write(cio, 0x74726163, 4);
-    cio_write(cio, 0x6b00, 2);	/* String: video media track */
-  } else if (tk->track_type == 1) {
-    tk->handler_type = 0x736F756E;	/* Handler type: soun */
-    cio_write(cio, tk->handler_type, 4);
-		
-    cio_write(cio, 0, 4);
-    cio_write(cio, 0, 4);
-    cio_write(cio, 0, 4);		/* Reserved */
-		
-    cio_write(cio, 0x536F756E, 4);
-    cio_write(cio, 0x6400, 2);	/* String: Sound */
-  } else if (tk->track_type == 2) {
-    tk->handler_type = 0x68696E74;	/* Handler type: hint */
-    cio_write(cio, tk->handler_type, 4);
-		
-    cio_write(cio, 0, 4);
-    cio_write(cio, 0, 4);
-    cio_write(cio, 0, 4);		/* Reserved */
-		
-    cio_write(cio, 0x48696E74, 4);
-    cio_write(cio, 0, 2);		/* String: Hint */
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_HDLR, 4);	/* HDLR       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, 0, 4);		/* Predefine */
+
+    tk->name = 0;			/* The track name is immediately determined by the track type */
+
+    if (tk->track_type == 0) {
+        tk->handler_type = 0x76696465;	/* Handler type: vide */
+        cio_write(cio, tk->handler_type, 4);
+
+        cio_write(cio, 0, 4);
+        cio_write(cio, 0, 4);
+        cio_write(cio, 0, 4);		/* Reserved */
+
+        cio_write(cio, 0x76696465, 4);
+        cio_write(cio, 0x6F206d65, 4);
+        cio_write(cio, 0x64696120, 4);
+        cio_write(cio, 0x74726163, 4);
+        cio_write(cio, 0x6b00, 2);	/* String: video media track */
+    } else if (tk->track_type == 1) {
+        tk->handler_type = 0x736F756E;	/* Handler type: soun */
+        cio_write(cio, tk->handler_type, 4);
+
+        cio_write(cio, 0, 4);
+        cio_write(cio, 0, 4);
+        cio_write(cio, 0, 4);		/* Reserved */
+
+        cio_write(cio, 0x536F756E, 4);
+        cio_write(cio, 0x6400, 2);	/* String: Sound */
+    } else if (tk->track_type == 2) {
+        tk->handler_type = 0x68696E74;	/* Handler type: hint */
+        cio_write(cio, tk->handler_type, 4);
+
+        cio_write(cio, 0, 4);
+        cio_write(cio, 0, 4);
+        cio_write(cio, 0, 4);		/* Reserved */
+
+        cio_write(cio, 0x48696E74, 4);
+        cio_write(cio, 0, 2);		/* String: Hint */
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -2021,43 +2018,43 @@ void mj2_write_hdlr(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_hdlr(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  int i;
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_HDLR != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected HDLR Marker\n");
-    return 1;
-  }
-	
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in HDLR box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in HDLR box. Expected flag 0\n");
-    return 1;
-  }
-	
-  cio_skip(cio,4);			/* Reserved */
-	
-  tk->handler_type = cio_read(cio, 4);
-  cio_skip(cio,12);			/* Reserved */
-	
-  tk->name_size = box.length - 32;
-
-  tk->name = (char*) opj_malloc(tk->name_size * sizeof(char));
-  for (i = 0; i < tk->name_size; i++) {
-    tk->name[i] = cio_read(cio, 1);	/* Name */
-  }
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with HDLR Box size\n");
-    return 1;
-  }
-  return 0;
+    int i;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_HDLR != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected HDLR Marker\n");
+        return 1;
+    }
+
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in HDLR box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0  */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in HDLR box. Expected flag 0\n");
+        return 1;
+    }
+
+    cio_skip(cio,4);			/* Reserved */
+
+    tk->handler_type = cio_read(cio, 4);
+    cio_skip(cio,12);			/* Reserved */
+
+    tk->name_size = box.length - 32;
+
+    tk->name = (char*) opj_malloc(tk->name_size * sizeof(char));
+    for (i = 0; i < tk->name_size; i++) {
+        tk->name[i] = cio_read(cio, 1);	/* Name */
+    }
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with HDLR Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -2068,41 +2065,41 @@ int mj2_read_hdlr(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_mdhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-  unsigned int i;
-  time_t ltime;
-  unsigned int modification_time;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_MDHD, 4);	/* MDHD       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  cio_write(cio, tk->creation_time, 4);	/* Creation Time */
-	
-  time(&ltime);			/* Time since 1/1/70 */
-  modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
-	
-  cio_write(cio, modification_time, 4);	/* Modification Time */
-	
-  cio_write(cio, tk->timescale, 4);	/* Timescale */
-	
-  tk->duration = 0;
-	
-  for (i = 0; i < tk->num_samples; i++)
-    tk->duration += tk->sample[i].sample_delta;
-	
-  cio_write(cio, tk->duration, 4);	/* Duration */
-	
-  cio_write(cio, tk->language, 2);	/* Language */
-	
-  cio_write(cio, 0, 2);		/* Predefined */
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+    unsigned int i;
+    time_t ltime;
+    unsigned int modification_time;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_MDHD, 4);	/* MDHD       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    cio_write(cio, tk->creation_time, 4);	/* Creation Time */
+
+    time(&ltime);			/* Time since 1/1/70 */
+    modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
+
+    cio_write(cio, modification_time, 4);	/* Modification Time */
+
+    cio_write(cio, tk->timescale, 4);	/* Timescale */
+
+    tk->duration = 0;
+
+    for (i = 0; i < tk->num_samples; i++)
+        tk->duration += tk->sample[i].sample_delta;
+
+    cio_write(cio, tk->duration, 4);	/* Duration */
+
+    cio_write(cio, tk->language, 2);	/* Language */
+
+    cio_write(cio, 0, 2);		/* Predefined */
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -2113,42 +2110,42 @@ void mj2_write_mdhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_mdhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (!(MJ2_MHDR == box.type || MJ2_MDHD == box.type)) {	/* Kakadu writes MHDR instead of MDHD*/
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MDHD Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MDHD box\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 3)) {	/* Flags = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in MDHD box. Expected flag 0\n");
-    return 1;
-  }
-	
-	
-  tk->creation_time = cio_read(cio, 4);	/* Creation Time */
-	
-  tk->modification_time = cio_read(cio, 4);	/* Modification Time */
-	
-  tk->timescale = cio_read(cio, 4);	/* Timescale */
-	
-  tk->duration = cio_read(cio, 4);	/* Duration */
-	
-  tk->language = cio_read(cio, 2);	/* Language */
-	
-  cio_skip(cio,2);			/* Predefined */
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MDHD Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (!(MJ2_MHDR == box.type || MJ2_MDHD == box.type)) {	/* Kakadu writes MHDR instead of MDHD*/
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MDHD Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MDHD box\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 3)) {	/* Flags = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with flag in MDHD box. Expected flag 0\n");
+        return 1;
+    }
+
+
+    tk->creation_time = cio_read(cio, 4);	/* Creation Time */
+
+    tk->modification_time = cio_read(cio, 4);	/* Modification Time */
+
+    tk->timescale = cio_read(cio, 4);	/* Timescale */
+
+    tk->duration = cio_read(cio, 4);	/* Duration */
+
+    tk->language = cio_read(cio, 2);	/* Language */
+
+    cio_skip(cio,2);			/* Predefined */
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MDHD Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -2159,20 +2156,20 @@ int mj2_read_mdhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_mdia(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_MDIA, 4);	/* MDIA       */
-	
-  mj2_write_mdhd(tk, cio);
-  mj2_write_hdlr(tk, cio);
-  mj2_write_minf(tk, cio);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_MDIA, 4);	/* MDIA       */
+
+    mj2_write_mdhd(tk, cio);
+    mj2_write_hdlr(tk, cio);
+    mj2_write_minf(tk, cio);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -2183,26 +2180,26 @@ void mj2_write_mdia(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_mdia(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_MDIA != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MDIA Marker\n");
-    return 1;
-  }
-	
-  if (mj2_read_mdhd(tk, cio))
-    return 1;
-  if (mj2_read_hdlr(tk, cio))
-    return 1;
-  if (mj2_read_minf(tk, img, cio))
-    return 1;
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MDIA Box size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_MDIA != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MDIA Marker\n");
+        return 1;
+    }
+
+    if (mj2_read_mdhd(tk, cio))
+        return 1;
+    if (mj2_read_hdlr(tk, cio))
+        return 1;
+    if (mj2_read_minf(tk, img, cio))
+        return 1;
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MDIA Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -2213,64 +2210,64 @@ int mj2_read_mdia(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 */
 void mj2_write_tkhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-  unsigned int i;
-  time_t ltime;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-	
-  cio_write(cio, MJ2_TKHD, 4);	/* TKHD       */
-	
-  cio_write(cio, 3, 4);		/* Version=0, flags=3 */
-	
-  time(&ltime);			/* Time since 1/1/70 */
-  tk->modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
-	
-  cio_write(cio, tk->creation_time, 4);	/* Creation Time */
-	
-  cio_write(cio, tk->modification_time, 4);	/* Modification Time */
-	
-  cio_write(cio, tk->track_ID, 4);	/* Track ID */
-	
-  cio_write(cio, 0, 4);		/* Reserved */
-	
-  tk->duration = 0;
-	
-  for (i = 0; i < tk->num_samples; i++)
-    tk->duration += tk->sample[i].sample_delta;
-	
-  cio_write(cio, tk->duration, 4);	/* Duration */
-	
-  cio_write(cio, 0, 4);		/* Reserved */
-  cio_write(cio, 0, 4);		/* Reserved */
-	
-  cio_write(cio, tk->layer, 2);	/* Layer    */
-	
-  cio_write(cio, 0, 2);		/* Predefined */
-	
-  cio_write(cio, tk->volume, 2);	/* Volume       */
-	
-  cio_write(cio, 0, 2);		/* Reserved */
-	
-  cio_write(cio, tk->trans_matrix[0], 4);	/* Transformation matrix for track */
-  cio_write(cio, tk->trans_matrix[1], 4);
-  cio_write(cio, tk->trans_matrix[2], 4);
-  cio_write(cio, tk->trans_matrix[3], 4);
-  cio_write(cio, tk->trans_matrix[4], 4);
-  cio_write(cio, tk->trans_matrix[5], 4);
-  cio_write(cio, tk->trans_matrix[6], 4);
-  cio_write(cio, tk->trans_matrix[7], 4);
-  cio_write(cio, tk->trans_matrix[8], 4);
-	
-  cio_write(cio, tk->visual_w, 4);	/* Video Visual Width  */
-	
-  cio_write(cio, tk->visual_h, 4);	/* Video Visual Height */
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+    unsigned int i;
+    time_t ltime;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+
+    cio_write(cio, MJ2_TKHD, 4);	/* TKHD       */
+
+    cio_write(cio, 3, 4);		/* Version=0, flags=3 */
+
+    time(&ltime);			/* Time since 1/1/70 */
+    tk->modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
+
+    cio_write(cio, tk->creation_time, 4);	/* Creation Time */
+
+    cio_write(cio, tk->modification_time, 4);	/* Modification Time */
+
+    cio_write(cio, tk->track_ID, 4);	/* Track ID */
+
+    cio_write(cio, 0, 4);		/* Reserved */
+
+    tk->duration = 0;
+
+    for (i = 0; i < tk->num_samples; i++)
+        tk->duration += tk->sample[i].sample_delta;
+
+    cio_write(cio, tk->duration, 4);	/* Duration */
+
+    cio_write(cio, 0, 4);		/* Reserved */
+    cio_write(cio, 0, 4);		/* Reserved */
+
+    cio_write(cio, tk->layer, 2);	/* Layer    */
+
+    cio_write(cio, 0, 2);		/* Predefined */
+
+    cio_write(cio, tk->volume, 2);	/* Volume       */
+
+    cio_write(cio, 0, 2);		/* Reserved */
+
+    cio_write(cio, tk->trans_matrix[0], 4);	/* Transformation matrix for track */
+    cio_write(cio, tk->trans_matrix[1], 4);
+    cio_write(cio, tk->trans_matrix[2], 4);
+    cio_write(cio, tk->trans_matrix[3], 4);
+    cio_write(cio, tk->trans_matrix[4], 4);
+    cio_write(cio, tk->trans_matrix[5], 4);
+    cio_write(cio, tk->trans_matrix[6], 4);
+    cio_write(cio, tk->trans_matrix[7], 4);
+    cio_write(cio, tk->trans_matrix[8], 4);
+
+    cio_write(cio, tk->visual_w, 4);	/* Video Visual Width  */
+
+    cio_write(cio, tk->visual_h, 4);	/* Video Visual Height */
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -2281,69 +2278,69 @@ void mj2_write_tkhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_tkhd(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  int flag;
-	
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-	
-  if (MJ2_TKHD != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected TKHD Marker\n");
-    return 1;
-  }
-	
-  if (0 != cio_read(cio, 1)) {	/* Version = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in TKHD box\n");
-    return 1;
-  }
-	
-  flag = cio_read(cio, 3);
-	
-  if (!(flag == 1 || flag == 2 || flag == 3 || flag == 4)) {	/* Flags = 1,2,3 or 4 */
-    opj_event_msg(cio->cinfo, EVT_ERROR,
-			"Error with flag in TKHD box: Expected flag 1,2,3 or 4\n");
-    return 1;
-  }
-	
-  tk->creation_time = cio_read(cio, 4);	/* Creation Time */
-	
-  tk->modification_time = cio_read(cio, 4);	/* Modification Time */
-	
-  tk->track_ID = cio_read(cio, 4);	/* Track ID */
-	
-  cio_skip(cio,4);			/* Reserved */
-	
-  tk->duration = cio_read(cio, 4);	/* Duration */
-	
-  cio_skip(cio,8);			/* Reserved */
-	
-  tk->layer = cio_read(cio, 2);	/* Layer    */
-	
-  cio_read(cio, 2);			/* Predefined */
-	
-  tk->volume = cio_read(cio, 2);	/* Volume       */
-	
-  cio_skip(cio,2);			/* Reserved */
-	
-  tk->trans_matrix[0] = cio_read(cio, 4);	/* Transformation matrix for track */
-  tk->trans_matrix[1] = cio_read(cio, 4);
-  tk->trans_matrix[2] = cio_read(cio, 4);
-  tk->trans_matrix[3] = cio_read(cio, 4);
-  tk->trans_matrix[4] = cio_read(cio, 4);
-  tk->trans_matrix[5] = cio_read(cio, 4);
-  tk->trans_matrix[6] = cio_read(cio, 4);
-  tk->trans_matrix[7] = cio_read(cio, 4);
-  tk->trans_matrix[8] = cio_read(cio, 4);
-	
-  tk->visual_w = cio_read(cio, 4);	/* Video Visual Width  */
-	
-  tk->visual_h = cio_read(cio, 4);	/* Video Visual Height */
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with TKHD Box size\n");
-    return 1;
-  }
-  return 0;
+    int flag;
+
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+
+    if (MJ2_TKHD != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected TKHD Marker\n");
+        return 1;
+    }
+
+    if (0 != cio_read(cio, 1)) {	/* Version = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in TKHD box\n");
+        return 1;
+    }
+
+    flag = cio_read(cio, 3);
+
+    if (!(flag == 1 || flag == 2 || flag == 3 || flag == 4)) {	/* Flags = 1,2,3 or 4 */
+        opj_event_msg(cio->cinfo, EVT_ERROR,
+                      "Error with flag in TKHD box: Expected flag 1,2,3 or 4\n");
+        return 1;
+    }
+
+    tk->creation_time = cio_read(cio, 4);	/* Creation Time */
+
+    tk->modification_time = cio_read(cio, 4);	/* Modification Time */
+
+    tk->track_ID = cio_read(cio, 4);	/* Track ID */
+
+    cio_skip(cio,4);			/* Reserved */
+
+    tk->duration = cio_read(cio, 4);	/* Duration */
+
+    cio_skip(cio,8);			/* Reserved */
+
+    tk->layer = cio_read(cio, 2);	/* Layer    */
+
+    cio_read(cio, 2);			/* Predefined */
+
+    tk->volume = cio_read(cio, 2);	/* Volume       */
+
+    cio_skip(cio,2);			/* Reserved */
+
+    tk->trans_matrix[0] = cio_read(cio, 4);	/* Transformation matrix for track */
+    tk->trans_matrix[1] = cio_read(cio, 4);
+    tk->trans_matrix[2] = cio_read(cio, 4);
+    tk->trans_matrix[3] = cio_read(cio, 4);
+    tk->trans_matrix[4] = cio_read(cio, 4);
+    tk->trans_matrix[5] = cio_read(cio, 4);
+    tk->trans_matrix[6] = cio_read(cio, 4);
+    tk->trans_matrix[7] = cio_read(cio, 4);
+    tk->trans_matrix[8] = cio_read(cio, 4);
+
+    tk->visual_w = cio_read(cio, 4);	/* Video Visual Width  */
+
+    tk->visual_h = cio_read(cio, 4);	/* Video Visual Height */
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with TKHD Box size\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -2354,20 +2351,20 @@ int mj2_read_tkhd(mj2_tk_t * tk, opj_cio_t *cio)
 */
 void mj2_write_trak(mj2_tk_t * tk, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-	
-  cio_write(cio, MJ2_TRAK, 4);	/* TRAK       */
-	
-  mj2_write_tkhd(tk, cio);
-  mj2_write_mdia(tk, cio);
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+
+    cio_write(cio, MJ2_TRAK, 4);	/* TRAK       */
+
+    mj2_write_tkhd(tk, cio);
+    mj2_write_mdia(tk, cio);
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -2378,22 +2375,22 @@ void mj2_write_trak(mj2_tk_t * tk, opj_cio_t *cio)
 */
 int mj2_read_trak(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_TRAK != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected TRAK Marker\n");
-    return 1;
-  }
-  if (mj2_read_tkhd(tk, cio))
-    return 1;
-  if (mj2_read_mdia(tk, img, cio))
-    return 1;
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with TRAK Box\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_TRAK != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected TRAK Marker\n");
+        return 1;
+    }
+    if (mj2_read_tkhd(tk, cio))
+        return 1;
+    if (mj2_read_mdia(tk, img, cio))
+        return 1;
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with TRAK Box\n");
+        return 1;
+    }
+    return 0;
 }
 
 /*
@@ -2404,78 +2401,78 @@ int mj2_read_trak(mj2_tk_t * tk, opj_image_t * img, opj_cio_t *cio)
 */
 void mj2_write_mvhd(opj_mj2_t * movie, opj_cio_t *cio)
 {
-  int i;
-  mj2_box_t box;
-  unsigned j;
-  time_t ltime;
-  int max_tk_num = 0;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_MVHD, 4);	/* MVHD       */
-	
-  cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
-	
-  time(&ltime);			/* Time since 1/1/70 */
-  movie->modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
-	
-  cio_write(cio, movie->creation_time, 4);	/* Creation Time */
-	
-  cio_write(cio, movie->modification_time, 4);	/* Modification Time */
-	
-  cio_write(cio, movie->timescale, 4);	/* Timescale */
-	
-  movie->duration = 0;
-	
-  for (i = 0; i < (movie->num_stk + movie->num_htk + movie->num_vtk); i++) {
-    mj2_tk_t *tk = &movie->tk[i];
-		
-    for (j = 0; j < tk->num_samples; j++) {
-      movie->duration += tk->sample[j].sample_delta;
-    }
-  }
-	
-  cio_write(cio, movie->duration, 4);
-	
-  cio_write(cio, movie->rate, 4);	/* Rate to play presentation    */
-	
-  cio_write(cio, movie->volume, 2);	/* Volume       */
-	
-  cio_write(cio, 0, 2);		/* Reserved */
-  cio_write(cio, 0, 4);		/* Reserved */
-  cio_write(cio, 0, 4);		/* Reserved */
-	
-  cio_write(cio, movie->trans_matrix[0], 4);	/* Transformation matrix for video */
-  cio_write(cio, movie->trans_matrix[1], 4);
-  cio_write(cio, movie->trans_matrix[2], 4);
-  cio_write(cio, movie->trans_matrix[3], 4);
-  cio_write(cio, movie->trans_matrix[4], 4);
-  cio_write(cio, movie->trans_matrix[5], 4);
-  cio_write(cio, movie->trans_matrix[6], 4);
-  cio_write(cio, movie->trans_matrix[7], 4);
-  cio_write(cio, movie->trans_matrix[8], 4);
-	
-  cio_write(cio, 0, 4);		/* Pre-defined */
-  cio_write(cio, 0, 4);		/* Pre-defined */
-  cio_write(cio, 0, 4);		/* Pre-defined */
-  cio_write(cio, 0, 4);		/* Pre-defined */
-  cio_write(cio, 0, 4);		/* Pre-defined */
-  cio_write(cio, 0, 4);		/* Pre-defined */
-	
-	
-  for (i = 0; i < movie->num_htk + movie->num_stk + movie->num_vtk; i++) {
-    if (max_tk_num < movie->tk[i].track_ID)
-      max_tk_num = movie->tk[i].track_ID;
-  }
-	
-  movie->next_tk_id = max_tk_num + 1;
-	
-  cio_write(cio, movie->next_tk_id, 4);	/* ID of Next track to be added */
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);
+    int i;
+    mj2_box_t box;
+    unsigned j;
+    time_t ltime;
+    int max_tk_num = 0;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_MVHD, 4);	/* MVHD       */
+
+    cio_write(cio, 0, 4);		/* Version = 0, flags = 0 */
+
+    time(&ltime);			/* Time since 1/1/70 */
+    movie->modification_time = (unsigned int)ltime + 2082844800;	/* Seoonds between 1/1/04 and 1/1/70 */
+
+    cio_write(cio, movie->creation_time, 4);	/* Creation Time */
+
+    cio_write(cio, movie->modification_time, 4);	/* Modification Time */
+
+    cio_write(cio, movie->timescale, 4);	/* Timescale */
+
+    movie->duration = 0;
+
+    for (i = 0; i < (movie->num_stk + movie->num_htk + movie->num_vtk); i++) {
+        mj2_tk_t *tk = &movie->tk[i];
+
+        for (j = 0; j < tk->num_samples; j++) {
+            movie->duration += tk->sample[j].sample_delta;
+        }
+    }
+
+    cio_write(cio, movie->duration, 4);
+
+    cio_write(cio, movie->rate, 4);	/* Rate to play presentation    */
+
+    cio_write(cio, movie->volume, 2);	/* Volume       */
+
+    cio_write(cio, 0, 2);		/* Reserved */
+    cio_write(cio, 0, 4);		/* Reserved */
+    cio_write(cio, 0, 4);		/* Reserved */
+
+    cio_write(cio, movie->trans_matrix[0], 4);	/* Transformation matrix for video */
+    cio_write(cio, movie->trans_matrix[1], 4);
+    cio_write(cio, movie->trans_matrix[2], 4);
+    cio_write(cio, movie->trans_matrix[3], 4);
+    cio_write(cio, movie->trans_matrix[4], 4);
+    cio_write(cio, movie->trans_matrix[5], 4);
+    cio_write(cio, movie->trans_matrix[6], 4);
+    cio_write(cio, movie->trans_matrix[7], 4);
+    cio_write(cio, movie->trans_matrix[8], 4);
+
+    cio_write(cio, 0, 4);		/* Pre-defined */
+    cio_write(cio, 0, 4);		/* Pre-defined */
+    cio_write(cio, 0, 4);		/* Pre-defined */
+    cio_write(cio, 0, 4);		/* Pre-defined */
+    cio_write(cio, 0, 4);		/* Pre-defined */
+    cio_write(cio, 0, 4);		/* Pre-defined */
+
+
+    for (i = 0; i < movie->num_htk + movie->num_stk + movie->num_vtk; i++) {
+        if (max_tk_num < movie->tk[i].track_ID)
+            max_tk_num = movie->tk[i].track_ID;
+    }
+
+    movie->next_tk_id = max_tk_num + 1;
+
+    cio_write(cio, movie->next_tk_id, 4);	/* ID of Next track to be added */
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -2486,52 +2483,52 @@ void mj2_write_mvhd(opj_mj2_t * movie, opj_cio_t *cio)
 */
 int mj2_read_mvhd(opj_mj2_t * movie, opj_cio_t *cio)
 {
-  mj2_box_t box;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_MVHD != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MVHD Marker\n");
-    return 1;
-  }
-	
-	
-  if (0 != cio_read(cio, 4)) {	/* Version = 0, flags = 0 */
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MVHD box\n");
-  }
-	
-  movie->creation_time = cio_read(cio, 4);	/* Creation Time */
-	
-  movie->modification_time = cio_read(cio, 4);	/* Modification Time */
-	
-  movie->timescale = cio_read(cio, 4);	/* Timescale */
-	
-  movie->duration = cio_read(cio, 4);	/* Duration */
-	
-  movie->rate = cio_read(cio, 4);		/* Rate to play presentation    */
-	
-  movie->volume = cio_read(cio, 2);		/* Volume       */
-	
-  cio_skip(cio,10);				/* Reserved */
-	
-  movie->trans_matrix[0] = cio_read(cio, 4);	/* Transformation matrix for video */
-  movie->trans_matrix[1] = cio_read(cio, 4);
-  movie->trans_matrix[2] = cio_read(cio, 4);
-  movie->trans_matrix[3] = cio_read(cio, 4);
-  movie->trans_matrix[4] = cio_read(cio, 4);
-  movie->trans_matrix[5] = cio_read(cio, 4);
-  movie->trans_matrix[6] = cio_read(cio, 4);
-  movie->trans_matrix[7] = cio_read(cio, 4);
-  movie->trans_matrix[8] = cio_read(cio, 4);
-	
-  cio_skip(cio,24);			/* Pre-defined */
-	
-  movie->next_tk_id = cio_read(cio, 4);	/* ID of Next track to be added */
-	
-  if (cio_tell(cio) - box.init_pos != box.length) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MVHD Box Size\n");
-    return 1;
-  }
-  return 0;
+    mj2_box_t box;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_MVHD != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MVHD Marker\n");
+        return 1;
+    }
+
+
+    if (0 != cio_read(cio, 4)) {	/* Version = 0, flags = 0 */
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Only Version 0 handled in MVHD box\n");
+    }
+
+    movie->creation_time = cio_read(cio, 4);	/* Creation Time */
+
+    movie->modification_time = cio_read(cio, 4);	/* Modification Time */
+
+    movie->timescale = cio_read(cio, 4);	/* Timescale */
+
+    movie->duration = cio_read(cio, 4);	/* Duration */
+
+    movie->rate = cio_read(cio, 4);		/* Rate to play presentation    */
+
+    movie->volume = cio_read(cio, 2);		/* Volume       */
+
+    cio_skip(cio,10);				/* Reserved */
+
+    movie->trans_matrix[0] = cio_read(cio, 4);	/* Transformation matrix for video */
+    movie->trans_matrix[1] = cio_read(cio, 4);
+    movie->trans_matrix[2] = cio_read(cio, 4);
+    movie->trans_matrix[3] = cio_read(cio, 4);
+    movie->trans_matrix[4] = cio_read(cio, 4);
+    movie->trans_matrix[5] = cio_read(cio, 4);
+    movie->trans_matrix[6] = cio_read(cio, 4);
+    movie->trans_matrix[7] = cio_read(cio, 4);
+    movie->trans_matrix[8] = cio_read(cio, 4);
+
+    cio_skip(cio,24);			/* Pre-defined */
+
+    movie->next_tk_id = cio_read(cio, 4);	/* ID of Next track to be added */
+
+    if (cio_tell(cio) - box.init_pos != box.length) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MVHD Box Size\n");
+        return 1;
+    }
+    return 0;
 }
 
 
@@ -2543,23 +2540,23 @@ int mj2_read_mvhd(opj_mj2_t * movie, opj_cio_t *cio)
 */
 void OPJ_CALLCONV mj2_write_moov(opj_mj2_t * movie, opj_cio_t *cio)
 {
-  int i;
-  mj2_box_t box;
-	
-  box.init_pos = cio_tell(cio);
-  cio_skip(cio,4);
-  cio_write(cio, MJ2_MOOV, 4);	/* MOOV       */
-	
-  mj2_write_mvhd(movie, cio);
-	
-  for (i = 0; i < (movie->num_stk + movie->num_htk + movie->num_vtk); i++) {
-    mj2_write_trak(&movie->tk[i], cio);
-  }
-	
-  box.length = cio_tell(cio) - box.init_pos;
-  cio_seek(cio, box.init_pos);
-  cio_write(cio, box.length, 4);	/* L          */
-  cio_seek(cio, box.init_pos + box.length);	
+    int i;
+    mj2_box_t box;
+
+    box.init_pos = cio_tell(cio);
+    cio_skip(cio,4);
+    cio_write(cio, MJ2_MOOV, 4);	/* MOOV       */
+
+    mj2_write_mvhd(movie, cio);
+
+    for (i = 0; i < (movie->num_stk + movie->num_htk + movie->num_vtk); i++) {
+        mj2_write_trak(&movie->tk[i], cio);
+    }
+
+    box.length = cio_tell(cio) - box.init_pos;
+    cio_seek(cio, box.init_pos);
+    cio_write(cio, box.length, 4);	/* L          */
+    cio_seek(cio, box.init_pos + box.length);
 }
 
 /*
@@ -2570,352 +2567,358 @@ void OPJ_CALLCONV mj2_write_moov(opj_mj2_t * movie, opj_cio_t *cio)
 */
 int mj2_read_moov(opj_mj2_t * movie, opj_image_t * img, opj_cio_t *cio)
 {
-  unsigned int i;
-  mj2_box_t box;
-  mj2_box_t box2;
-	
-  mj2_read_boxhdr(&box, cio);
-  if (MJ2_MOOV != box.type) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MOOV Marker\n");
-    return 1;
-  }
-	
-  if (mj2_read_mvhd(movie, cio))
-    return 1;
-
-  movie->tk = (mj2_tk_t*) opj_malloc((movie->next_tk_id - 1) * sizeof(mj2_tk_t));
-
-  for (i = 0; cio_tell(cio) - box.init_pos < box.length; i++) {
-		mj2_tk_t *tk = &movie->tk[i];
-		tk->cinfo = movie->cinfo;
-    mj2_read_boxhdr(&box2, cio);
-    if (box2.type == MJ2_TRAK) {
-      cio_seek(cio, box2.init_pos);
-      if (mj2_read_trak(tk, img, cio))
-				return 1;
-			
-      if (tk->track_type == 0) {
-				movie->num_vtk++;
-      } else if (tk->track_type == 1) {
-				movie->num_stk++;
-      } else if (tk->track_type == 2) {
-				movie->num_htk++;
-      }
-    } else if (box2.type == MJ2_MVEX) {
-      cio_seek(cio, box2.init_pos);
-      cio_skip(cio,box2.length);
-      i--;
-    } else {
-      opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MOOV Box: Expected TRAK or MVEX box\n");
-      return 1;
+    unsigned int i;
+    mj2_box_t box;
+    mj2_box_t box2;
+
+    mj2_read_boxhdr(&box, cio);
+    if (MJ2_MOOV != box.type) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error: Expected MOOV Marker\n");
+        return 1;
+    }
+
+    if (mj2_read_mvhd(movie, cio))
+        return 1;
+
+    movie->tk = (mj2_tk_t*) opj_malloc((movie->next_tk_id - 1) * sizeof(mj2_tk_t));
+
+    for (i = 0; cio_tell(cio) - box.init_pos < box.length; i++) {
+        mj2_tk_t *tk = &movie->tk[i];
+        tk->cinfo = movie->cinfo;
+        mj2_read_boxhdr(&box2, cio);
+        if (box2.type == MJ2_TRAK) {
+            cio_seek(cio, box2.init_pos);
+            if (mj2_read_trak(tk, img, cio))
+                return 1;
+
+            if (tk->track_type == 0) {
+                movie->num_vtk++;
+            } else if (tk->track_type == 1) {
+                movie->num_stk++;
+            } else if (tk->track_type == 2) {
+                movie->num_htk++;
+            }
+        } else if (box2.type == MJ2_MVEX) {
+            cio_seek(cio, box2.init_pos);
+            cio_skip(cio,box2.length);
+            i--;
+        } else {
+            opj_event_msg(cio->cinfo, EVT_ERROR, "Error with MOOV Box: Expected TRAK or MVEX box\n");
+            return 1;
+        }
     }
-  }
-  return 0;
+    return 0;
 }
 
-int OPJ_CALLCONV mj2_read_struct(FILE *file, opj_mj2_t *movie) {
-  mj2_box_t box;
-  opj_image_t img;
-  unsigned char * src;
-  int fsresult;
-  int foffset;
-	opj_cio_t *cio;
-	
-	/* open a byte stream for reading */	
-	src = (unsigned char*) opj_malloc(300 * sizeof(unsigned char));	
+int OPJ_CALLCONV mj2_read_struct(FILE *file, opj_mj2_t *movie)
+{
+    mj2_box_t box;
+    opj_image_t img;
+    unsigned char * src;
+    int fsresult;
+    int foffset;
+    opj_cio_t *cio;
+
+    /* open a byte stream for reading */
+    src = (unsigned char*) opj_malloc(300 * sizeof(unsigned char));
 
-	/* Assuming that jp and ftyp markers size do
+    /* Assuming that jp and ftyp markers size do
      not exceed 300 bytes */
-  fread(src,300,1, file);  
-  
-  cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 300);
-  
-  if (mj2_read_jp(cio))
-    return 1;
-  if (mj2_read_ftyp(movie, cio))
-    return 1;
-	
-  fsresult = fseek(file,cio_tell(cio),SEEK_SET);
-  if( fsresult ) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read data after FTYP box\n" );
-    return 1;
-  }
-	
-  foffset = cio_tell(cio);
-  
-  box.type = 0;
-  
-  fread(src,30,1,file);
-  cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 300);
-  mj2_read_boxhdr(&box, cio);
-  
-  while(box.type != MJ2_MOOV) {
-    
-    switch(box.type)
-    {
-    case MJ2_MDAT:
-      fsresult = fseek(file,foffset+box.length,SEEK_SET);
-      if( fsresult ) {
-				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MDAT box\n" );
-				return 1;
-      }
-      foffset += box.length;
-      break;
-      
-    case MJ2_MOOF:
-      fsresult = fseek(file,foffset+box.length,SEEK_SET);
-      if( fsresult ) {
-				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MOOF box\n" );
-				return 1;
-      }
-      foffset += box.length;
-      break;      
-    case MJ2_FREE:
-      fsresult = fseek(file,foffset+box.length,SEEK_SET);
-      if( fsresult ) {
-				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read FREE box\n" );
-				return 1;
-      }
-      foffset += box.length;
-      break;      
-    case MJ2_SKIP:
-      fsresult = fseek(file,foffset+box.length,SEEK_SET);
-      if( fsresult ) {
-				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read SKIP box\n" );
-				return 1;
-      }
-      foffset += box.length;
-      break;      
-    default:
-      opj_event_msg(cio->cinfo, EVT_ERROR, "Unknown box in MJ2 stream\n");
-      fsresult = fseek(file,foffset+box.length,SEEK_SET);
-      if( fsresult ) {
-				opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read end of unknown box\n"); 
-				return 1;
-      }      
-      foffset += box.length;
-      break;
-    }
-    fsresult = fread(src,8,1,file);
-    if (fsresult != 1) {
-      opj_event_msg(cio->cinfo, EVT_ERROR, "MOOV box not found in file\n"); 
-      return 1;
+    fread(src,300,1, file);
+
+    cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 300);
+
+    if (mj2_read_jp(cio))
+        return 1;
+    if (mj2_read_ftyp(movie, cio))
+        return 1;
+
+    fsresult = fseek(file,cio_tell(cio),SEEK_SET);
+    if( fsresult ) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read data after FTYP box\n" );
+        return 1;
     }
-		cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 8);    		
+
+    foffset = cio_tell(cio);
+
+    box.type = 0;
+
+    fread(src,30,1,file);
+    cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 300);
     mj2_read_boxhdr(&box, cio);
-  }	
 
-  fseek(file,foffset,SEEK_SET);
-  src = (unsigned char*)opj_realloc(src,box.length);
-  fsresult = fread(src,box.length,1,file);
-  if (fsresult != 1) {
-    opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MOOV box\n"); 
-    return 1;
-  }
-	
-	cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, box.length);
-  
-  if (mj2_read_moov(movie, &img, cio))
-    return 1;
+    while(box.type != MJ2_MOOV) {
+
+        switch(box.type) {
+        case MJ2_MDAT:
+            fsresult = fseek(file,foffset+box.length,SEEK_SET);
+            if( fsresult ) {
+                opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MDAT box\n" );
+                return 1;
+            }
+            foffset += box.length;
+            break;
+
+        case MJ2_MOOF:
+            fsresult = fseek(file,foffset+box.length,SEEK_SET);
+            if( fsresult ) {
+                opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MOOF box\n" );
+                return 1;
+            }
+            foffset += box.length;
+            break;
+        case MJ2_FREE:
+            fsresult = fseek(file,foffset+box.length,SEEK_SET);
+            if( fsresult ) {
+                opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read FREE box\n" );
+                return 1;
+            }
+            foffset += box.length;
+            break;
+        case MJ2_SKIP:
+            fsresult = fseek(file,foffset+box.length,SEEK_SET);
+            if( fsresult ) {
+                opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read SKIP box\n" );
+                return 1;
+            }
+            foffset += box.length;
+            break;
+        default:
+            opj_event_msg(cio->cinfo, EVT_ERROR, "Unknown box in MJ2 stream\n");
+            fsresult = fseek(file,foffset+box.length,SEEK_SET);
+            if( fsresult ) {
+                opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read end of unknown box\n");
+                return 1;
+            }
+            foffset += box.length;
+            break;
+        }
+        fsresult = fread(src,8,1,file);
+        if (fsresult != 1) {
+            opj_event_msg(cio->cinfo, EVT_ERROR, "MOOV box not found in file\n");
+            return 1;
+        }
+        cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, 8);
+        mj2_read_boxhdr(&box, cio);
+    }
 
-  opj_free(src);
-  return 0;
+    fseek(file,foffset,SEEK_SET);
+    src = (unsigned char*)opj_realloc(src,box.length);
+    fsresult = fread(src,box.length,1,file);
+    if (fsresult != 1) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "End of file reached while trying to read MOOV box\n");
+        return 1;
+    }
+
+    cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, box.length);
+
+    if (mj2_read_moov(movie, &img, cio))
+        return 1;
+
+    opj_free(src);
+    return 0;
 }
 
 /* ----------------------------------------------------------------------- */
 /* MJ2 decoder interface															                     */
 /* ----------------------------------------------------------------------- */
 
-opj_dinfo_t* OPJ_CALLCONV mj2_create_decompress() {
-	opj_mj2_t* mj2;
-	opj_dinfo_t *dinfo = (opj_dinfo_t*) opj_calloc(1, sizeof(opj_dinfo_t));
-	if(!dinfo) return NULL;
-
-	dinfo->is_decompressor = OPJ_TRUE;	
-
-	mj2 = (opj_mj2_t*) opj_calloc(1, sizeof(opj_mj2_t));
-	dinfo->mj2_handle = mj2;
-	if(mj2) {
-		mj2->cinfo = (opj_common_ptr)dinfo;
-	}
-	mj2->j2k = j2k_create_decompress((opj_common_ptr)dinfo);
-	dinfo->j2k_handle = mj2->j2k;
-
-	return dinfo;
-}
-
-void OPJ_CALLCONV mj2_setup_decoder(opj_mj2_t *movie, mj2_dparameters_t *mj2_parameters) {
-	movie->num_vtk=0;
-  movie->num_stk=0;
-  movie->num_htk=0;	
-
-	/* setup the J2K decoder parameters */
-	j2k_setup_decoder((opj_j2k_t*)movie->cinfo->j2k_handle, 
-		&mj2_parameters->j2k_parameters);
-
-}
-
-void OPJ_CALLCONV mj2_destroy_decompress(opj_mj2_t *movie) {
-	if(movie) {
-		int i;
-		mj2_tk_t *tk=NULL;
-
-		if (movie->cinfo->j2k_handle) 
-			j2k_destroy_compress(movie->j2k);
-		
-		if (movie->num_cl != 0)
-			opj_free(movie->cl);
-		
-		for (i = 0; i < movie->num_vtk + movie->num_stk + movie->num_htk; i++) {
-			tk = &movie->tk[i];
-			if (tk->name_size != 0)
-				opj_free(tk->name);
-			if (tk->track_type == 0)  {/* Video track*/
-				if (tk->jp2_struct.comps != NULL)
-					opj_free(tk->jp2_struct.comps);
-				if (tk->jp2_struct.cl != NULL)
-					opj_free(tk->jp2_struct.cl);
-				if (tk->num_jp2x != 0)
-					opj_free(tk->jp2xdata);
-				
-			}
-			if (tk->num_url != 0)
-				opj_free(tk->url);
-			if (tk->num_urn != 0)
-				opj_free(tk->urn);
-			if (tk->num_br != 0)
-				opj_free(tk->br);
-			if (tk->num_tts != 0)
-				opj_free(tk->tts);
-			if (tk->num_chunks != 0)
-				opj_free(tk->chunk);
-			if (tk->num_samplestochunk != 0)
-				opj_free(tk->sampletochunk);
-			if (tk->num_samples != 0)
-				opj_free(tk->sample);
-		}
-		
-		opj_free(movie->tk);
-	}	
-	opj_free(movie);
+opj_dinfo_t* OPJ_CALLCONV mj2_create_decompress()
+{
+    opj_mj2_t* mj2;
+    opj_dinfo_t *dinfo = (opj_dinfo_t*) opj_calloc(1, sizeof(opj_dinfo_t));
+    if(!dinfo) return NULL;
+
+    dinfo->is_decompressor = OPJ_TRUE;
+
+    mj2 = (opj_mj2_t*) opj_calloc(1, sizeof(opj_mj2_t));
+    dinfo->mj2_handle = mj2;
+    if(mj2) {
+        mj2->cinfo = (opj_common_ptr)dinfo;
+    }
+    mj2->j2k = j2k_create_decompress((opj_common_ptr)dinfo);
+    dinfo->j2k_handle = mj2->j2k;
+
+    return dinfo;
+}
+
+void OPJ_CALLCONV mj2_setup_decoder(opj_mj2_t *movie, mj2_dparameters_t *mj2_parameters)
+{
+    movie->num_vtk=0;
+    movie->num_stk=0;
+    movie->num_htk=0;
+
+    /* setup the J2K decoder parameters */
+    j2k_setup_decoder((opj_j2k_t*)movie->cinfo->j2k_handle,
+                      &mj2_parameters->j2k_parameters);
+
+}
+
+void OPJ_CALLCONV mj2_destroy_decompress(opj_mj2_t *movie)
+{
+    if(movie) {
+        int i;
+        mj2_tk_t *tk=NULL;
+
+        if (movie->cinfo->j2k_handle)
+            j2k_destroy_compress(movie->j2k);
+
+        if (movie->num_cl != 0)
+            opj_free(movie->cl);
+
+        for (i = 0; i < movie->num_vtk + movie->num_stk + movie->num_htk; i++) {
+            tk = &movie->tk[i];
+            if (tk->name_size != 0)
+                opj_free(tk->name);
+            if (tk->track_type == 0)  {/* Video track*/
+                if (tk->jp2_struct.comps != NULL)
+                    opj_free(tk->jp2_struct.comps);
+                if (tk->jp2_struct.cl != NULL)
+                    opj_free(tk->jp2_struct.cl);
+                if (tk->num_jp2x != 0)
+                    opj_free(tk->jp2xdata);
+
+            }
+            if (tk->num_url != 0)
+                opj_free(tk->url);
+            if (tk->num_urn != 0)
+                opj_free(tk->urn);
+            if (tk->num_br != 0)
+                opj_free(tk->br);
+            if (tk->num_tts != 0)
+                opj_free(tk->tts);
+            if (tk->num_chunks != 0)
+                opj_free(tk->chunk);
+            if (tk->num_samplestochunk != 0)
+                opj_free(tk->sampletochunk);
+            if (tk->num_samples != 0)
+                opj_free(tk->sample);
+        }
+
+        opj_free(movie->tk);
+    }
+    opj_free(movie);
 }
 
 /* ----------------------------------------------------------------------- */
 /* MJ2 encoder interface															                     */
 /* ----------------------------------------------------------------------- */
 
-opj_cinfo_t* OPJ_CALLCONV mj2_create_compress() {
-	opj_mj2_t* mj2;
-	opj_cinfo_t *cinfo = (opj_cinfo_t*) opj_calloc(1, sizeof(opj_cinfo_t));
-	if(!cinfo) return NULL;
-
-	mj2 = (opj_mj2_t*) opj_calloc(1, sizeof(opj_mj2_t));
-	cinfo->mj2_handle = mj2;
-	if(mj2) {
-		mj2->cinfo = (opj_common_ptr)cinfo;
-	}
-
-	mj2->j2k = j2k_create_compress(mj2->cinfo);
-	cinfo->j2k_handle = mj2->j2k;
-
-	return cinfo;
-}
-
-void OPJ_CALLCONV mj2_setup_encoder(opj_mj2_t *movie, mj2_cparameters_t *parameters) {
-	if(movie && parameters) {
-		opj_jp2_t *jp2_struct;
-			
-		movie->num_htk = 0;	  /* No hint tracks*/
-		movie->num_stk = 0;	  /* No sound tracks*/
-		movie->num_vtk = 1;	  /* One video track*/
-
-		movie->brand = MJ2_MJ2;  /* One brand: MJ2*/
-		movie->num_cl = 2;	  /* Two compatible brands: MJ2 and MJ2S*/
-		movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
-		movie->cl[0] = MJ2_MJ2;
-		movie->cl[1] = MJ2_MJ2S;
-		movie->minversion = 0;	  /* Minimum version: 0	*/
-
-		movie->tk = (mj2_tk_t*) opj_malloc(sizeof(mj2_tk_t)); /*Memory allocation for the video track*/
-		movie->tk[0].track_ID = 1;	  /* Track ID = 1 */
-		movie->tk[0].track_type = 0;	  /* Video track */
-		movie->tk[0].Dim[0] = parameters->Dim[0];
-		movie->tk[0].Dim[1] = parameters->Dim[1];
-		movie->tk[0].w = parameters->w;
-		movie->tk[0].h = parameters->h;
-		movie->tk[0].CbCr_subsampling_dx = parameters->CbCr_subsampling_dx;
-		movie->tk[0].CbCr_subsampling_dy = parameters->CbCr_subsampling_dy;
-		movie->tk[0].sample_rate = parameters->frame_rate;
-		movie->tk[0].name_size = 0;
-		movie->tk[0].chunk = (mj2_chunk_t*) opj_malloc(sizeof(mj2_chunk_t));  
-		movie->tk[0].sample = (mj2_sample_t*) opj_malloc(sizeof(mj2_sample_t));
-		movie->tk[0].depth = parameters->prec;
-
-		jp2_struct = &movie->tk[0].jp2_struct;
-		jp2_struct->numcomps = parameters->numcomps;	/* NC */
-		jp2_struct->comps = (opj_jp2_comps_t*) opj_malloc(jp2_struct->numcomps * sizeof(opj_jp2_comps_t));
-		jp2_struct->precedence = 0;   /* PRECEDENCE*/
-		jp2_struct->approx = 0;   /* APPROX*/		
-		jp2_struct->brand = JP2_JP2;	/* BR         */
-		jp2_struct->minversion = 0;	/* MinV       */
-		jp2_struct->numcl = 1;
-		jp2_struct->cl = (unsigned int*) opj_malloc(jp2_struct->numcl * sizeof(unsigned int));
-		jp2_struct->cl[0] = JP2_JP2;	/* CL0 : JP2  */		
-		jp2_struct->C = 7;      /* C : Always 7*/
-		jp2_struct->UnkC = 0;      /* UnkC, colorspace specified in colr box*/
-		jp2_struct->IPR = 0;      /* IPR, no intellectual property*/						
-		jp2_struct->w = parameters->w;
-		jp2_struct->h = parameters->h;
-		jp2_struct->bpc = 7;  
-		jp2_struct->meth = parameters->meth;
-		jp2_struct->enumcs = parameters->enumcs;
-  }
-}
-
-void OPJ_CALLCONV mj2_destroy_compress(opj_mj2_t *movie) {
-	if(movie) {
-		int i;
-		mj2_tk_t *tk=NULL;
-
-		if (movie->cinfo->j2k_handle) {
-			j2k_destroy_compress(movie->j2k);
-		}
-		
-		if (movie->num_cl != 0)
-			opj_free(movie->cl);
-		
-		for (i = 0; i < movie->num_vtk + movie->num_stk + movie->num_htk; i++) {
-			tk = &movie->tk[i];
-			if (tk->name_size != 0)
-				opj_free(tk->name);
-			if (tk->track_type == 0)  {/* Video track*/
-				if (tk->jp2_struct.comps != NULL)
-					opj_free(tk->jp2_struct.comps);
-				if (tk->jp2_struct.cl != NULL)
-					opj_free(tk->jp2_struct.cl);
-				if (tk->num_jp2x != 0)
-					opj_free(tk->jp2xdata);
-				
-			}
-			if (tk->num_url != 0)
-				opj_free(tk->url);
-			if (tk->num_urn != 0)
-				opj_free(tk->urn);
-			if (tk->num_br != 0)
-				opj_free(tk->br);
-			if (tk->num_tts != 0)
-				opj_free(tk->tts);
-			if (tk->num_chunks != 0)
-				opj_free(tk->chunk);
-			if (tk->num_samplestochunk != 0)
-				opj_free(tk->sampletochunk);
-			if (tk->num_samples != 0)
-				opj_free(tk->sample);
-		}
-		
-		opj_free(movie->tk);
-	}	
-	opj_free(movie);
+opj_cinfo_t* OPJ_CALLCONV mj2_create_compress()
+{
+    opj_mj2_t* mj2;
+    opj_cinfo_t *cinfo = (opj_cinfo_t*) opj_calloc(1, sizeof(opj_cinfo_t));
+    if(!cinfo) return NULL;
+
+    mj2 = (opj_mj2_t*) opj_calloc(1, sizeof(opj_mj2_t));
+    cinfo->mj2_handle = mj2;
+    if(mj2) {
+        mj2->cinfo = (opj_common_ptr)cinfo;
+    }
+
+    mj2->j2k = j2k_create_compress(mj2->cinfo);
+    cinfo->j2k_handle = mj2->j2k;
+
+    return cinfo;
+}
+
+void OPJ_CALLCONV mj2_setup_encoder(opj_mj2_t *movie, mj2_cparameters_t *parameters)
+{
+    if(movie && parameters) {
+        opj_jp2_t *jp2_struct;
+
+        movie->num_htk = 0;	  /* No hint tracks*/
+        movie->num_stk = 0;	  /* No sound tracks*/
+        movie->num_vtk = 1;	  /* One video track*/
+
+        movie->brand = MJ2_MJ2;  /* One brand: MJ2*/
+        movie->num_cl = 2;	  /* Two compatible brands: MJ2 and MJ2S*/
+        movie->cl = (unsigned int*) opj_malloc(movie->num_cl * sizeof(unsigned int));
+        movie->cl[0] = MJ2_MJ2;
+        movie->cl[1] = MJ2_MJ2S;
+        movie->minversion = 0;	  /* Minimum version: 0	*/
+
+        movie->tk = (mj2_tk_t*) opj_malloc(sizeof(mj2_tk_t)); /*Memory allocation for the video track*/
+        movie->tk[0].track_ID = 1;	  /* Track ID = 1 */
+        movie->tk[0].track_type = 0;	  /* Video track */
+        movie->tk[0].Dim[0] = parameters->Dim[0];
+        movie->tk[0].Dim[1] = parameters->Dim[1];
+        movie->tk[0].w = parameters->w;
+        movie->tk[0].h = parameters->h;
+        movie->tk[0].CbCr_subsampling_dx = parameters->CbCr_subsampling_dx;
+        movie->tk[0].CbCr_subsampling_dy = parameters->CbCr_subsampling_dy;
+        movie->tk[0].sample_rate = parameters->frame_rate;
+        movie->tk[0].name_size = 0;
+        movie->tk[0].chunk = (mj2_chunk_t*) opj_malloc(sizeof(mj2_chunk_t));
+        movie->tk[0].sample = (mj2_sample_t*) opj_malloc(sizeof(mj2_sample_t));
+        movie->tk[0].depth = parameters->prec;
+
+        jp2_struct = &movie->tk[0].jp2_struct;
+        jp2_struct->numcomps = parameters->numcomps;	/* NC */
+        jp2_struct->comps = (opj_jp2_comps_t*) opj_malloc(jp2_struct->numcomps * sizeof(opj_jp2_comps_t));
+        jp2_struct->precedence = 0;   /* PRECEDENCE*/
+        jp2_struct->approx = 0;   /* APPROX*/
+        jp2_struct->brand = JP2_JP2;	/* BR         */
+        jp2_struct->minversion = 0;	/* MinV       */
+        jp2_struct->numcl = 1;
+        jp2_struct->cl = (unsigned int*) opj_malloc(jp2_struct->numcl * sizeof(unsigned int));
+        jp2_struct->cl[0] = JP2_JP2;	/* CL0 : JP2  */
+        jp2_struct->C = 7;      /* C : Always 7*/
+        jp2_struct->UnkC = 0;      /* UnkC, colorspace specified in colr box*/
+        jp2_struct->IPR = 0;      /* IPR, no intellectual property*/
+        jp2_struct->w = parameters->w;
+        jp2_struct->h = parameters->h;
+        jp2_struct->bpc = 7;
+        jp2_struct->meth = parameters->meth;
+        jp2_struct->enumcs = parameters->enumcs;
+    }
+}
+
+void OPJ_CALLCONV mj2_destroy_compress(opj_mj2_t *movie)
+{
+    if(movie) {
+        int i;
+        mj2_tk_t *tk=NULL;
+
+        if (movie->cinfo->j2k_handle) {
+            j2k_destroy_compress(movie->j2k);
+        }
+
+        if (movie->num_cl != 0)
+            opj_free(movie->cl);
+
+        for (i = 0; i < movie->num_vtk + movie->num_stk + movie->num_htk; i++) {
+            tk = &movie->tk[i];
+            if (tk->name_size != 0)
+                opj_free(tk->name);
+            if (tk->track_type == 0)  {/* Video track*/
+                if (tk->jp2_struct.comps != NULL)
+                    opj_free(tk->jp2_struct.comps);
+                if (tk->jp2_struct.cl != NULL)
+                    opj_free(tk->jp2_struct.cl);
+                if (tk->num_jp2x != 0)
+                    opj_free(tk->jp2xdata);
+
+            }
+            if (tk->num_url != 0)
+                opj_free(tk->url);
+            if (tk->num_urn != 0)
+                opj_free(tk->urn);
+            if (tk->num_br != 0)
+                opj_free(tk->br);
+            if (tk->num_tts != 0)
+                opj_free(tk->tts);
+            if (tk->num_chunks != 0)
+                opj_free(tk->chunk);
+            if (tk->num_samplestochunk != 0)
+                opj_free(tk->sampletochunk);
+            if (tk->num_samples != 0)
+                opj_free(tk->sample);
+        }
+
+        opj_free(movie->tk);
+    }
+    opj_free(movie);
 }
 
 /*@}*/
diff --git a/src/lib/openmj2/mj2.h b/src/lib/openmj2/mj2.h
index 8761111f..9feba66d 100644
--- a/src/lib/openmj2/mj2.h
+++ b/src/lib/openmj2/mj2.h
@@ -80,7 +80,7 @@
 Decompressed format used in parameters
 YUV = 0
 */
-#define YUV_DFMT 1 
+#define YUV_DFMT 1
 
 /**
 Compressed format used in parameters
@@ -95,208 +95,208 @@ MJ2 = 0
 Time To Sample
 */
 typedef struct mj2_tts {
-  int sample_count;
-  int sample_delta;
+    int sample_count;
+    int sample_delta;
 } mj2_tts_t;
 
 /**
 Chunk
 */
-typedef struct mj2_chunk {		
-  unsigned int num_samples;
-  int sample_descr_idx;
-  int offset;
+typedef struct mj2_chunk {
+    unsigned int num_samples;
+    int sample_descr_idx;
+    int offset;
 } mj2_chunk_t;
 
 /**
 Sample to chunk
 */
-typedef struct mj2_sampletochunk {		
-  unsigned int first_chunk;
-  unsigned int samples_per_chunk;
-  int sample_descr_idx;
+typedef struct mj2_sampletochunk {
+    unsigned int first_chunk;
+    unsigned int samples_per_chunk;
+    int sample_descr_idx;
 } mj2_sampletochunk_t;
 
 /**
 Sample
 */
-typedef struct mj2_sample {		
-  unsigned int sample_size;
-  unsigned int offset;
-  unsigned int sample_delta;
+typedef struct mj2_sample {
+    unsigned int sample_size;
+    unsigned int offset;
+    unsigned int sample_delta;
 } mj2_sample_t;
 
 /**
 URL
 */
 typedef struct mj2_url {
-  int location[4];
+    int location[4];
 } mj2_url_t;
 
 /**
 URN
 */
-typedef struct mj2_urn {		
-  int name[2];
-  int location[4];
+typedef struct mj2_urn {
+    int name[2];
+    int location[4];
 } mj2_urn_t;
 
 /**
 Video Track Parameters
 */
 typedef struct mj2_tk {
-	/** codec context */
-	opj_common_ptr cinfo;
-  int track_ID;
-  int track_type;
-  unsigned int creation_time;
-  unsigned int modification_time;
-  int duration;
-  int timescale;
-  int layer;
-  int volume;
-  int language;
-  int balance;
-  int maxPDUsize;
-  int avgPDUsize;
-  int maxbitrate;
-  int avgbitrate;
-  int slidingavgbitrate;
-  int graphicsmode;
-  int opcolor[3];
-  int num_url;
-  mj2_url_t *url;
-  int num_urn;
-  mj2_urn_t *urn;
-  int Dim[2];
-  int w;
-  int h;
-  int visual_w;
-  int visual_h;
-  int CbCr_subsampling_dx;
-  int CbCr_subsampling_dy;
-  int sample_rate;
-  int sample_description;
-  int horizresolution;
-  int vertresolution;
-  int compressorname[8];
-  int depth;
-  unsigned char fieldcount;
-  unsigned char fieldorder;
-  unsigned char or_fieldcount;
-  unsigned char or_fieldorder;
-  int num_br;
-  unsigned int *br;
-  unsigned char num_jp2x;
-  unsigned char *jp2xdata;
-  unsigned char hsub;
-  unsigned char vsub;
-  unsigned char hoff;
-  unsigned char voff;
-  int trans_matrix[9];
-	/** Number of samples */
-  unsigned int num_samples;	
-  int transorm;
-  int handler_type;
-  int name_size;
-  unsigned char same_sample_size;
-  int num_tts;
-	/** Time to sample    */
-  mj2_tts_t *tts;		
-  unsigned int num_chunks;
-  mj2_chunk_t *chunk;
-  unsigned int num_samplestochunk;
-  mj2_sampletochunk_t *sampletochunk;
-  char *name;
-  opj_jp2_t jp2_struct;
-	/** Sample parameters */
-  mj2_sample_t *sample;		
-} mj2_tk_t;			
+    /** codec context */
+    opj_common_ptr cinfo;
+    int track_ID;
+    int track_type;
+    unsigned int creation_time;
+    unsigned int modification_time;
+    int duration;
+    int timescale;
+    int layer;
+    int volume;
+    int language;
+    int balance;
+    int maxPDUsize;
+    int avgPDUsize;
+    int maxbitrate;
+    int avgbitrate;
+    int slidingavgbitrate;
+    int graphicsmode;
+    int opcolor[3];
+    int num_url;
+    mj2_url_t *url;
+    int num_urn;
+    mj2_urn_t *urn;
+    int Dim[2];
+    int w;
+    int h;
+    int visual_w;
+    int visual_h;
+    int CbCr_subsampling_dx;
+    int CbCr_subsampling_dy;
+    int sample_rate;
+    int sample_description;
+    int horizresolution;
+    int vertresolution;
+    int compressorname[8];
+    int depth;
+    unsigned char fieldcount;
+    unsigned char fieldorder;
+    unsigned char or_fieldcount;
+    unsigned char or_fieldorder;
+    int num_br;
+    unsigned int *br;
+    unsigned char num_jp2x;
+    unsigned char *jp2xdata;
+    unsigned char hsub;
+    unsigned char vsub;
+    unsigned char hoff;
+    unsigned char voff;
+    int trans_matrix[9];
+    /** Number of samples */
+    unsigned int num_samples;
+    int transorm;
+    int handler_type;
+    int name_size;
+    unsigned char same_sample_size;
+    int num_tts;
+    /** Time to sample    */
+    mj2_tts_t *tts;
+    unsigned int num_chunks;
+    mj2_chunk_t *chunk;
+    unsigned int num_samplestochunk;
+    mj2_sampletochunk_t *sampletochunk;
+    char *name;
+    opj_jp2_t jp2_struct;
+    /** Sample parameters */
+    mj2_sample_t *sample;
+} mj2_tk_t;
 
 /**
 MJ2 box
 */
 typedef struct mj2_box {
-  int length;
-  int type;
-  int init_pos;
+    int length;
+    int type;
+    int init_pos;
 } mj2_box_t;
 
 /**
 MJ2 Movie
 */
-typedef struct opj_mj2 {		
-	/** codec context */
-	opj_common_ptr cinfo;
-	/** handle to the J2K codec  */
-	opj_j2k_t *j2k;
-  unsigned int brand;
-  unsigned int minversion;
-  int num_cl;
-  unsigned int *cl;
-  unsigned int creation_time;
-  unsigned int modification_time;
-  int timescale;
-  unsigned int duration;
-  int rate;
-  int num_vtk;
-  int num_stk;
-  int num_htk;
-  int volume;
-  int trans_matrix[9];
-  int next_tk_id;
-	/** Track Parameters  */
-  mj2_tk_t *tk;			
+typedef struct opj_mj2 {
+    /** codec context */
+    opj_common_ptr cinfo;
+    /** handle to the J2K codec  */
+    opj_j2k_t *j2k;
+    unsigned int brand;
+    unsigned int minversion;
+    int num_cl;
+    unsigned int *cl;
+    unsigned int creation_time;
+    unsigned int modification_time;
+    int timescale;
+    unsigned int duration;
+    int rate;
+    int num_vtk;
+    int num_stk;
+    int num_htk;
+    int volume;
+    int trans_matrix[9];
+    int next_tk_id;
+    /** Track Parameters  */
+    mj2_tk_t *tk;
 } opj_mj2_t;
 
 /**
 Decompression parameters
 */
 typedef struct mj2_dparameters {
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-	/** input file name */
-	char infile[OPJ_PATH_LEN];
-	/** output file name */
-	char outfile[OPJ_PATH_LEN];	
-	/** J2K decompression parameters */
-	opj_dparameters_t j2k_parameters;	
+    /**@name command line encoder parameters (not used inside the library) */
+    /*@{*/
+    /** input file name */
+    char infile[OPJ_PATH_LEN];
+    /** output file name */
+    char outfile[OPJ_PATH_LEN];
+    /** J2K decompression parameters */
+    opj_dparameters_t j2k_parameters;
 } mj2_dparameters_t;
 
 /**
 Compression parameters
 */
 typedef struct mj2_cparameters {
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-	/** J2K compression parameters */
-	opj_cparameters_t j2k_parameters;	
-	/** input file name */
-	char infile[OPJ_PATH_LEN];
-	/** output file name */
-	char outfile[OPJ_PATH_LEN];	
-	/** input file format 0:MJ2 */
-	int decod_format;
-	/** output file format 0:YUV */
-	int cod_format;
-	/** Portion of the image coded */
-	int Dim[2];
-	/** YUV Frame width */
-	int w;
-	/** YUV Frame height */
-	int h;
-	/*   Sample rate of YUV 4:4:4, 4:2:2 or 4:2:0 */
-	int CbCr_subsampling_dx;	
-	/*   Sample rate of YUV 4:4:4, 4:2:2 or 4:2:0 */
-  int CbCr_subsampling_dy;	
-	/*   Video Frame Rate  */
-  int frame_rate;		
-	/*   In YUV files, numcomps always considered as 3 */
-  int numcomps;			
-	/*   In YUV files, precision always considered as 8 */
-  int prec;		
-  unsigned int meth;
-  unsigned int enumcs;
+    /**@name command line encoder parameters (not used inside the library) */
+    /*@{*/
+    /** J2K compression parameters */
+    opj_cparameters_t j2k_parameters;
+    /** input file name */
+    char infile[OPJ_PATH_LEN];
+    /** output file name */
+    char outfile[OPJ_PATH_LEN];
+    /** input file format 0:MJ2 */
+    int decod_format;
+    /** output file format 0:YUV */
+    int cod_format;
+    /** Portion of the image coded */
+    int Dim[2];
+    /** YUV Frame width */
+    int w;
+    /** YUV Frame height */
+    int h;
+    /*   Sample rate of YUV 4:4:4, 4:2:2 or 4:2:0 */
+    int CbCr_subsampling_dx;
+    /*   Sample rate of YUV 4:4:4, 4:2:2 or 4:2:0 */
+    int CbCr_subsampling_dy;
+    /*   Video Frame Rate  */
+    int frame_rate;
+    /*   In YUV files, numcomps always considered as 3 */
+    int numcomps;
+    /*   In YUV files, precision always considered as 8 */
+    int prec;
+    unsigned int meth;
+    unsigned int enumcs;
 } mj2_cparameters_t;
 
 
@@ -304,7 +304,7 @@ typedef struct mj2_cparameters {
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
-Write the JP box 
+Write the JP box
 */
 OPJ_API void OPJ_CALLCONV mj2_write_jp(opj_cio_t *cio);
 /**
@@ -325,7 +325,7 @@ Destroy a MJ2 decompressor handle
 OPJ_API void OPJ_CALLCONV mj2_destroy_decompress(opj_mj2_t *movie);
 /**
 Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in mj2->j2k->cp. 
+Decoding parameters are returned in mj2->j2k->cp.
 @param movie MJ2 decompressor handle
 @param mj2_parameters decompression parameters
 */
@@ -348,8 +348,8 @@ Destroy a MJ2 compressor handle
 */
 OPJ_API void OPJ_CALLCONV mj2_destroy_compress(opj_mj2_t *movie);
 /**
-Setup the encoder parameters using the current image and using user parameters. 
-Coding parameters are returned in mj2->j2k->cp. 
+Setup the encoder parameters using the current image and using user parameters.
+Coding parameters are returned in mj2->j2k->cp.
 @param movie MJ2 compressor handle
 @param parameters compression parameters
 */
@@ -373,13 +373,13 @@ OPJ_API int OPJ_CALLCONV mj2_init_stdmovie(opj_mj2_t *movie);
 /**
 Read the structure of an MJ2 file
 @param file MJ2 input File
-@param mj2 J2 movie structure 
+@param mj2 J2 movie structure
 @return Returns 0 if successful, returns 1 otherwise
 */
 OPJ_API int OPJ_CALLCONV mj2_read_struct(FILE *file, opj_mj2_t *mj2);
 /**
 Write the MOOV box to an output buffer stream
-@param movie MJ2 movie structure 
+@param movie MJ2 movie structure
 @param cio Output buffer stream
 */
 OPJ_API void OPJ_CALLCONV mj2_write_moov(opj_mj2_t *movie, opj_cio_t *cio);
diff --git a/src/lib/openmj2/mj2_convert.c b/src/lib/openmj2/mj2_convert.c
index f2265094..50c43aea 100644
--- a/src/lib/openmj2/mj2_convert.c
+++ b/src/lib/openmj2/mj2_convert.c
@@ -39,32 +39,32 @@
 
 unsigned int OPJ_CALLCONV yuv_num_frames(mj2_tk_t * tk, char *infile)
 {
-  unsigned int prec_size;
-  long end_of_f, frame_size;
-	FILE *f;
+    unsigned int prec_size;
+    long end_of_f, frame_size;
+    FILE *f;
 
-  f = fopen(infile,"rb");
-  if (!f) {  
-    fprintf(stderr, "failed to open %s for reading\n",infile);
-    return 0;
-  }
-	prec_size = (tk->depth + 7)/8;/* bytes of precision */
-
-  frame_size = (long) (tk->w * tk->h * (1.0 + (double) 2 / (double) (tk->CbCr_subsampling_dx * tk->CbCr_subsampling_dy)));	/* Calculate frame size */
-	frame_size *= prec_size; 
-	
-  fseek(f, 0, SEEK_END);
-  end_of_f = ftell(f);		/* Calculate file size */
-	
-  if (end_of_f < frame_size) {
-    fprintf(stderr,
-			"YUV does not contains any frame of %d x %d size\n", tk->w,
-			tk->h);
-    return 0;
-  }
-  fclose(f);
-	
-  return (unsigned int)(end_of_f / frame_size);
+    f = fopen(infile,"rb");
+    if (!f) {
+        fprintf(stderr, "failed to open %s for reading\n",infile);
+        return 0;
+    }
+    prec_size = (tk->depth + 7)/8;/* bytes of precision */
+
+    frame_size = (long) (tk->w * tk->h * (1.0 + (double) 2 / (double) (tk->CbCr_subsampling_dx * tk->CbCr_subsampling_dy)));	/* Calculate frame size */
+    frame_size *= prec_size;
+
+    fseek(f, 0, SEEK_END);
+    end_of_f = ftell(f);		/* Calculate file size */
+
+    if (end_of_f < frame_size) {
+        fprintf(stderr,
+                "YUV does not contains any frame of %d x %d size\n", tk->w,
+                tk->h);
+        return 0;
+    }
+    fclose(f);
+
+    return (unsigned int)(end_of_f / frame_size);
 }
 
 /*  ----------------------- */
@@ -76,95 +76,92 @@ unsigned int OPJ_CALLCONV yuv_num_frames(mj2_tk_t * tk, char *infile)
 
 opj_image_t * OPJ_CALLCONV mj2_image_create(mj2_tk_t * tk, opj_cparameters_t *parameters)
 {
-	opj_image_cmptparm_t cmptparm[3];
-	opj_image_t * img;
-	int i;
-	int numcomps = 3;
-	int subsampling_dx = parameters->subsampling_dx;
-	int subsampling_dy = parameters->subsampling_dy;
-
-	/* initialize image components */
-	memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t));
-	for(i = 0; i < numcomps; i++) {
-		cmptparm[i].prec = tk->depth;
-		cmptparm[i].bpp = tk->depth;
-		cmptparm[i].sgnd = 0;		
-		cmptparm[i].dx = i ? subsampling_dx * tk->CbCr_subsampling_dx : subsampling_dx;
-		cmptparm[i].dy = i ? subsampling_dy * tk->CbCr_subsampling_dy : subsampling_dy;
-		cmptparm[i].w = tk->w;
-		cmptparm[i].h = tk->h;
-	}
-	/* create the image */
-	img = opj_image_create(numcomps, cmptparm, CLRSPC_SRGB);
-	return img;
+    opj_image_cmptparm_t cmptparm[3];
+    opj_image_t * img;
+    int i;
+    int numcomps = 3;
+    int subsampling_dx = parameters->subsampling_dx;
+    int subsampling_dy = parameters->subsampling_dy;
+
+    /* initialize image components */
+    memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t));
+    for(i = 0; i < numcomps; i++) {
+        cmptparm[i].prec = tk->depth;
+        cmptparm[i].bpp = tk->depth;
+        cmptparm[i].sgnd = 0;
+        cmptparm[i].dx = i ? subsampling_dx * tk->CbCr_subsampling_dx : subsampling_dx;
+        cmptparm[i].dy = i ? subsampling_dy * tk->CbCr_subsampling_dy : subsampling_dy;
+        cmptparm[i].w = tk->w;
+        cmptparm[i].h = tk->h;
+    }
+    /* create the image */
+    img = opj_image_create(numcomps, cmptparm, CLRSPC_SRGB);
+    return img;
 }
 
 char OPJ_CALLCONV yuvtoimage(mj2_tk_t * tk, opj_image_t * img, int frame_num, opj_cparameters_t *parameters, char* infile)
 {
-  int i, compno;
-  int offset, size, max, prec_bytes, is_16, v;
-  long end_of_f, position;
-	int numcomps = 3;
-	int subsampling_dx = parameters->subsampling_dx;
-	int subsampling_dy = parameters->subsampling_dy;
-	FILE *yuvfile;
-	int *data;
-	unsigned char uc;
-
-  yuvfile = fopen(infile,"rb");
-  if (!yuvfile) {  
-    fprintf(stderr, "failed to open %s for readings\n",parameters->infile);
-    return 1;
-  }
-	is_16 = (tk->depth > 8);
-	prec_bytes = (is_16?2:1);
-
-  offset = (int) ((double) (frame_num * tk->w * tk->h) * (1.0 +
-		1.0 * (double) 2 / (double) (tk->CbCr_subsampling_dx * tk->CbCr_subsampling_dy)));
-  offset *= prec_bytes;
-
-  fseek(yuvfile, 0, SEEK_END);
-  end_of_f = ftell(yuvfile);
-  fseek(yuvfile, sizeof(unsigned char) * offset, SEEK_SET);
-  position = ftell(yuvfile);
-  if (position >= end_of_f) {
-    fprintf(stderr, "Cannot reach frame number %d in yuv file !!\n",
-			frame_num);
-		fclose(yuvfile);
-    return 1;
-  }
-	
-  img->x0 = tk->Dim[0];
-  img->y0 = tk->Dim[1];
-  img->x1 = !tk->Dim[0] ? (tk->w - 1) * subsampling_dx + 1 : tk->Dim[0] +
-    (tk->w - 1) * subsampling_dx + 1;
-  img->y1 = !tk->Dim[1] ? (tk->h - 1) * subsampling_dy + 1 : tk->Dim[1] +
-    (tk->h - 1) * subsampling_dy + 1;
-
-	size = tk->w * tk->h * prec_bytes;
-	
-	for(compno = 0; compno < numcomps; compno++) 
-   {
-	max = size/(img->comps[compno].dx * img->comps[compno].dy);
-	data = img->comps[compno].data;
-
-	for (i = 0; i < max && !feof(yuvfile); i++)
-  {
-	v = 0;
-	fread(&uc, 1, 1, yuvfile);
-	v = uc;
-
-	if(is_16)
- {
-	fread(&uc, 1, 1, yuvfile);
-	v |= (uc<<8);
- }
-	*data++ = v;
-  }
-   }
-	fclose(yuvfile);
-	
-  return 0;
+    int i, compno;
+    int offset, size, max, prec_bytes, is_16, v;
+    long end_of_f, position;
+    int numcomps = 3;
+    int subsampling_dx = parameters->subsampling_dx;
+    int subsampling_dy = parameters->subsampling_dy;
+    FILE *yuvfile;
+    int *data;
+    unsigned char uc;
+
+    yuvfile = fopen(infile,"rb");
+    if (!yuvfile) {
+        fprintf(stderr, "failed to open %s for readings\n",parameters->infile);
+        return 1;
+    }
+    is_16 = (tk->depth > 8);
+    prec_bytes = (is_16?2:1);
+
+    offset = (int) ((double) (frame_num * tk->w * tk->h) * (1.0 +
+                    1.0 * (double) 2 / (double) (tk->CbCr_subsampling_dx * tk->CbCr_subsampling_dy)));
+    offset *= prec_bytes;
+
+    fseek(yuvfile, 0, SEEK_END);
+    end_of_f = ftell(yuvfile);
+    fseek(yuvfile, sizeof(unsigned char) * offset, SEEK_SET);
+    position = ftell(yuvfile);
+    if (position >= end_of_f) {
+        fprintf(stderr, "Cannot reach frame number %d in yuv file !!\n",
+                frame_num);
+        fclose(yuvfile);
+        return 1;
+    }
+
+    img->x0 = tk->Dim[0];
+    img->y0 = tk->Dim[1];
+    img->x1 = !tk->Dim[0] ? (tk->w - 1) * subsampling_dx + 1 : tk->Dim[0] +
+              (tk->w - 1) * subsampling_dx + 1;
+    img->y1 = !tk->Dim[1] ? (tk->h - 1) * subsampling_dy + 1 : tk->Dim[1] +
+              (tk->h - 1) * subsampling_dy + 1;
+
+    size = tk->w * tk->h * prec_bytes;
+
+    for(compno = 0; compno < numcomps; compno++) {
+        max = size/(img->comps[compno].dx * img->comps[compno].dy);
+        data = img->comps[compno].data;
+
+        for (i = 0; i < max && !feof(yuvfile); i++) {
+            v = 0;
+            fread(&uc, 1, 1, yuvfile);
+            v = uc;
+
+            if(is_16) {
+                fread(&uc, 1, 1, yuvfile);
+                v |= (uc<<8);
+            }
+            *data++ = v;
+        }
+    }
+    fclose(yuvfile);
+
+    return 0;
 }
 
 
@@ -179,88 +176,85 @@ char OPJ_CALLCONV yuvtoimage(mj2_tk_t * tk, opj_image_t * img, int frame_num, op
 
 opj_bool OPJ_CALLCONV imagetoyuv(opj_image_t * img, char *outfile)
 {
-  FILE *f;
-  int *data;
-  int i, v, is_16, prec_bytes;
-  unsigned char buf[2];
-
-  if (img->numcomps == 3) {
-    if (img->comps[0].dx != img->comps[1].dx / 2
-      || img->comps[1].dx != img->comps[2].dx) {
-      fprintf(stderr,
-				"Error with the input image components size: cannot create yuv file)\n");
-      return OPJ_FALSE;
+    FILE *f;
+    int *data;
+    int i, v, is_16, prec_bytes;
+    unsigned char buf[2];
+
+    if (img->numcomps == 3) {
+        if (img->comps[0].dx != img->comps[1].dx / 2
+                || img->comps[1].dx != img->comps[2].dx) {
+            fprintf(stderr,
+                    "Error with the input image components size: cannot create yuv file)\n");
+            return OPJ_FALSE;
+        }
+    } else if (!(img->numcomps == 1)) {
+        fprintf(stderr,
+                "Error with the number of image components(must be one or three)\n");
+        return OPJ_FALSE;
     }
-  } else if (!(img->numcomps == 1)) {
-    fprintf(stderr,
-      "Error with the number of image components(must be one or three)\n");
-    return OPJ_FALSE;
-  }
-  
-  f = fopen(outfile, "a+b");
-  if (!f) {
-    fprintf(stderr, "failed to open %s for writing\n", outfile);
-    return OPJ_FALSE;
-  }
-  is_16 = (img->comps[0].prec > 8);
-  prec_bytes = (is_16?2:1);
-  data = img->comps[0].data;
-  
-  for (i = 0; i < (img->comps[0].w * img->comps[0].h); i++) {
-    v = *data++;
-    buf[0] = (unsigned char)v;
-
-	if(is_16) buf[1] = (unsigned char)(v>>8);
-
-    fwrite(buf, 1, prec_bytes, f);
-  }
-  
-  
-  if (img->numcomps == 3) {
-	data = img->comps[1].data;
-
-    for (i = 0; i < (img->comps[1].w * img->comps[1].h); i++) {
-      v = *data++;
-      buf[0] = (unsigned char)v;
-
-      if(is_16) buf[1] = (unsigned char)(v>>8);
-
-      fwrite(buf, 1, prec_bytes, f);
+
+    f = fopen(outfile, "a+b");
+    if (!f) {
+        fprintf(stderr, "failed to open %s for writing\n", outfile);
+        return OPJ_FALSE;
     }
-    data = img->comps[2].data;
-    
-    for (i = 0; i < (img->comps[2].w * img->comps[2].h); i++) {
-      v = *data++;
-      buf[0] = (unsigned char)v;
+    is_16 = (img->comps[0].prec > 8);
+    prec_bytes = (is_16?2:1);
+    data = img->comps[0].data;
 
-      if(is_16) buf[1] = (unsigned char)(v>>8);
+    for (i = 0; i < (img->comps[0].w * img->comps[0].h); i++) {
+        v = *data++;
+        buf[0] = (unsigned char)v;
 
-      fwrite(buf, 1, prec_bytes, f);
-    }
-  } else if (img->numcomps == 1) {
-/* fake CbCr values */
-	if(is_16) 
-  { 
-	buf[0] = 255;
-	if(img->comps[0].prec == 10) buf[1] = 1;
-	else
-	if(img->comps[0].prec == 12) buf[1] = 3;
-	else
-	 buf[1] = 125;
-  } 
-	else buf[0] = 125;
-
-    for (i = 0; i < (img->comps[0].w * img->comps[0].h * 0.25); i++) {
-      fwrite(buf, 1, prec_bytes, f);
+        if(is_16) buf[1] = (unsigned char)(v>>8);
+
+        fwrite(buf, 1, prec_bytes, f);
     }
-    
-    
-    for (i = 0; i < (img->comps[0].w * img->comps[0].h * 0.25); i++) {
-      fwrite(buf, 1, prec_bytes, f);
+
+
+    if (img->numcomps == 3) {
+        data = img->comps[1].data;
+
+        for (i = 0; i < (img->comps[1].w * img->comps[1].h); i++) {
+            v = *data++;
+            buf[0] = (unsigned char)v;
+
+            if(is_16) buf[1] = (unsigned char)(v>>8);
+
+            fwrite(buf, 1, prec_bytes, f);
+        }
+        data = img->comps[2].data;
+
+        for (i = 0; i < (img->comps[2].w * img->comps[2].h); i++) {
+            v = *data++;
+            buf[0] = (unsigned char)v;
+
+            if(is_16) buf[1] = (unsigned char)(v>>8);
+
+            fwrite(buf, 1, prec_bytes, f);
+        }
+    } else if (img->numcomps == 1) {
+        /* fake CbCr values */
+        if(is_16) {
+            buf[0] = 255;
+            if(img->comps[0].prec == 10) buf[1] = 1;
+            else if(img->comps[0].prec == 12) buf[1] = 3;
+            else
+                buf[1] = 125;
+        } else buf[0] = 125;
+
+        for (i = 0; i < (img->comps[0].w * img->comps[0].h * 0.25); i++) {
+            fwrite(buf, 1, prec_bytes, f);
+        }
+
+
+        for (i = 0; i < (img->comps[0].w * img->comps[0].h * 0.25); i++) {
+            fwrite(buf, 1, prec_bytes, f);
+        }
     }
-  }  
-  fclose(f);
-  return OPJ_TRUE;
+    fclose(f);
+    return OPJ_TRUE;
 }
 
 /*  ----------------------- */
@@ -270,103 +264,104 @@ opj_bool OPJ_CALLCONV imagetoyuv(opj_image_t * img, char *outfile)
 /* */
 /*  ----------------------- */
 
-int OPJ_CALLCONV imagetobmp(opj_image_t * img, char *outfile) {
-  int w,wr,h,hr,i,pad;
-  FILE *f;
-  
-  if (img->numcomps == 3 && img->comps[0].dx == img->comps[1].dx
-    && img->comps[1].dx == img->comps[2].dx
-    && img->comps[0].dy == img->comps[1].dy
-    && img->comps[1].dy == img->comps[2].dy
-    && img->comps[0].prec == img->comps[1].prec
-    && img->comps[1].prec == img->comps[2].prec) {
-    /* -->> -->> -->> -->>
-    
-      24 bits color
-      
-    <<-- <<-- <<-- <<-- */
-    
-    f = fopen(outfile, "wb");
-    if (!f) {
-      fprintf(stderr, "failed to open %s for writing\n", outfile);
-      return 1;
-    }   
-    
-    w = img->comps[0].w;
-    wr = int_ceildivpow2(img->comps[0].w, img->comps[0].factor);
-    
-    h = img->comps[0].h;
-    hr = int_ceildivpow2(img->comps[0].h, img->comps[0].factor);
-    
-    fprintf(f, "BM");
-    
-    /* FILE HEADER */
-    /* ------------- */
-    fprintf(f, "%c%c%c%c",
-      (unsigned char) (hr * wr * 3 + 3 * hr * (wr % 2) +
-      54) & 0xff,
-      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-      >> 8) & 0xff,
-      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-      >> 16) & 0xff,
-      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-      >> 24) & 0xff);
-    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-    fprintf(f, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,
-      ((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
-    
-    /* INFO HEADER   */
-    /* ------------- */
-    fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-      ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-    fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-      (unsigned char) ((wr) >> 8) & 0xff,
-      (unsigned char) ((wr) >> 16) & 0xff,
-      (unsigned char) ((wr) >> 24) & 0xff);
-    fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-      (unsigned char) ((hr) >> 8) & 0xff,
-      (unsigned char) ((hr) >> 16) & 0xff,
-      (unsigned char) ((hr) >> 24) & 0xff);
-    fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-    fprintf(f, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
-    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-    fprintf(f, "%c%c%c%c",
-      (unsigned char) (3 * hr * wr +
-      3 * hr * (wr % 2)) & 0xff,
-      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-      8) & 0xff,
-      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-      16) & 0xff,
-      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-      24) & 0xff);
-    fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-    fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-    fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-    
-    for (i = 0; i < wr * hr; i++) {
-      unsigned char R, G, B;
-      /* a modifier */
-      /* R = img->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
-      R = img->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-      /* G = img->comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
-      G = img->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-      /* B = img->comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
-      B = img->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-      fprintf(f, "%c%c%c", B, G, R);
-      
-      if ((i + 1) % wr == 0) {
-				for (pad = (3 * wr) % 4 ? 4 - (3 * wr) % 4 : 0; pad > 0; pad--)	/* ADD */
-					fprintf(f, "%c", 0);
-      }
+int OPJ_CALLCONV imagetobmp(opj_image_t * img, char *outfile)
+{
+    int w,wr,h,hr,i,pad;
+    FILE *f;
+
+    if (img->numcomps == 3 && img->comps[0].dx == img->comps[1].dx
+            && img->comps[1].dx == img->comps[2].dx
+            && img->comps[0].dy == img->comps[1].dy
+            && img->comps[1].dy == img->comps[2].dy
+            && img->comps[0].prec == img->comps[1].prec
+            && img->comps[1].prec == img->comps[2].prec) {
+        /* -->> -->> -->> -->>
+
+          24 bits color
+
+        <<-- <<-- <<-- <<-- */
+
+        f = fopen(outfile, "wb");
+        if (!f) {
+            fprintf(stderr, "failed to open %s for writing\n", outfile);
+            return 1;
+        }
+
+        w = img->comps[0].w;
+        wr = int_ceildivpow2(img->comps[0].w, img->comps[0].factor);
+
+        h = img->comps[0].h;
+        hr = int_ceildivpow2(img->comps[0].h, img->comps[0].factor);
+
+        fprintf(f, "BM");
+
+        /* FILE HEADER */
+        /* ------------- */
+        fprintf(f, "%c%c%c%c",
+                (unsigned char) (hr * wr * 3 + 3 * hr * (wr % 2) +
+                                 54) & 0xff,
+                (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
+                                 >> 8) & 0xff,
+                (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
+                                 >> 16) & 0xff,
+                (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
+                                 >> 24) & 0xff);
+        fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+                ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+        fprintf(f, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,
+                ((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
+
+        /* INFO HEADER   */
+        /* ------------- */
+        fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
+                ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
+        fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
+                (unsigned char) ((wr) >> 8) & 0xff,
+                (unsigned char) ((wr) >> 16) & 0xff,
+                (unsigned char) ((wr) >> 24) & 0xff);
+        fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
+                (unsigned char) ((hr) >> 8) & 0xff,
+                (unsigned char) ((hr) >> 16) & 0xff,
+                (unsigned char) ((hr) >> 24) & 0xff);
+        fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
+        fprintf(f, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
+        fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+                ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+        fprintf(f, "%c%c%c%c",
+                (unsigned char) (3 * hr * wr +
+                                 3 * hr * (wr % 2)) & 0xff,
+                (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
+                                 8) & 0xff,
+                (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
+                                 16) & 0xff,
+                (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
+                                 24) & 0xff);
+        fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
+                ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+        fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
+                ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
+        fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+                ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+        fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
+                ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
+
+        for (i = 0; i < wr * hr; i++) {
+            unsigned char R, G, B;
+            /* a modifier */
+            /* R = img->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
+            R = img->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+            /* G = img->comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
+            G = img->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+            /* B = img->comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];*/
+            B = img->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+            fprintf(f, "%c%c%c", B, G, R);
+
+            if ((i + 1) % wr == 0) {
+                for (pad = (3 * wr) % 4 ? 4 - (3 * wr) % 4 : 0; pad > 0; pad--)	/* ADD */
+                    fprintf(f, "%c", 0);
+            }
+        }
+        fclose(f);
     }
-    fclose(f);
-  }
-  return 0;
+    return 0;
 }
diff --git a/src/lib/openmj2/mqc.c b/src/lib/openmj2/mqc.c
index 0b561629..9aab0a14 100644
--- a/src/lib/openmj2/mqc.c
+++ b/src/lib/openmj2/mqc.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -72,13 +72,13 @@ static void mqc_setbits(opj_mqc_t *mqc);
 /**
 FIXME: documentation ???
 @param mqc MQC handle
-@return 
+@return
 */
 static INLINE int mqc_mpsexchange(opj_mqc_t *const mqc);
 /**
 FIXME: documentation ???
 @param mqc MQC handle
-@return 
+@return
 */
 static INLINE int mqc_lpsexchange(opj_mqc_t *const mqc);
 /**
@@ -99,500 +99,528 @@ static INLINE void mqc_renormd(opj_mqc_t *const mqc);
 /* This array defines all the possible states for a context. */
 /* </summary> */
 static opj_mqc_state_t mqc_states[47 * 2] = {
-	{0x5601, 0, &mqc_states[2], &mqc_states[3]},
-	{0x5601, 1, &mqc_states[3], &mqc_states[2]},
-	{0x3401, 0, &mqc_states[4], &mqc_states[12]},
-	{0x3401, 1, &mqc_states[5], &mqc_states[13]},
-	{0x1801, 0, &mqc_states[6], &mqc_states[18]},
-	{0x1801, 1, &mqc_states[7], &mqc_states[19]},
-	{0x0ac1, 0, &mqc_states[8], &mqc_states[24]},
-	{0x0ac1, 1, &mqc_states[9], &mqc_states[25]},
-	{0x0521, 0, &mqc_states[10], &mqc_states[58]},
-	{0x0521, 1, &mqc_states[11], &mqc_states[59]},
-	{0x0221, 0, &mqc_states[76], &mqc_states[66]},
-	{0x0221, 1, &mqc_states[77], &mqc_states[67]},
-	{0x5601, 0, &mqc_states[14], &mqc_states[13]},
-	{0x5601, 1, &mqc_states[15], &mqc_states[12]},
-	{0x5401, 0, &mqc_states[16], &mqc_states[28]},
-	{0x5401, 1, &mqc_states[17], &mqc_states[29]},
-	{0x4801, 0, &mqc_states[18], &mqc_states[28]},
-	{0x4801, 1, &mqc_states[19], &mqc_states[29]},
-	{0x3801, 0, &mqc_states[20], &mqc_states[28]},
-	{0x3801, 1, &mqc_states[21], &mqc_states[29]},
-	{0x3001, 0, &mqc_states[22], &mqc_states[34]},
-	{0x3001, 1, &mqc_states[23], &mqc_states[35]},
-	{0x2401, 0, &mqc_states[24], &mqc_states[36]},
-	{0x2401, 1, &mqc_states[25], &mqc_states[37]},
-	{0x1c01, 0, &mqc_states[26], &mqc_states[40]},
-	{0x1c01, 1, &mqc_states[27], &mqc_states[41]},
-	{0x1601, 0, &mqc_states[58], &mqc_states[42]},
-	{0x1601, 1, &mqc_states[59], &mqc_states[43]},
-	{0x5601, 0, &mqc_states[30], &mqc_states[29]},
-	{0x5601, 1, &mqc_states[31], &mqc_states[28]},
-	{0x5401, 0, &mqc_states[32], &mqc_states[28]},
-	{0x5401, 1, &mqc_states[33], &mqc_states[29]},
-	{0x5101, 0, &mqc_states[34], &mqc_states[30]},
-	{0x5101, 1, &mqc_states[35], &mqc_states[31]},
-	{0x4801, 0, &mqc_states[36], &mqc_states[32]},
-	{0x4801, 1, &mqc_states[37], &mqc_states[33]},
-	{0x3801, 0, &mqc_states[38], &mqc_states[34]},
-	{0x3801, 1, &mqc_states[39], &mqc_states[35]},
-	{0x3401, 0, &mqc_states[40], &mqc_states[36]},
-	{0x3401, 1, &mqc_states[41], &mqc_states[37]},
-	{0x3001, 0, &mqc_states[42], &mqc_states[38]},
-	{0x3001, 1, &mqc_states[43], &mqc_states[39]},
-	{0x2801, 0, &mqc_states[44], &mqc_states[38]},
-	{0x2801, 1, &mqc_states[45], &mqc_states[39]},
-	{0x2401, 0, &mqc_states[46], &mqc_states[40]},
-	{0x2401, 1, &mqc_states[47], &mqc_states[41]},
-	{0x2201, 0, &mqc_states[48], &mqc_states[42]},
-	{0x2201, 1, &mqc_states[49], &mqc_states[43]},
-	{0x1c01, 0, &mqc_states[50], &mqc_states[44]},
-	{0x1c01, 1, &mqc_states[51], &mqc_states[45]},
-	{0x1801, 0, &mqc_states[52], &mqc_states[46]},
-	{0x1801, 1, &mqc_states[53], &mqc_states[47]},
-	{0x1601, 0, &mqc_states[54], &mqc_states[48]},
-	{0x1601, 1, &mqc_states[55], &mqc_states[49]},
-	{0x1401, 0, &mqc_states[56], &mqc_states[50]},
-	{0x1401, 1, &mqc_states[57], &mqc_states[51]},
-	{0x1201, 0, &mqc_states[58], &mqc_states[52]},
-	{0x1201, 1, &mqc_states[59], &mqc_states[53]},
-	{0x1101, 0, &mqc_states[60], &mqc_states[54]},
-	{0x1101, 1, &mqc_states[61], &mqc_states[55]},
-	{0x0ac1, 0, &mqc_states[62], &mqc_states[56]},
-	{0x0ac1, 1, &mqc_states[63], &mqc_states[57]},
-	{0x09c1, 0, &mqc_states[64], &mqc_states[58]},
-	{0x09c1, 1, &mqc_states[65], &mqc_states[59]},
-	{0x08a1, 0, &mqc_states[66], &mqc_states[60]},
-	{0x08a1, 1, &mqc_states[67], &mqc_states[61]},
-	{0x0521, 0, &mqc_states[68], &mqc_states[62]},
-	{0x0521, 1, &mqc_states[69], &mqc_states[63]},
-	{0x0441, 0, &mqc_states[70], &mqc_states[64]},
-	{0x0441, 1, &mqc_states[71], &mqc_states[65]},
-	{0x02a1, 0, &mqc_states[72], &mqc_states[66]},
-	{0x02a1, 1, &mqc_states[73], &mqc_states[67]},
-	{0x0221, 0, &mqc_states[74], &mqc_states[68]},
-	{0x0221, 1, &mqc_states[75], &mqc_states[69]},
-	{0x0141, 0, &mqc_states[76], &mqc_states[70]},
-	{0x0141, 1, &mqc_states[77], &mqc_states[71]},
-	{0x0111, 0, &mqc_states[78], &mqc_states[72]},
-	{0x0111, 1, &mqc_states[79], &mqc_states[73]},
-	{0x0085, 0, &mqc_states[80], &mqc_states[74]},
-	{0x0085, 1, &mqc_states[81], &mqc_states[75]},
-	{0x0049, 0, &mqc_states[82], &mqc_states[76]},
-	{0x0049, 1, &mqc_states[83], &mqc_states[77]},
-	{0x0025, 0, &mqc_states[84], &mqc_states[78]},
-	{0x0025, 1, &mqc_states[85], &mqc_states[79]},
-	{0x0015, 0, &mqc_states[86], &mqc_states[80]},
-	{0x0015, 1, &mqc_states[87], &mqc_states[81]},
-	{0x0009, 0, &mqc_states[88], &mqc_states[82]},
-	{0x0009, 1, &mqc_states[89], &mqc_states[83]},
-	{0x0005, 0, &mqc_states[90], &mqc_states[84]},
-	{0x0005, 1, &mqc_states[91], &mqc_states[85]},
-	{0x0001, 0, &mqc_states[90], &mqc_states[86]},
-	{0x0001, 1, &mqc_states[91], &mqc_states[87]},
-	{0x5601, 0, &mqc_states[92], &mqc_states[92]},
-	{0x5601, 1, &mqc_states[93], &mqc_states[93]},
+    {0x5601, 0, &mqc_states[2], &mqc_states[3]},
+    {0x5601, 1, &mqc_states[3], &mqc_states[2]},
+    {0x3401, 0, &mqc_states[4], &mqc_states[12]},
+    {0x3401, 1, &mqc_states[5], &mqc_states[13]},
+    {0x1801, 0, &mqc_states[6], &mqc_states[18]},
+    {0x1801, 1, &mqc_states[7], &mqc_states[19]},
+    {0x0ac1, 0, &mqc_states[8], &mqc_states[24]},
+    {0x0ac1, 1, &mqc_states[9], &mqc_states[25]},
+    {0x0521, 0, &mqc_states[10], &mqc_states[58]},
+    {0x0521, 1, &mqc_states[11], &mqc_states[59]},
+    {0x0221, 0, &mqc_states[76], &mqc_states[66]},
+    {0x0221, 1, &mqc_states[77], &mqc_states[67]},
+    {0x5601, 0, &mqc_states[14], &mqc_states[13]},
+    {0x5601, 1, &mqc_states[15], &mqc_states[12]},
+    {0x5401, 0, &mqc_states[16], &mqc_states[28]},
+    {0x5401, 1, &mqc_states[17], &mqc_states[29]},
+    {0x4801, 0, &mqc_states[18], &mqc_states[28]},
+    {0x4801, 1, &mqc_states[19], &mqc_states[29]},
+    {0x3801, 0, &mqc_states[20], &mqc_states[28]},
+    {0x3801, 1, &mqc_states[21], &mqc_states[29]},
+    {0x3001, 0, &mqc_states[22], &mqc_states[34]},
+    {0x3001, 1, &mqc_states[23], &mqc_states[35]},
+    {0x2401, 0, &mqc_states[24], &mqc_states[36]},
+    {0x2401, 1, &mqc_states[25], &mqc_states[37]},
+    {0x1c01, 0, &mqc_states[26], &mqc_states[40]},
+    {0x1c01, 1, &mqc_states[27], &mqc_states[41]},
+    {0x1601, 0, &mqc_states[58], &mqc_states[42]},
+    {0x1601, 1, &mqc_states[59], &mqc_states[43]},
+    {0x5601, 0, &mqc_states[30], &mqc_states[29]},
+    {0x5601, 1, &mqc_states[31], &mqc_states[28]},
+    {0x5401, 0, &mqc_states[32], &mqc_states[28]},
+    {0x5401, 1, &mqc_states[33], &mqc_states[29]},
+    {0x5101, 0, &mqc_states[34], &mqc_states[30]},
+    {0x5101, 1, &mqc_states[35], &mqc_states[31]},
+    {0x4801, 0, &mqc_states[36], &mqc_states[32]},
+    {0x4801, 1, &mqc_states[37], &mqc_states[33]},
+    {0x3801, 0, &mqc_states[38], &mqc_states[34]},
+    {0x3801, 1, &mqc_states[39], &mqc_states[35]},
+    {0x3401, 0, &mqc_states[40], &mqc_states[36]},
+    {0x3401, 1, &mqc_states[41], &mqc_states[37]},
+    {0x3001, 0, &mqc_states[42], &mqc_states[38]},
+    {0x3001, 1, &mqc_states[43], &mqc_states[39]},
+    {0x2801, 0, &mqc_states[44], &mqc_states[38]},
+    {0x2801, 1, &mqc_states[45], &mqc_states[39]},
+    {0x2401, 0, &mqc_states[46], &mqc_states[40]},
+    {0x2401, 1, &mqc_states[47], &mqc_states[41]},
+    {0x2201, 0, &mqc_states[48], &mqc_states[42]},
+    {0x2201, 1, &mqc_states[49], &mqc_states[43]},
+    {0x1c01, 0, &mqc_states[50], &mqc_states[44]},
+    {0x1c01, 1, &mqc_states[51], &mqc_states[45]},
+    {0x1801, 0, &mqc_states[52], &mqc_states[46]},
+    {0x1801, 1, &mqc_states[53], &mqc_states[47]},
+    {0x1601, 0, &mqc_states[54], &mqc_states[48]},
+    {0x1601, 1, &mqc_states[55], &mqc_states[49]},
+    {0x1401, 0, &mqc_states[56], &mqc_states[50]},
+    {0x1401, 1, &mqc_states[57], &mqc_states[51]},
+    {0x1201, 0, &mqc_states[58], &mqc_states[52]},
+    {0x1201, 1, &mqc_states[59], &mqc_states[53]},
+    {0x1101, 0, &mqc_states[60], &mqc_states[54]},
+    {0x1101, 1, &mqc_states[61], &mqc_states[55]},
+    {0x0ac1, 0, &mqc_states[62], &mqc_states[56]},
+    {0x0ac1, 1, &mqc_states[63], &mqc_states[57]},
+    {0x09c1, 0, &mqc_states[64], &mqc_states[58]},
+    {0x09c1, 1, &mqc_states[65], &mqc_states[59]},
+    {0x08a1, 0, &mqc_states[66], &mqc_states[60]},
+    {0x08a1, 1, &mqc_states[67], &mqc_states[61]},
+    {0x0521, 0, &mqc_states[68], &mqc_states[62]},
+    {0x0521, 1, &mqc_states[69], &mqc_states[63]},
+    {0x0441, 0, &mqc_states[70], &mqc_states[64]},
+    {0x0441, 1, &mqc_states[71], &mqc_states[65]},
+    {0x02a1, 0, &mqc_states[72], &mqc_states[66]},
+    {0x02a1, 1, &mqc_states[73], &mqc_states[67]},
+    {0x0221, 0, &mqc_states[74], &mqc_states[68]},
+    {0x0221, 1, &mqc_states[75], &mqc_states[69]},
+    {0x0141, 0, &mqc_states[76], &mqc_states[70]},
+    {0x0141, 1, &mqc_states[77], &mqc_states[71]},
+    {0x0111, 0, &mqc_states[78], &mqc_states[72]},
+    {0x0111, 1, &mqc_states[79], &mqc_states[73]},
+    {0x0085, 0, &mqc_states[80], &mqc_states[74]},
+    {0x0085, 1, &mqc_states[81], &mqc_states[75]},
+    {0x0049, 0, &mqc_states[82], &mqc_states[76]},
+    {0x0049, 1, &mqc_states[83], &mqc_states[77]},
+    {0x0025, 0, &mqc_states[84], &mqc_states[78]},
+    {0x0025, 1, &mqc_states[85], &mqc_states[79]},
+    {0x0015, 0, &mqc_states[86], &mqc_states[80]},
+    {0x0015, 1, &mqc_states[87], &mqc_states[81]},
+    {0x0009, 0, &mqc_states[88], &mqc_states[82]},
+    {0x0009, 1, &mqc_states[89], &mqc_states[83]},
+    {0x0005, 0, &mqc_states[90], &mqc_states[84]},
+    {0x0005, 1, &mqc_states[91], &mqc_states[85]},
+    {0x0001, 0, &mqc_states[90], &mqc_states[86]},
+    {0x0001, 1, &mqc_states[91], &mqc_states[87]},
+    {0x5601, 0, &mqc_states[92], &mqc_states[92]},
+    {0x5601, 1, &mqc_states[93], &mqc_states[93]},
 };
 
-/* 
+/*
 ==========================================================
    local functions
 ==========================================================
 */
 
-static void mqc_byteout(opj_mqc_t *mqc) {
-	if (*mqc->bp == 0xff) {
-		mqc->bp++;
-		*mqc->bp = mqc->c >> 20;
-		mqc->c &= 0xfffff;
-		mqc->ct = 7;
-	} else {
-		if ((mqc->c & 0x8000000) == 0) {	/* ((mqc->c&0x8000000)==0) CHANGE */
-			mqc->bp++;
-			*mqc->bp = mqc->c >> 19;
-			mqc->c &= 0x7ffff;
-			mqc->ct = 8;
-		} else {
-			(*mqc->bp)++;
-			if (*mqc->bp == 0xff) {
-				mqc->c &= 0x7ffffff;
-				mqc->bp++;
-				*mqc->bp = mqc->c >> 20;
-				mqc->c &= 0xfffff;
-				mqc->ct = 7;
-			} else {
-				mqc->bp++;
-				*mqc->bp = mqc->c >> 19;
-				mqc->c &= 0x7ffff;
-				mqc->ct = 8;
-			}
-		}
-	}
+static void mqc_byteout(opj_mqc_t *mqc)
+{
+    if (*mqc->bp == 0xff) {
+        mqc->bp++;
+        *mqc->bp = mqc->c >> 20;
+        mqc->c &= 0xfffff;
+        mqc->ct = 7;
+    } else {
+        if ((mqc->c & 0x8000000) == 0) {	/* ((mqc->c&0x8000000)==0) CHANGE */
+            mqc->bp++;
+            *mqc->bp = mqc->c >> 19;
+            mqc->c &= 0x7ffff;
+            mqc->ct = 8;
+        } else {
+            (*mqc->bp)++;
+            if (*mqc->bp == 0xff) {
+                mqc->c &= 0x7ffffff;
+                mqc->bp++;
+                *mqc->bp = mqc->c >> 20;
+                mqc->c &= 0xfffff;
+                mqc->ct = 7;
+            } else {
+                mqc->bp++;
+                *mqc->bp = mqc->c >> 19;
+                mqc->c &= 0x7ffff;
+                mqc->ct = 8;
+            }
+        }
+    }
 }
 
-static void mqc_renorme(opj_mqc_t *mqc) {
-	do {
-		mqc->a <<= 1;
-		mqc->c <<= 1;
-		mqc->ct--;
-		if (mqc->ct == 0) {
-			mqc_byteout(mqc);
-		}
-	} while ((mqc->a & 0x8000) == 0);
+static void mqc_renorme(opj_mqc_t *mqc)
+{
+    do {
+        mqc->a <<= 1;
+        mqc->c <<= 1;
+        mqc->ct--;
+        if (mqc->ct == 0) {
+            mqc_byteout(mqc);
+        }
+    } while ((mqc->a & 0x8000) == 0);
 }
 
-static void mqc_codemps(opj_mqc_t *mqc) {
-	mqc->a -= (*mqc->curctx)->qeval;
-	if ((mqc->a & 0x8000) == 0) {
-		if (mqc->a < (*mqc->curctx)->qeval) {
-			mqc->a = (*mqc->curctx)->qeval;
-		} else {
-			mqc->c += (*mqc->curctx)->qeval;
-		}
-		*mqc->curctx = (*mqc->curctx)->nmps;
-		mqc_renorme(mqc);
-	} else {
-		mqc->c += (*mqc->curctx)->qeval;
-	}
+static void mqc_codemps(opj_mqc_t *mqc)
+{
+    mqc->a -= (*mqc->curctx)->qeval;
+    if ((mqc->a & 0x8000) == 0) {
+        if (mqc->a < (*mqc->curctx)->qeval) {
+            mqc->a = (*mqc->curctx)->qeval;
+        } else {
+            mqc->c += (*mqc->curctx)->qeval;
+        }
+        *mqc->curctx = (*mqc->curctx)->nmps;
+        mqc_renorme(mqc);
+    } else {
+        mqc->c += (*mqc->curctx)->qeval;
+    }
 }
 
-static void mqc_codelps(opj_mqc_t *mqc) {
-	mqc->a -= (*mqc->curctx)->qeval;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		mqc->c += (*mqc->curctx)->qeval;
-	} else {
-		mqc->a = (*mqc->curctx)->qeval;
-	}
-	*mqc->curctx = (*mqc->curctx)->nlps;
-	mqc_renorme(mqc);
+static void mqc_codelps(opj_mqc_t *mqc)
+{
+    mqc->a -= (*mqc->curctx)->qeval;
+    if (mqc->a < (*mqc->curctx)->qeval) {
+        mqc->c += (*mqc->curctx)->qeval;
+    } else {
+        mqc->a = (*mqc->curctx)->qeval;
+    }
+    *mqc->curctx = (*mqc->curctx)->nlps;
+    mqc_renorme(mqc);
 }
 
-static void mqc_setbits(opj_mqc_t *mqc) {
-	unsigned int tempc = mqc->c + mqc->a;
-	mqc->c |= 0xffff;
-	if (mqc->c >= tempc) {
-		mqc->c -= 0x8000;
-	}
+static void mqc_setbits(opj_mqc_t *mqc)
+{
+    unsigned int tempc = mqc->c + mqc->a;
+    mqc->c |= 0xffff;
+    if (mqc->c >= tempc) {
+        mqc->c -= 0x8000;
+    }
 }
 
-static INLINE int mqc_mpsexchange(opj_mqc_t *const mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	} else {
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	}
-	
-	return d;
+static INLINE int mqc_mpsexchange(opj_mqc_t *const mqc)
+{
+    int d;
+    if (mqc->a < (*mqc->curctx)->qeval) {
+        d = 1 - (*mqc->curctx)->mps;
+        *mqc->curctx = (*mqc->curctx)->nlps;
+    } else {
+        d = (*mqc->curctx)->mps;
+        *mqc->curctx = (*mqc->curctx)->nmps;
+    }
+
+    return d;
 }
 
-static INLINE int mqc_lpsexchange(opj_mqc_t *const mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	} else {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	}
-	
-	return d;
+static INLINE int mqc_lpsexchange(opj_mqc_t *const mqc)
+{
+    int d;
+    if (mqc->a < (*mqc->curctx)->qeval) {
+        mqc->a = (*mqc->curctx)->qeval;
+        d = (*mqc->curctx)->mps;
+        *mqc->curctx = (*mqc->curctx)->nmps;
+    } else {
+        mqc->a = (*mqc->curctx)->qeval;
+        d = 1 - (*mqc->curctx)->mps;
+        *mqc->curctx = (*mqc->curctx)->nlps;
+    }
+
+    return d;
 }
 
 #ifdef MQC_PERF_OPT
-static INLINE void mqc_bytein(opj_mqc_t *const mqc) {
-	unsigned int i = *((unsigned int *) mqc->bp);
-	mqc->c += i & 0xffff00;
-	mqc->ct = i & 0x0f;
-	mqc->bp += (i >> 2) & 0x04;
+static INLINE void mqc_bytein(opj_mqc_t *const mqc)
+{
+    unsigned int i = *((unsigned int *) mqc->bp);
+    mqc->c += i & 0xffff00;
+    mqc->ct = i & 0x0f;
+    mqc->bp += (i >> 2) & 0x04;
 }
 #else
-static void mqc_bytein(opj_mqc_t *const mqc) {
-	if (mqc->bp != mqc->end) {
-		unsigned int c;
-		if (mqc->bp + 1 != mqc->end) {
-			c = *(mqc->bp + 1);
-		} else {
-			c = 0xff;
-		}
-		if (*mqc->bp == 0xff) {
-			if (c > 0x8f) {
-				mqc->c += 0xff00;
-				mqc->ct = 8;
-			} else {
-				mqc->bp++;
-				mqc->c += c << 9;
-				mqc->ct = 7;
-			}
-		} else {
-			mqc->bp++;
-			mqc->c += c << 8;
-			mqc->ct = 8;
-		}
-	} else {
-		mqc->c += 0xff00;
-		mqc->ct = 8;
-	}
+static void mqc_bytein(opj_mqc_t *const mqc)
+{
+    if (mqc->bp != mqc->end) {
+        unsigned int c;
+        if (mqc->bp + 1 != mqc->end) {
+            c = *(mqc->bp + 1);
+        } else {
+            c = 0xff;
+        }
+        if (*mqc->bp == 0xff) {
+            if (c > 0x8f) {
+                mqc->c += 0xff00;
+                mqc->ct = 8;
+            } else {
+                mqc->bp++;
+                mqc->c += c << 9;
+                mqc->ct = 7;
+            }
+        } else {
+            mqc->bp++;
+            mqc->c += c << 8;
+            mqc->ct = 8;
+        }
+    } else {
+        mqc->c += 0xff00;
+        mqc->ct = 8;
+    }
 }
 #endif
 
-static INLINE void mqc_renormd(opj_mqc_t *const mqc) {
-	do {
-		if (mqc->ct == 0) {
-			mqc_bytein(mqc);
-		}
-		mqc->a <<= 1;
-		mqc->c <<= 1;
-		mqc->ct--;
-	} while (mqc->a < 0x8000);
+static INLINE void mqc_renormd(opj_mqc_t *const mqc)
+{
+    do {
+        if (mqc->ct == 0) {
+            mqc_bytein(mqc);
+        }
+        mqc->a <<= 1;
+        mqc->c <<= 1;
+        mqc->ct--;
+    } while (mqc->a < 0x8000);
 }
 
-/* 
+/*
 ==========================================================
    MQ-Coder interface
 ==========================================================
 */
 
-opj_mqc_t* mqc_create(void) {
-	opj_mqc_t *mqc = (opj_mqc_t*)opj_malloc(sizeof(opj_mqc_t));
+opj_mqc_t* mqc_create(void)
+{
+    opj_mqc_t *mqc = (opj_mqc_t*)opj_malloc(sizeof(opj_mqc_t));
 #ifdef MQC_PERF_OPT
-	mqc->buffer = NULL;
+    mqc->buffer = NULL;
 #endif
-	return mqc;
+    return mqc;
 }
 
-void mqc_destroy(opj_mqc_t *mqc) {
-	if(mqc) {
+void mqc_destroy(opj_mqc_t *mqc)
+{
+    if(mqc) {
 #ifdef MQC_PERF_OPT
-		if (mqc->buffer) {
-			opj_free(mqc->buffer);
-		}
+        if (mqc->buffer) {
+            opj_free(mqc->buffer);
+        }
 #endif
-		opj_free(mqc);
-	}
+        opj_free(mqc);
+    }
 }
 
-int mqc_numbytes(opj_mqc_t *mqc) {
-	return mqc->bp - mqc->start;
+int mqc_numbytes(opj_mqc_t *mqc)
+{
+    return mqc->bp - mqc->start;
 }
 
-void mqc_init_enc(opj_mqc_t *mqc, unsigned char *bp) {
-	mqc_setcurctx(mqc, 0);
-	mqc->a = 0x8000;
-	mqc->c = 0;
-	mqc->bp = bp - 1;
-	mqc->ct = 12;
-	if (*mqc->bp == 0xff) {
-		mqc->ct = 13;
-	}
-	mqc->start = bp;
+void mqc_init_enc(opj_mqc_t *mqc, unsigned char *bp)
+{
+    mqc_setcurctx(mqc, 0);
+    mqc->a = 0x8000;
+    mqc->c = 0;
+    mqc->bp = bp - 1;
+    mqc->ct = 12;
+    if (*mqc->bp == 0xff) {
+        mqc->ct = 13;
+    }
+    mqc->start = bp;
 }
 
-void mqc_encode(opj_mqc_t *mqc, int d) {
-	if ((*mqc->curctx)->mps == d) {
-		mqc_codemps(mqc);
-	} else {
-		mqc_codelps(mqc);
-	}
+void mqc_encode(opj_mqc_t *mqc, int d)
+{
+    if ((*mqc->curctx)->mps == d) {
+        mqc_codemps(mqc);
+    } else {
+        mqc_codelps(mqc);
+    }
 }
 
-void mqc_flush(opj_mqc_t *mqc) {
-	mqc_setbits(mqc);
-	mqc->c <<= mqc->ct;
-	mqc_byteout(mqc);
-	mqc->c <<= mqc->ct;
-	mqc_byteout(mqc);
-	
-	if (*mqc->bp != 0xff) {
-		mqc->bp++;
-	}
+void mqc_flush(opj_mqc_t *mqc)
+{
+    mqc_setbits(mqc);
+    mqc->c <<= mqc->ct;
+    mqc_byteout(mqc);
+    mqc->c <<= mqc->ct;
+    mqc_byteout(mqc);
+
+    if (*mqc->bp != 0xff) {
+        mqc->bp++;
+    }
 }
 
-void mqc_bypass_init_enc(opj_mqc_t *mqc) {
-	mqc->c = 0;
-	mqc->ct = 8;
-	/*if (*mqc->bp == 0xff) {
-	mqc->ct = 7;
+void mqc_bypass_init_enc(opj_mqc_t *mqc)
+{
+    mqc->c = 0;
+    mqc->ct = 8;
+    /*if (*mqc->bp == 0xff) {
+    mqc->ct = 7;
      } */
 }
 
-void mqc_bypass_enc(opj_mqc_t *mqc, int d) {
-	mqc->ct--;
-	mqc->c = mqc->c + (d << mqc->ct);
-	if (mqc->ct == 0) {
-		mqc->bp++;
-		*mqc->bp = mqc->c;
-		mqc->ct = 8;
-		if (*mqc->bp == 0xff) {
-			mqc->ct = 7;
-		}
-		mqc->c = 0;
-	}
+void mqc_bypass_enc(opj_mqc_t *mqc, int d)
+{
+    mqc->ct--;
+    mqc->c = mqc->c + (d << mqc->ct);
+    if (mqc->ct == 0) {
+        mqc->bp++;
+        *mqc->bp = mqc->c;
+        mqc->ct = 8;
+        if (*mqc->bp == 0xff) {
+            mqc->ct = 7;
+        }
+        mqc->c = 0;
+    }
 }
 
-int mqc_bypass_flush_enc(opj_mqc_t *mqc) {
-	unsigned char bit_padding;
-	
-	bit_padding = 0;
-	
-	if (mqc->ct != 0) {
-		while (mqc->ct > 0) {
-			mqc->ct--;
-			mqc->c += bit_padding << mqc->ct;
-			bit_padding = (bit_padding + 1) & 0x01;
-		}
-		mqc->bp++;
-		*mqc->bp = mqc->c;
-		mqc->ct = 8;
-		mqc->c = 0;
-	}
-	
-	return 1;
+int mqc_bypass_flush_enc(opj_mqc_t *mqc)
+{
+    unsigned char bit_padding;
+
+    bit_padding = 0;
+
+    if (mqc->ct != 0) {
+        while (mqc->ct > 0) {
+            mqc->ct--;
+            mqc->c += bit_padding << mqc->ct;
+            bit_padding = (bit_padding + 1) & 0x01;
+        }
+        mqc->bp++;
+        *mqc->bp = mqc->c;
+        mqc->ct = 8;
+        mqc->c = 0;
+    }
+
+    return 1;
 }
 
-void mqc_reset_enc(opj_mqc_t *mqc) {
-	mqc_resetstates(mqc);
-	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+void mqc_reset_enc(opj_mqc_t *mqc)
+{
+    mqc_resetstates(mqc);
+    mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+    mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+    mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 }
 
-int mqc_restart_enc(opj_mqc_t *mqc) {
-	int correction = 1;
-	
-	/* <flush part> */
-	int n = 27 - 15 - mqc->ct;
-	mqc->c <<= mqc->ct;
-	while (n > 0) {
-		mqc_byteout(mqc);
-		n -= mqc->ct;
-		mqc->c <<= mqc->ct;
-	}
-	mqc_byteout(mqc);
-	
-	return correction;
+int mqc_restart_enc(opj_mqc_t *mqc)
+{
+    int correction = 1;
+
+    /* <flush part> */
+    int n = 27 - 15 - mqc->ct;
+    mqc->c <<= mqc->ct;
+    while (n > 0) {
+        mqc_byteout(mqc);
+        n -= mqc->ct;
+        mqc->c <<= mqc->ct;
+    }
+    mqc_byteout(mqc);
+
+    return correction;
 }
 
-void mqc_restart_init_enc(opj_mqc_t *mqc) {
-	/* <Re-init part> */
-	mqc_setcurctx(mqc, 0);
-	mqc->a = 0x8000;
-	mqc->c = 0;
-	mqc->ct = 12;
-	mqc->bp--;
-	if (*mqc->bp == 0xff) {
-		mqc->ct = 13;
-	}
+void mqc_restart_init_enc(opj_mqc_t *mqc)
+{
+    /* <Re-init part> */
+    mqc_setcurctx(mqc, 0);
+    mqc->a = 0x8000;
+    mqc->c = 0;
+    mqc->ct = 12;
+    mqc->bp--;
+    if (*mqc->bp == 0xff) {
+        mqc->ct = 13;
+    }
 }
 
-void mqc_erterm_enc(opj_mqc_t *mqc) {
-	int k = 11 - mqc->ct + 1;
-	
-	while (k > 0) {
-		mqc->c <<= mqc->ct;
-		mqc->ct = 0;
-		mqc_byteout(mqc);
-		k -= mqc->ct;
-	}
-	
-	if (*mqc->bp != 0xff) {
-		mqc_byteout(mqc);
-	}
+void mqc_erterm_enc(opj_mqc_t *mqc)
+{
+    int k = 11 - mqc->ct + 1;
+
+    while (k > 0) {
+        mqc->c <<= mqc->ct;
+        mqc->ct = 0;
+        mqc_byteout(mqc);
+        k -= mqc->ct;
+    }
+
+    if (*mqc->bp != 0xff) {
+        mqc_byteout(mqc);
+    }
 }
 
-void mqc_segmark_enc(opj_mqc_t *mqc) {
-	int i;
-	mqc_setcurctx(mqc, 18);
-	
-	for (i = 1; i < 5; i++) {
-		mqc_encode(mqc, i % 2);
-	}
+void mqc_segmark_enc(opj_mqc_t *mqc)
+{
+    int i;
+    mqc_setcurctx(mqc, 18);
+
+    for (i = 1; i < 5; i++) {
+        mqc_encode(mqc, i % 2);
+    }
 }
 
-void mqc_init_dec(opj_mqc_t *mqc, unsigned char *bp, int len) {
-	mqc_setcurctx(mqc, 0);
-	mqc->start = bp;
-	mqc->end = bp + len;
-	mqc->bp = bp;
-	if (len==0) mqc->c = 0xff << 16;
-	else mqc->c = *mqc->bp << 16;
+void mqc_init_dec(opj_mqc_t *mqc, unsigned char *bp, int len)
+{
+    mqc_setcurctx(mqc, 0);
+    mqc->start = bp;
+    mqc->end = bp + len;
+    mqc->bp = bp;
+    if (len==0) mqc->c = 0xff << 16;
+    else mqc->c = *mqc->bp << 16;
 
 #ifdef MQC_PERF_OPT
-	{
-		unsigned int c;
-		unsigned int *ip;
-		unsigned char *end = mqc->end - 1;
-		mqc->buffer = opj_realloc(mqc->buffer, (len + 1) * sizeof(unsigned int));
-		ip = (unsigned int *) mqc->buffer;
-
-		while (bp < end) {
-			c = *(bp + 1);
-			if (*bp == 0xff) {
-				if (c > 0x8f) {
-					break;
-				} else {
-					*ip = 0x00000017 | (c << 9);
-				}
-			} else {
-				*ip = 0x00000018 | (c << 8);
-			}
-			bp++;
-			ip++;
-		}
-
-		/* Handle last byte of data */
-		c = 0xff;
-		if (*bp == 0xff) {
-			*ip = 0x0000ff18;
-		} else {
-			bp++;
-			*ip = 0x00000018 | (c << 8);
-		}
-		ip++;
-
-		*ip = 0x0000ff08;
-		mqc->bp = mqc->buffer;
-	}
+    {
+        unsigned int c;
+        unsigned int *ip;
+        unsigned char *end = mqc->end - 1;
+        mqc->buffer = opj_realloc(mqc->buffer, (len + 1) * sizeof(unsigned int));
+        ip = (unsigned int *) mqc->buffer;
+
+        while (bp < end) {
+            c = *(bp + 1);
+            if (*bp == 0xff) {
+                if (c > 0x8f) {
+                    break;
+                } else {
+                    *ip = 0x00000017 | (c << 9);
+                }
+            } else {
+                *ip = 0x00000018 | (c << 8);
+            }
+            bp++;
+            ip++;
+        }
+
+        /* Handle last byte of data */
+        c = 0xff;
+        if (*bp == 0xff) {
+            *ip = 0x0000ff18;
+        } else {
+            bp++;
+            *ip = 0x00000018 | (c << 8);
+        }
+        ip++;
+
+        *ip = 0x0000ff08;
+        mqc->bp = mqc->buffer;
+    }
 #endif
-	mqc_bytein(mqc);
-	mqc->c <<= 7;
-	mqc->ct -= 7;
-	mqc->a = 0x8000;
+    mqc_bytein(mqc);
+    mqc->c <<= 7;
+    mqc->ct -= 7;
+    mqc->a = 0x8000;
 }
 
-int mqc_decode(opj_mqc_t *const mqc) {
-	int d;
-	mqc->a -= (*mqc->curctx)->qeval;
-	if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
-		d = mqc_lpsexchange(mqc);
-		mqc_renormd(mqc);
-	} else {
-		mqc->c -= (*mqc->curctx)->qeval << 16;
-		if ((mqc->a & 0x8000) == 0) {
-			d = mqc_mpsexchange(mqc);
-			mqc_renormd(mqc);
-		} else {
-			d = (*mqc->curctx)->mps;
-		}
-	}
-
-	return d;
+int mqc_decode(opj_mqc_t *const mqc)
+{
+    int d;
+    mqc->a -= (*mqc->curctx)->qeval;
+    if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
+        d = mqc_lpsexchange(mqc);
+        mqc_renormd(mqc);
+    } else {
+        mqc->c -= (*mqc->curctx)->qeval << 16;
+        if ((mqc->a & 0x8000) == 0) {
+            d = mqc_mpsexchange(mqc);
+            mqc_renormd(mqc);
+        } else {
+            d = (*mqc->curctx)->mps;
+        }
+    }
+
+    return d;
 }
 
-void mqc_resetstates(opj_mqc_t *mqc) {
-	int i;
-	for (i = 0; i < MQC_NUMCTXS; i++) {
-		mqc->ctxs[i] = mqc_states;
-	}
+void mqc_resetstates(opj_mqc_t *mqc)
+{
+    int i;
+    for (i = 0; i < MQC_NUMCTXS; i++) {
+        mqc->ctxs[i] = mqc_states;
+    }
 }
 
-void mqc_setstate(opj_mqc_t *mqc, int ctxno, int msb, int prob) {
-	mqc->ctxs[ctxno] = &mqc_states[msb + (prob << 1)];
+void mqc_setstate(opj_mqc_t *mqc, int ctxno, int msb, int prob)
+{
+    mqc->ctxs[ctxno] = &mqc_states[msb + (prob << 1)];
 }
 
 
diff --git a/src/lib/openmj2/mqc.h b/src/lib/openmj2/mqc.h
index 08196d16..8e1fd8cf 100644
--- a/src/lib/openmj2/mqc.h
+++ b/src/lib/openmj2/mqc.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -52,14 +52,14 @@ in MQC.C are used by some function in T1.C.
 This struct defines the state of a context.
 */
 typedef struct opj_mqc_state {
-	/** the probability of the Least Probable Symbol (0.75->0x8000, 1.5->0xffff) */
-	unsigned int qeval;
-	/** the Most Probable Symbol (0 or 1) */
-	int mps;
-	/** next state if the next encoded symbol is the MPS */
-	struct opj_mqc_state *nmps;
-	/** next state if the next encoded symbol is the LPS */
-	struct opj_mqc_state *nlps;
+    /** the probability of the Least Probable Symbol (0.75->0x8000, 1.5->0xffff) */
+    unsigned int qeval;
+    /** the Most Probable Symbol (0 or 1) */
+    int mps;
+    /** next state if the next encoded symbol is the MPS */
+    struct opj_mqc_state *nmps;
+    /** next state if the next encoded symbol is the LPS */
+    struct opj_mqc_state *nlps;
 } opj_mqc_state_t;
 
 #define MQC_NUMCTXS 19
@@ -68,16 +68,16 @@ typedef struct opj_mqc_state {
 MQ coder
 */
 typedef struct opj_mqc {
-	unsigned int c;
-	unsigned int a;
-	unsigned int ct;
-	unsigned char *bp;
-	unsigned char *start;
-	unsigned char *end;
-	opj_mqc_state_t *ctxs[MQC_NUMCTXS];
-	opj_mqc_state_t **curctx;
+    unsigned int c;
+    unsigned int a;
+    unsigned int ct;
+    unsigned char *bp;
+    unsigned char *start;
+    unsigned char *end;
+    opj_mqc_state_t *ctxs[MQC_NUMCTXS];
+    opj_mqc_state_t **curctx;
 #ifdef MQC_PERF_OPT
-	unsigned char *buffer;
+    unsigned char *buffer;
 #endif
 } opj_mqc_t;
 
@@ -85,7 +85,7 @@ typedef struct opj_mqc {
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
-Create a new MQC handle 
+Create a new MQC handle
 @return Returns a new MQC handle if successful, returns NULL otherwise
 */
 opj_mqc_t* mqc_create(void);
@@ -101,7 +101,7 @@ Return the number of bytes written/read since initialisation
 */
 int mqc_numbytes(opj_mqc_t *mqc);
 /**
-Reset the states of all the context of the coder/decoder 
+Reset the states of all the context of the coder/decoder
 (each context is set to a state where 0 and 1 are more or less equiprobable)
 @param mqc MQC handle
 */
@@ -138,15 +138,15 @@ Flush the encoder, so that all remaining data is written
 */
 void mqc_flush(opj_mqc_t *mqc);
 /**
-BYPASS mode switch, initialization operation. 
-JPEG 2000 p 505. 
+BYPASS mode switch, initialization operation.
+JPEG 2000 p 505.
 <h2>Not fully implemented and tested !!</h2>
 @param mqc MQC handle
 */
 void mqc_bypass_init_enc(opj_mqc_t *mqc);
 /**
-BYPASS mode switch, coding operation. 
-JPEG 2000 p 505. 
+BYPASS mode switch, coding operation.
+JPEG 2000 p 505.
 <h2>Not fully implemented and tested !!</h2>
 @param mqc MQC handle
 @param d The symbol to be encoded (0 or 1)
diff --git a/src/lib/openmj2/openjpeg.c b/src/lib/openmj2/openjpeg.c
index a2621f5d..1809322e 100644
--- a/src/lib/openmj2/openjpeg.c
+++ b/src/lib/openmj2/openjpeg.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.
  *
@@ -40,19 +40,20 @@
 #ifdef _WIN32
 #ifndef OPJ_STATIC
 BOOL APIENTRY
-DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
+DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+{
 
-	OPJ_ARG_NOT_USED(lpReserved);
-	OPJ_ARG_NOT_USED(hModule);
+    OPJ_ARG_NOT_USED(lpReserved);
+    OPJ_ARG_NOT_USED(hModule);
 
-	switch (ul_reason_for_call) {
-		case DLL_PROCESS_ATTACH :
-			break;
-		case DLL_PROCESS_DETACH :
-			break;
-		case DLL_THREAD_ATTACH :
-		case DLL_THREAD_DETACH :
-			break;
+    switch (ul_reason_for_call) {
+    case DLL_PROCESS_ATTACH :
+        break;
+    case DLL_PROCESS_DETACH :
+        break;
+    case DLL_THREAD_ATTACH :
+    case DLL_THREAD_DETACH :
+        break;
     }
 
     return TRUE;
@@ -63,285 +64,299 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
 /* ---------------------------------------------------------------------- */
 
 
-const char* OPJ_CALLCONV opj_version(void) {
+const char* OPJ_CALLCONV opj_version(void)
+{
     return OPJ_PACKAGE_VERSION;
 }
 
-opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) {
-	opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_calloc(1, sizeof(opj_dinfo_t));
-	if(!dinfo) return NULL;
-	dinfo->is_decompressor = OPJ_TRUE;
-	switch(format) {
-		case CODEC_J2K:
-		case CODEC_JPT:
-			/* get a J2K decoder handle */
-			dinfo->j2k_handle = (void*)j2k_create_decompress((opj_common_ptr)dinfo);
-			if(!dinfo->j2k_handle) {
-				opj_free(dinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_JP2:
-			/* get a JP2 decoder handle */
-			dinfo->jp2_handle = (void*)jp2_create_decompress((opj_common_ptr)dinfo);
-			if(!dinfo->jp2_handle) {
-				opj_free(dinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_UNKNOWN:
-		default:
-			opj_free(dinfo);
-			return NULL;
-	}
+opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format)
+{
+    opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_calloc(1, sizeof(opj_dinfo_t));
+    if(!dinfo) return NULL;
+    dinfo->is_decompressor = OPJ_TRUE;
+    switch(format) {
+    case CODEC_J2K:
+    case CODEC_JPT:
+        /* get a J2K decoder handle */
+        dinfo->j2k_handle = (void*)j2k_create_decompress((opj_common_ptr)dinfo);
+        if(!dinfo->j2k_handle) {
+            opj_free(dinfo);
+            return NULL;
+        }
+        break;
+    case CODEC_JP2:
+        /* get a JP2 decoder handle */
+        dinfo->jp2_handle = (void*)jp2_create_decompress((opj_common_ptr)dinfo);
+        if(!dinfo->jp2_handle) {
+            opj_free(dinfo);
+            return NULL;
+        }
+        break;
+    case CODEC_UNKNOWN:
+    default:
+        opj_free(dinfo);
+        return NULL;
+    }
 
-	dinfo->codec_format = format;
+    dinfo->codec_format = format;
 
-	return dinfo;
+    return dinfo;
 }
 
-void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo) {
-	if(dinfo) {
-		/* destroy the codec */
-		switch(dinfo->codec_format) {
-			case CODEC_J2K:
-			case CODEC_JPT:
-				j2k_destroy_decompress((opj_j2k_t*)dinfo->j2k_handle);
-				break;
-			case CODEC_JP2:
-				jp2_destroy_decompress((opj_jp2_t*)dinfo->jp2_handle);
-				break;
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-		/* destroy the decompressor */
-		opj_free(dinfo);
-	}
+void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo)
+{
+    if(dinfo) {
+        /* destroy the codec */
+        switch(dinfo->codec_format) {
+        case CODEC_J2K:
+        case CODEC_JPT:
+            j2k_destroy_decompress((opj_j2k_t*)dinfo->j2k_handle);
+            break;
+        case CODEC_JP2:
+            jp2_destroy_decompress((opj_jp2_t*)dinfo->jp2_handle);
+            break;
+        case CODEC_UNKNOWN:
+        default:
+            break;
+        }
+        /* destroy the decompressor */
+        opj_free(dinfo);
+    }
 }
 
-void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters) {
-	if(parameters) {
-		memset(parameters, 0, sizeof(opj_dparameters_t));
-		/* default decoding parameters */
-		parameters->cp_layer = 0;
-		parameters->cp_reduce = 0;
-		parameters->cp_limit_decoding = NO_LIMITATION;
+void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters)
+{
+    if(parameters) {
+        memset(parameters, 0, sizeof(opj_dparameters_t));
+        /* default decoding parameters */
+        parameters->cp_layer = 0;
+        parameters->cp_reduce = 0;
+        parameters->cp_limit_decoding = NO_LIMITATION;
 
-		parameters->decod_format = -1;
-		parameters->cod_format = -1;
-		parameters->flags = 0;		
-/* UniPG>> */
+        parameters->decod_format = -1;
+        parameters->cod_format = -1;
+        parameters->flags = 0;
+        /* UniPG>> */
 #ifdef USE_JPWL
-		parameters->jpwl_correct = OPJ_FALSE;
-		parameters->jpwl_exp_comps = JPWL_EXPECTED_COMPONENTS;
-		parameters->jpwl_max_tiles = JPWL_MAXIMUM_TILES;
+        parameters->jpwl_correct = OPJ_FALSE;
+        parameters->jpwl_exp_comps = JPWL_EXPECTED_COMPONENTS;
+        parameters->jpwl_max_tiles = JPWL_MAXIMUM_TILES;
 #endif /* USE_JPWL */
-/* <<UniPG */
-	}
+        /* <<UniPG */
+    }
 }
 
-void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) {
-	if(dinfo && parameters) {
-		switch(dinfo->codec_format) {
-			case CODEC_J2K:
-			case CODEC_JPT:
-				j2k_setup_decoder((opj_j2k_t*)dinfo->j2k_handle, parameters);
-				break;
-			case CODEC_JP2:
-				jp2_setup_decoder((opj_jp2_t*)dinfo->jp2_handle, parameters);
-				break;
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-	}
+void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters)
+{
+    if(dinfo && parameters) {
+        switch(dinfo->codec_format) {
+        case CODEC_J2K:
+        case CODEC_JPT:
+            j2k_setup_decoder((opj_j2k_t*)dinfo->j2k_handle, parameters);
+            break;
+        case CODEC_JP2:
+            jp2_setup_decoder((opj_jp2_t*)dinfo->jp2_handle, parameters);
+            break;
+        case CODEC_UNKNOWN:
+        default:
+            break;
+        }
+    }
 }
 
-opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) {
-	return opj_decode_with_info(dinfo, cio, NULL);
+opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio)
+{
+    return opj_decode_with_info(dinfo, cio, NULL);
 }
 
-opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info) {
-	if(dinfo && cio) {
-		switch(dinfo->codec_format) {
-			case CODEC_J2K:
-				return j2k_decode((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
-			case CODEC_JPT:
-				return j2k_decode_jpt_stream((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
-			case CODEC_JP2:
-				return opj_jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio, cstr_info);
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-	}
-	return NULL;
+opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info)
+{
+    if(dinfo && cio) {
+        switch(dinfo->codec_format) {
+        case CODEC_J2K:
+            return j2k_decode((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
+        case CODEC_JPT:
+            return j2k_decode_jpt_stream((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
+        case CODEC_JP2:
+            return opj_jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio, cstr_info);
+        case CODEC_UNKNOWN:
+        default:
+            break;
+        }
+    }
+    return NULL;
 }
 
-opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format) {
-	opj_cinfo_t *cinfo = (opj_cinfo_t*)opj_calloc(1, sizeof(opj_cinfo_t));
-	if(!cinfo) return NULL;
-	cinfo->is_decompressor = OPJ_FALSE;
-	switch(format) {
-		case CODEC_J2K:
-			/* get a J2K coder handle */
-			cinfo->j2k_handle = (void*)j2k_create_compress((opj_common_ptr)cinfo);
-			if(!cinfo->j2k_handle) {
-				opj_free(cinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_JP2:
-			/* get a JP2 coder handle */
-			cinfo->jp2_handle = (void*)jp2_create_compress((opj_common_ptr)cinfo);
-			if(!cinfo->jp2_handle) {
-				opj_free(cinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_JPT:
-		case CODEC_UNKNOWN:
-		default:
-			opj_free(cinfo);
-			return NULL;
-	}
+opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format)
+{
+    opj_cinfo_t *cinfo = (opj_cinfo_t*)opj_calloc(1, sizeof(opj_cinfo_t));
+    if(!cinfo) return NULL;
+    cinfo->is_decompressor = OPJ_FALSE;
+    switch(format) {
+    case CODEC_J2K:
+        /* get a J2K coder handle */
+        cinfo->j2k_handle = (void*)j2k_create_compress((opj_common_ptr)cinfo);
+        if(!cinfo->j2k_handle) {
+            opj_free(cinfo);
+            return NULL;
+        }
+        break;
+    case CODEC_JP2:
+        /* get a JP2 coder handle */
+        cinfo->jp2_handle = (void*)jp2_create_compress((opj_common_ptr)cinfo);
+        if(!cinfo->jp2_handle) {
+            opj_free(cinfo);
+            return NULL;
+        }
+        break;
+    case CODEC_JPT:
+    case CODEC_UNKNOWN:
+    default:
+        opj_free(cinfo);
+        return NULL;
+    }
 
-	cinfo->codec_format = format;
+    cinfo->codec_format = format;
 
-	return cinfo;
+    return cinfo;
 }
 
-void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo) {
-	if(cinfo) {
-		/* destroy the codec */
-		switch(cinfo->codec_format) {
-			case CODEC_J2K:
-				j2k_destroy_compress((opj_j2k_t*)cinfo->j2k_handle);
-				break;
-			case CODEC_JP2:
-				jp2_destroy_compress((opj_jp2_t*)cinfo->jp2_handle);
-				break;
-			case CODEC_JPT:
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-		/* destroy the decompressor */
-		opj_free(cinfo);
-	}
+void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo)
+{
+    if(cinfo) {
+        /* destroy the codec */
+        switch(cinfo->codec_format) {
+        case CODEC_J2K:
+            j2k_destroy_compress((opj_j2k_t*)cinfo->j2k_handle);
+            break;
+        case CODEC_JP2:
+            jp2_destroy_compress((opj_jp2_t*)cinfo->jp2_handle);
+            break;
+        case CODEC_JPT:
+        case CODEC_UNKNOWN:
+        default:
+            break;
+        }
+        /* destroy the decompressor */
+        opj_free(cinfo);
+    }
 }
 
-void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters) {
-	if(parameters) {
-		memset(parameters, 0, sizeof(opj_cparameters_t));
-		/* default coding parameters */
-		parameters->cp_cinema = OFF; 
-		parameters->max_comp_size = 0;
-		parameters->numresolution = 6;
-		parameters->cp_rsiz = STD_RSIZ;
-		parameters->cblockw_init = 64;
-		parameters->cblockh_init = 64;
-		parameters->prog_order = LRCP;
-		parameters->roi_compno = -1;		/* no ROI */
-		parameters->subsampling_dx = 1;
-		parameters->subsampling_dy = 1;
-		parameters->tp_on = 0;
-		parameters->decod_format = -1;
-		parameters->cod_format = -1;
-		parameters->tcp_rates[0] = 0;   
-		parameters->tcp_numlayers = 0;
-    parameters->cp_disto_alloc = 0;
-		parameters->cp_fixed_alloc = 0;
-		parameters->cp_fixed_quality = 0;
-/* UniPG>> */
+void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters)
+{
+    if(parameters) {
+        memset(parameters, 0, sizeof(opj_cparameters_t));
+        /* default coding parameters */
+        parameters->cp_cinema = OFF;
+        parameters->max_comp_size = 0;
+        parameters->numresolution = 6;
+        parameters->cp_rsiz = STD_RSIZ;
+        parameters->cblockw_init = 64;
+        parameters->cblockh_init = 64;
+        parameters->prog_order = LRCP;
+        parameters->roi_compno = -1;		/* no ROI */
+        parameters->subsampling_dx = 1;
+        parameters->subsampling_dy = 1;
+        parameters->tp_on = 0;
+        parameters->decod_format = -1;
+        parameters->cod_format = -1;
+        parameters->tcp_rates[0] = 0;
+        parameters->tcp_numlayers = 0;
+        parameters->cp_disto_alloc = 0;
+        parameters->cp_fixed_alloc = 0;
+        parameters->cp_fixed_quality = 0;
+        /* UniPG>> */
 #ifdef USE_JPWL
-		parameters->jpwl_epc_on = OPJ_FALSE;
-		parameters->jpwl_hprot_MH = -1; /* -1 means unassigned */
-		{
-			int i;
-			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
-				parameters->jpwl_hprot_TPH_tileno[i] = -1; /* unassigned */
-				parameters->jpwl_hprot_TPH[i] = 0; /* absent */
-			}
-		};
-		{
-			int i;
-			for (i = 0; i < JPWL_MAX_NO_PACKSPECS; i++) {
-				parameters->jpwl_pprot_tileno[i] = -1; /* unassigned */
-				parameters->jpwl_pprot_packno[i] = -1; /* unassigned */
-				parameters->jpwl_pprot[i] = 0; /* absent */
-			}
-		};
-		parameters->jpwl_sens_size = 0; /* 0 means no ESD */
-		parameters->jpwl_sens_addr = 0; /* 0 means auto */
-		parameters->jpwl_sens_range = 0; /* 0 means packet */
-		parameters->jpwl_sens_MH = -1; /* -1 means unassigned */
-		{
-			int i;
-			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
-				parameters->jpwl_sens_TPH_tileno[i] = -1; /* unassigned */
-				parameters->jpwl_sens_TPH[i] = -1; /* absent */
-			}
-		};
+        parameters->jpwl_epc_on = OPJ_FALSE;
+        parameters->jpwl_hprot_MH = -1; /* -1 means unassigned */
+        {
+            int i;
+            for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
+                parameters->jpwl_hprot_TPH_tileno[i] = -1; /* unassigned */
+                parameters->jpwl_hprot_TPH[i] = 0; /* absent */
+            }
+        };
+        {
+            int i;
+            for (i = 0; i < JPWL_MAX_NO_PACKSPECS; i++) {
+                parameters->jpwl_pprot_tileno[i] = -1; /* unassigned */
+                parameters->jpwl_pprot_packno[i] = -1; /* unassigned */
+                parameters->jpwl_pprot[i] = 0; /* absent */
+            }
+        };
+        parameters->jpwl_sens_size = 0; /* 0 means no ESD */
+        parameters->jpwl_sens_addr = 0; /* 0 means auto */
+        parameters->jpwl_sens_range = 0; /* 0 means packet */
+        parameters->jpwl_sens_MH = -1; /* -1 means unassigned */
+        {
+            int i;
+            for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
+                parameters->jpwl_sens_TPH_tileno[i] = -1; /* unassigned */
+                parameters->jpwl_sens_TPH[i] = -1; /* absent */
+            }
+        };
 #endif /* USE_JPWL */
-/* <<UniPG */
-	}
+        /* <<UniPG */
+    }
 }
 
-void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image) {
-	if(cinfo && parameters && image) {
-		switch(cinfo->codec_format) {
-			case CODEC_J2K:
-				j2k_setup_encoder((opj_j2k_t*)cinfo->j2k_handle, parameters, image);
-				break;
-			case CODEC_JP2:
-				jp2_setup_encoder((opj_jp2_t*)cinfo->jp2_handle, parameters, image);
-				break;
-			case CODEC_JPT:
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-	}
+void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image)
+{
+    if(cinfo && parameters && image) {
+        switch(cinfo->codec_format) {
+        case CODEC_J2K:
+            j2k_setup_encoder((opj_j2k_t*)cinfo->j2k_handle, parameters, image);
+            break;
+        case CODEC_JP2:
+            jp2_setup_encoder((opj_jp2_t*)cinfo->jp2_handle, parameters, image);
+            break;
+        case CODEC_JPT:
+        case CODEC_UNKNOWN:
+        default:
+            break;
+        }
+    }
 }
 
-opj_bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index) {
-	if (index != NULL)
-		opj_event_msg((opj_common_ptr)cinfo, EVT_WARNING, "Set index to NULL when calling the opj_encode function.\n"
-		"To extract the index, use the opj_encode_with_info() function.\n"
-		"No index will be generated during this encoding\n");
-	return opj_encode_with_info(cinfo, cio, image, NULL);
+opj_bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index)
+{
+    if (index != NULL)
+        opj_event_msg((opj_common_ptr)cinfo, EVT_WARNING, "Set index to NULL when calling the opj_encode function.\n"
+                      "To extract the index, use the opj_encode_with_info() function.\n"
+                      "No index will be generated during this encoding\n");
+    return opj_encode_with_info(cinfo, cio, image, NULL);
 }
 
-opj_bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
-	if(cinfo && cio && image) {
-		switch(cinfo->codec_format) {
-			case CODEC_J2K:
-				return j2k_encode((opj_j2k_t*)cinfo->j2k_handle, cio, image, cstr_info);
-			case CODEC_JP2:
-				return opj_jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, cstr_info);	    
-			case CODEC_JPT:
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-	}
-	return OPJ_FALSE;
+opj_bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info)
+{
+    if(cinfo && cio && image) {
+        switch(cinfo->codec_format) {
+        case CODEC_J2K:
+            return j2k_encode((opj_j2k_t*)cinfo->j2k_handle, cio, image, cstr_info);
+        case CODEC_JP2:
+            return opj_jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, cstr_info);
+        case CODEC_JPT:
+        case CODEC_UNKNOWN:
+        default:
+            break;
+        }
+    }
+    return OPJ_FALSE;
 }
 
-void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info) {
-	if (cstr_info) {
-		int tileno;
-		for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
-			opj_tile_info_t *tile_info = &cstr_info->tile[tileno];
-			opj_free(tile_info->thresh);
-			opj_free(tile_info->packet);
-			opj_free(tile_info->tp);
-			opj_free(tile_info->marker);
-		}
-		opj_free(cstr_info->tile);
-		opj_free(cstr_info->marker);
-		opj_free(cstr_info->numdecompos);
-	}
+void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info)
+{
+    if (cstr_info) {
+        int tileno;
+        for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
+            opj_tile_info_t *tile_info = &cstr_info->tile[tileno];
+            opj_free(tile_info->thresh);
+            opj_free(tile_info->packet);
+            opj_free(tile_info->tp);
+            opj_free(tile_info->marker);
+        }
+        opj_free(cstr_info->tile);
+        opj_free(cstr_info->marker);
+        opj_free(cstr_info->numdecompos);
+    }
 }
diff --git a/src/lib/openmj2/openjpeg.h b/src/lib/openmj2/openjpeg.h
index 132ec2fd..cf9ba269 100644
--- a/src/lib/openmj2/openjpeg.h
+++ b/src/lib/openmj2/openjpeg.h
@@ -1,45 +1,45 @@
- /*
- * 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.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
- * Copyright (c) 2003-2014, Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*
+* 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.
+*
+* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+* Copyright (c) 2002-2014, Professor Benoit Macq
+* Copyright (c) 2001-2003, David Janssens
+* Copyright (c) 2002-2003, Yannick Verschueren
+* Copyright (c) 2003-2007, Francois-Olivier Devaux
+* Copyright (c) 2003-2014, Antonin Descampe
+* Copyright (c) 2005, Herve Drolon, FreeImage Team
+* Copyright (c) 2006-2007, Parvatha Elangovan
+* Copyright (c) 2010-2011, Kaori Hagihara
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*/
 #ifndef OPENJPEG_H
 #define OPENJPEG_H
 
-/* 
+/*
 ==========================================================
    Compiler directives
 ==========================================================
@@ -58,10 +58,10 @@
 #else
 #define OPJ_CALLCONV __stdcall
 /*
-The following ifdef block is the standard way of creating macros which make exporting 
+The following ifdef block is the standard way of creating macros which make exporting
 from a DLL simpler. All files within this DLL are compiled with the OPJ_EXPORTS
 symbol defined on the command line. this symbol should not be defined on any project
-that uses this DLL. This way any other project whose source files include this file see 
+that uses this DLL. This way any other project whose source files include this file see
 OPJ_API functions as being imported from a DLL, whereas this DLL sees symbols
 defined with this macro as being exported.
 */
@@ -78,7 +78,7 @@ typedef int opj_bool;
 
 /* Avoid compile-time warning because parameter is not used */
 #define OPJ_ARG_NOT_USED(x) (void)(x)
-/* 
+/*
 ==========================================================
    Useful constant definitions
 ==========================================================
@@ -100,51 +100,51 @@ typedef int opj_bool;
 #define JPWL_MAXIMUM_EPB_ROOM 65450 /**< Expect this maximum number of bytes for composition of EPBs */
 /* <<UniPG */
 
-/* 
+/*
 ==========================================================
    enum definitions
 ==========================================================
 */
-/** 
+/**
 Rsiz Capabilities
 */
 typedef enum RSIZ_CAPABILITIES {
-	STD_RSIZ = 0,		/** Standard JPEG2000 profile*/
-	CINEMA2K = 3,		/** Profile name for a 2K image*/
-	CINEMA4K = 4		/** Profile name for a 4K image*/
+    STD_RSIZ = 0,		/** Standard JPEG2000 profile*/
+    CINEMA2K = 3,		/** Profile name for a 2K image*/
+    CINEMA4K = 4		/** Profile name for a 4K image*/
 } OPJ_RSIZ_CAPABILITIES;
 
-/** 
-Digital cinema operation mode 
+/**
+Digital cinema operation mode
 */
 typedef enum CINEMA_MODE {
-	OFF = 0,					/** Not Digital Cinema*/
-	CINEMA2K_24 = 1,	/** 2K Digital Cinema at 24 fps*/
-	CINEMA2K_48 = 2,	/** 2K Digital Cinema at 48 fps*/
-	CINEMA4K_24 = 3		/** 4K Digital Cinema at 24 fps*/
-}OPJ_CINEMA_MODE;
+    OFF = 0,					/** Not Digital Cinema*/
+    CINEMA2K_24 = 1,	/** 2K Digital Cinema at 24 fps*/
+    CINEMA2K_48 = 2,	/** 2K Digital Cinema at 48 fps*/
+    CINEMA4K_24 = 3		/** 4K Digital Cinema at 24 fps*/
+} OPJ_CINEMA_MODE;
 
-/** 
-Progression order 
+/**
+Progression order
 */
 typedef enum PROG_ORDER {
-	PROG_UNKNOWN = -1,	/**< place-holder */
-	LRCP = 0,		/**< layer-resolution-component-precinct order */
-	RLCP = 1,		/**< resolution-layer-component-precinct order */
-	RPCL = 2,		/**< resolution-precinct-component-layer order */
-	PCRL = 3,		/**< precinct-component-resolution-layer order */
-	CPRL = 4		/**< component-precinct-resolution-layer order */
+    PROG_UNKNOWN = -1,	/**< place-holder */
+    LRCP = 0,		/**< layer-resolution-component-precinct order */
+    RLCP = 1,		/**< resolution-layer-component-precinct order */
+    RPCL = 2,		/**< resolution-precinct-component-layer order */
+    PCRL = 3,		/**< precinct-component-resolution-layer order */
+    CPRL = 4		/**< component-precinct-resolution-layer order */
 } OPJ_PROG_ORDER;
 
 /**
 Supported image color spaces
 */
 typedef enum COLOR_SPACE {
-	CLRSPC_UNKNOWN = -1,	/**< not supported by the library */
-	CLRSPC_UNSPECIFIED = 0, /**< not specified in the codestream */ 
-	CLRSPC_SRGB = 1,		/**< sRGB */
-	CLRSPC_GRAY = 2,		/**< grayscale */
-	CLRSPC_SYCC = 3			/**< YUV */
+    CLRSPC_UNKNOWN = -1,	/**< not supported by the library */
+    CLRSPC_UNSPECIFIED = 0, /**< not specified in the codestream */
+    CLRSPC_SRGB = 1,		/**< sRGB */
+    CLRSPC_GRAY = 2,		/**< grayscale */
+    CLRSPC_SYCC = 3			/**< YUV */
 } OPJ_COLOR_SPACE;
 
 #define ENUMCS_SRGB 16
@@ -155,22 +155,22 @@ typedef enum COLOR_SPACE {
 Supported codec
 */
 typedef enum CODEC_FORMAT {
-	CODEC_UNKNOWN = -1,	/**< place-holder */
-	CODEC_J2K  = 0,		/**< JPEG-2000 codestream : read/write */
-	CODEC_JPT  = 1,		/**< JPT-stream (JPEG 2000, JPIP) : read only */
-	CODEC_JP2  = 2 		/**< JPEG-2000 file format : read/write */
+    CODEC_UNKNOWN = -1,	/**< place-holder */
+    CODEC_J2K  = 0,		/**< JPEG-2000 codestream : read/write */
+    CODEC_JPT  = 1,		/**< JPT-stream (JPEG 2000, JPIP) : read only */
+    CODEC_JP2  = 2 		/**< JPEG-2000 file format : read/write */
 } OPJ_CODEC_FORMAT;
 
-/** 
-Limit decoding to certain portions of the codestream. 
+/**
+Limit decoding to certain portions of the codestream.
 */
 typedef enum LIMIT_DECODING {
-	NO_LIMITATION = 0,				  /**< No limitation for the decoding. The entire codestream will de decoded */
-	LIMIT_TO_MAIN_HEADER = 1,		/**< The decoding is limited to the Main Header */
-	DECODE_ALL_BUT_PACKETS = 2	/**< Decode everything except the JPEG 2000 packets */
+    NO_LIMITATION = 0,				  /**< No limitation for the decoding. The entire codestream will de decoded */
+    LIMIT_TO_MAIN_HEADER = 1,		/**< The decoding is limited to the Main Header */
+    DECODE_ALL_BUT_PACKETS = 2	/**< Decode everything except the JPEG 2000 packets */
 } OPJ_LIMIT_DECODING;
 
-/* 
+/*
 ==========================================================
    event manager typedef definitions
 ==========================================================
@@ -179,13 +179,13 @@ typedef enum LIMIT_DECODING {
 /**
 Callback function prototype for events
 @param msg Event message
-@param client_data 
+@param client_data
 */
 typedef void (*opj_msg_callback) (const char *msg, void *client_data);
 
 /**
 Message handler object
-used for 
+used for
 <ul>
 <li>Error messages
 <li>Warning messages
@@ -193,16 +193,16 @@ used for
 </ul>
 */
 typedef struct opj_event_mgr {
-	/** Error message callback if available, NULL otherwise */
-	opj_msg_callback error_handler;
-	/** Warning message callback if available, NULL otherwise */
-	opj_msg_callback warning_handler;
-	/** Debug message callback if available, NULL otherwise */
-	opj_msg_callback info_handler;
+    /** Error message callback if available, NULL otherwise */
+    opj_msg_callback error_handler;
+    /** Warning message callback if available, NULL otherwise */
+    opj_msg_callback warning_handler;
+    /** Debug message callback if available, NULL otherwise */
+    opj_msg_callback info_handler;
 } opj_event_mgr_t;
 
 
-/* 
+/*
 ==========================================================
    codec typedef definitions
 ==========================================================
@@ -212,157 +212,157 @@ typedef struct opj_event_mgr {
 Progression order changes
 */
 typedef struct opj_poc {
-	/** Resolution num start, Component num start, given by POC */
-	int resno0, compno0;
-	/** Layer num end,Resolution num end, Component num end, given by POC */
-	int layno1, resno1, compno1;
-	/** Layer num start,Precinct num start, Precinct num end */
-	int layno0, precno0, precno1;
-	/** Progression order enum*/
-	OPJ_PROG_ORDER prg1,prg;
-	/** Progression order string*/
-	char progorder[5];
-	/** Tile number */
-	int tile;
-	/** Start and end values for Tile width and height*/
-	int tx0,tx1,ty0,ty1;
-	/** Start value, initialised in pi_initialise_encode*/
-	int layS, resS, compS, prcS;
-	/** End value, initialised in pi_initialise_encode */
-	int layE, resE, compE, prcE;
-	/** Start and end values of Tile width and height, initialised in pi_initialise_encode*/
-	int txS,txE,tyS,tyE,dx,dy;
-	/** Temporary values for Tile parts, initialised in pi_create_encode */
-	int lay_t, res_t, comp_t, prc_t,tx0_t,ty0_t;
+    /** Resolution num start, Component num start, given by POC */
+    int resno0, compno0;
+    /** Layer num end,Resolution num end, Component num end, given by POC */
+    int layno1, resno1, compno1;
+    /** Layer num start,Precinct num start, Precinct num end */
+    int layno0, precno0, precno1;
+    /** Progression order enum*/
+    OPJ_PROG_ORDER prg1,prg;
+    /** Progression order string*/
+    char progorder[5];
+    /** Tile number */
+    int tile;
+    /** Start and end values for Tile width and height*/
+    int tx0,tx1,ty0,ty1;
+    /** Start value, initialised in pi_initialise_encode*/
+    int layS, resS, compS, prcS;
+    /** End value, initialised in pi_initialise_encode */
+    int layE, resE, compE, prcE;
+    /** Start and end values of Tile width and height, initialised in pi_initialise_encode*/
+    int txS,txE,tyS,tyE,dx,dy;
+    /** Temporary values for Tile parts, initialised in pi_create_encode */
+    int lay_t, res_t, comp_t, prc_t,tx0_t,ty0_t;
 } opj_poc_t;
 
 /**
 Compression parameters
 */
 typedef struct opj_cparameters {
-	/** size of tile: tile_size_on = false (not in argument) or = true (in argument) */
-	opj_bool tile_size_on;
-	/** XTOsiz */
-	int cp_tx0;
-	/** YTOsiz */
-	int cp_ty0;
-	/** XTsiz */
-	int cp_tdx;
-	/** YTsiz */
-	int cp_tdy;
-	/** allocation by rate/distortion */
-	int cp_disto_alloc;
-	/** allocation by fixed layer */
-	int cp_fixed_alloc;
-	/** add fixed_quality */
-	int cp_fixed_quality;
-	/** fixed layer */
-	int *cp_matrice;
-	/** comment for coding */
-	char *cp_comment;
-	/** csty : coding style */
-	int csty;
-	/** progression order (default LRCP) */
-	OPJ_PROG_ORDER prog_order;
-	/** progression order changes */
-	opj_poc_t POC[32];
-	/** number of progression order changes (POC), default to 0 */
-	int numpocs;
-	/** number of layers */
-	int tcp_numlayers;
-	/** rates of layers */
-	float tcp_rates[100];
-	/** different psnr for successive layers */
-	float tcp_distoratio[100];
-	/** number of resolutions */
-	int numresolution;
-	/** initial code block width, default to 64 */
- 	int cblockw_init;
-	/** initial code block height, default to 64 */
-	int cblockh_init;
-	/** mode switch (cblk_style) */
-	int mode;
-	/** 1 : use the irreversible DWT 9-7, 0 : use lossless compression (default) */
-	int irreversible;
-	/** region of interest: affected component in [0..3], -1 means no ROI */
-	int roi_compno;
-	/** region of interest: upshift value */
-	int roi_shift;
-	/* number of precinct size specifications */
-	int res_spec;
-	/** initial precinct width */
-	int prcw_init[J2K_MAXRLVLS];
-	/** initial precinct height */
-	int prch_init[J2K_MAXRLVLS];
-
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-	/** input file name */
-	char infile[OPJ_PATH_LEN];
-	/** output file name */
-	char outfile[OPJ_PATH_LEN];
-	/** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
-	int index_on;
-	/** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
-	char index[OPJ_PATH_LEN];
-	/** subimage encoding: origin image offset in x direction */
-	int image_offset_x0;
-	/** subimage encoding: origin image offset in y direction */
-	int image_offset_y0;
-	/** subsampling value for dx */
-	int subsampling_dx;
-	/** subsampling value for dy */
-	int subsampling_dy;
-	/** input file format 0: PGX, 1: PxM, 2: BMP 3:TIF*/
-	int decod_format;
-	/** output file format 0: J2K, 1: JP2, 2: JPT */
-	int cod_format;
-	/*@}*/
-
-/* UniPG>> */
-	/**@name JPWL encoding parameters */
-	/*@{*/
-	/** enables writing of EPC in MH, thus activating JPWL */
-	opj_bool jpwl_epc_on;
-	/** error protection method for MH (0,1,16,32,37-128) */
-	int jpwl_hprot_MH;
-	/** tile number of header protection specification (>=0) */
-	int jpwl_hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** error protection methods for TPHs (0,1,16,32,37-128) */
-	int jpwl_hprot_TPH[JPWL_MAX_NO_TILESPECS];
-	/** tile number of packet protection specification (>=0) */
-	int jpwl_pprot_tileno[JPWL_MAX_NO_PACKSPECS];
-	/** packet number of packet protection specification (>=0) */
-	int jpwl_pprot_packno[JPWL_MAX_NO_PACKSPECS];
-	/** error protection methods for packets (0,1,16,32,37-128) */
-	int jpwl_pprot[JPWL_MAX_NO_PACKSPECS];
-	/** enables writing of ESD, (0=no/1/2 bytes) */
-	int jpwl_sens_size;
-	/** sensitivity addressing size (0=auto/2/4 bytes) */
-	int jpwl_sens_addr;
-	/** sensitivity range (0-3) */
-	int jpwl_sens_range;
-	/** sensitivity method for MH (-1=no,0-7) */
-	int jpwl_sens_MH;
-	/** tile number of sensitivity specification (>=0) */
-	int jpwl_sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** sensitivity methods for TPHs (-1=no,0-7) */
-	int jpwl_sens_TPH[JPWL_MAX_NO_TILESPECS];
-	/*@}*/
-/* <<UniPG */
-
-	/** Digital Cinema compliance 0-not compliant, 1-compliant*/
-	OPJ_CINEMA_MODE cp_cinema;
-	/** Maximum rate for each component. If == 0, component size limitation is not considered */
-	int max_comp_size;
-	/** Profile name*/
-	OPJ_RSIZ_CAPABILITIES cp_rsiz;
-	/** Tile part generation*/
-	char tp_on;
-	/** Flag for Tile part generation*/
-	char tp_flag;
-	/** MCT (multiple component transform) */
-	char tcp_mct;
+    /** size of tile: tile_size_on = false (not in argument) or = true (in argument) */
+    opj_bool tile_size_on;
+    /** XTOsiz */
+    int cp_tx0;
+    /** YTOsiz */
+    int cp_ty0;
+    /** XTsiz */
+    int cp_tdx;
+    /** YTsiz */
+    int cp_tdy;
+    /** allocation by rate/distortion */
+    int cp_disto_alloc;
+    /** allocation by fixed layer */
+    int cp_fixed_alloc;
+    /** add fixed_quality */
+    int cp_fixed_quality;
+    /** fixed layer */
+    int *cp_matrice;
+    /** comment for coding */
+    char *cp_comment;
+    /** csty : coding style */
+    int csty;
+    /** progression order (default LRCP) */
+    OPJ_PROG_ORDER prog_order;
+    /** progression order changes */
+    opj_poc_t POC[32];
+    /** number of progression order changes (POC), default to 0 */
+    int numpocs;
+    /** number of layers */
+    int tcp_numlayers;
+    /** rates of layers */
+    float tcp_rates[100];
+    /** different psnr for successive layers */
+    float tcp_distoratio[100];
+    /** number of resolutions */
+    int numresolution;
+    /** initial code block width, default to 64 */
+    int cblockw_init;
+    /** initial code block height, default to 64 */
+    int cblockh_init;
+    /** mode switch (cblk_style) */
+    int mode;
+    /** 1 : use the irreversible DWT 9-7, 0 : use lossless compression (default) */
+    int irreversible;
+    /** region of interest: affected component in [0..3], -1 means no ROI */
+    int roi_compno;
+    /** region of interest: upshift value */
+    int roi_shift;
+    /* number of precinct size specifications */
+    int res_spec;
+    /** initial precinct width */
+    int prcw_init[J2K_MAXRLVLS];
+    /** initial precinct height */
+    int prch_init[J2K_MAXRLVLS];
+
+    /**@name command line encoder parameters (not used inside the library) */
+    /*@{*/
+    /** input file name */
+    char infile[OPJ_PATH_LEN];
+    /** output file name */
+    char outfile[OPJ_PATH_LEN];
+    /** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
+    int index_on;
+    /** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
+    char index[OPJ_PATH_LEN];
+    /** subimage encoding: origin image offset in x direction */
+    int image_offset_x0;
+    /** subimage encoding: origin image offset in y direction */
+    int image_offset_y0;
+    /** subsampling value for dx */
+    int subsampling_dx;
+    /** subsampling value for dy */
+    int subsampling_dy;
+    /** input file format 0: PGX, 1: PxM, 2: BMP 3:TIF*/
+    int decod_format;
+    /** output file format 0: J2K, 1: JP2, 2: JPT */
+    int cod_format;
+    /*@}*/
+
+    /* UniPG>> */
+    /**@name JPWL encoding parameters */
+    /*@{*/
+    /** enables writing of EPC in MH, thus activating JPWL */
+    opj_bool jpwl_epc_on;
+    /** error protection method for MH (0,1,16,32,37-128) */
+    int jpwl_hprot_MH;
+    /** tile number of header protection specification (>=0) */
+    int jpwl_hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+    /** error protection methods for TPHs (0,1,16,32,37-128) */
+    int jpwl_hprot_TPH[JPWL_MAX_NO_TILESPECS];
+    /** tile number of packet protection specification (>=0) */
+    int jpwl_pprot_tileno[JPWL_MAX_NO_PACKSPECS];
+    /** packet number of packet protection specification (>=0) */
+    int jpwl_pprot_packno[JPWL_MAX_NO_PACKSPECS];
+    /** error protection methods for packets (0,1,16,32,37-128) */
+    int jpwl_pprot[JPWL_MAX_NO_PACKSPECS];
+    /** enables writing of ESD, (0=no/1/2 bytes) */
+    int jpwl_sens_size;
+    /** sensitivity addressing size (0=auto/2/4 bytes) */
+    int jpwl_sens_addr;
+    /** sensitivity range (0-3) */
+    int jpwl_sens_range;
+    /** sensitivity method for MH (-1=no,0-7) */
+    int jpwl_sens_MH;
+    /** tile number of sensitivity specification (>=0) */
+    int jpwl_sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+    /** sensitivity methods for TPHs (-1=no,0-7) */
+    int jpwl_sens_TPH[JPWL_MAX_NO_TILESPECS];
+    /*@}*/
+    /* <<UniPG */
+
+    /** Digital Cinema compliance 0-not compliant, 1-compliant*/
+    OPJ_CINEMA_MODE cp_cinema;
+    /** Maximum rate for each component. If == 0, component size limitation is not considered */
+    int max_comp_size;
+    /** Profile name*/
+    OPJ_RSIZ_CAPABILITIES cp_rsiz;
+    /** Tile part generation*/
+    char tp_on;
+    /** Flag for Tile part generation*/
+    char tp_flag;
+    /** MCT (multiple component transform) */
+    char tcp_mct;
 } opj_cparameters_t;
 
 #define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG	0x0001
@@ -371,55 +371,55 @@ typedef struct opj_cparameters {
 Decompression parameters
 */
 typedef struct opj_dparameters {
-	/** 
-	Set the number of highest resolution levels to be discarded. 
-	The image resolution is effectively divided by 2 to the power of the number of discarded levels. 
-	The reduce factor is limited by the smallest total number of decomposition levels among tiles.
-	if != 0, then original dimension divided by 2^(reduce); 
-	if == 0 or not used, image is decoded to the full resolution 
-	*/
-	int cp_reduce;
-	/** 
-	Set the maximum number of quality layers to decode. 
-	If there are less quality layers than the specified number, all the quality layers are decoded.
-	if != 0, then only the first "layer" layers are decoded; 
-	if == 0 or not used, all the quality layers are decoded 
-	*/
-	int cp_layer;
-
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-	/** input file name */
-	char infile[OPJ_PATH_LEN];
-	/** output file name */
-	char outfile[OPJ_PATH_LEN];
-	/** input file format 0: J2K, 1: JP2, 2: JPT */
-	int decod_format;
-	/** output file format 0: PGX, 1: PxM, 2: BMP */
-	int cod_format;
-	/*@}*/
-
-/* UniPG>> */
-	/**@name JPWL decoding parameters */
-	/*@{*/
-	/** activates the JPWL correction capabilities */
-	opj_bool jpwl_correct;
-	/** expected number of components */
-	int jpwl_exp_comps;
-	/** maximum number of tiles */
-	int jpwl_max_tiles;
-	/*@}*/
-/* <<UniPG */
-
-	/** 
-	Specify whether the decoding should be done on the entire codestream, or be limited to the main header
-	Limiting the decoding to the main header makes it possible to extract the characteristics of the codestream
-	if == NO_LIMITATION, the entire codestream is decoded; 
-	if == LIMIT_TO_MAIN_HEADER, only the main header is decoded; 
-	*/
-	OPJ_LIMIT_DECODING cp_limit_decoding;
-
-	unsigned int flags;
+    /**
+    Set the number of highest resolution levels to be discarded.
+    The image resolution is effectively divided by 2 to the power of the number of discarded levels.
+    The reduce factor is limited by the smallest total number of decomposition levels among tiles.
+    if != 0, then original dimension divided by 2^(reduce);
+    if == 0 or not used, image is decoded to the full resolution
+    */
+    int cp_reduce;
+    /**
+    Set the maximum number of quality layers to decode.
+    If there are less quality layers than the specified number, all the quality layers are decoded.
+    if != 0, then only the first "layer" layers are decoded;
+    if == 0 or not used, all the quality layers are decoded
+    */
+    int cp_layer;
+
+    /**@name command line encoder parameters (not used inside the library) */
+    /*@{*/
+    /** input file name */
+    char infile[OPJ_PATH_LEN];
+    /** output file name */
+    char outfile[OPJ_PATH_LEN];
+    /** input file format 0: J2K, 1: JP2, 2: JPT */
+    int decod_format;
+    /** output file format 0: PGX, 1: PxM, 2: BMP */
+    int cod_format;
+    /*@}*/
+
+    /* UniPG>> */
+    /**@name JPWL decoding parameters */
+    /*@{*/
+    /** activates the JPWL correction capabilities */
+    opj_bool jpwl_correct;
+    /** expected number of components */
+    int jpwl_exp_comps;
+    /** maximum number of tiles */
+    int jpwl_max_tiles;
+    /*@}*/
+    /* <<UniPG */
+
+    /**
+    Specify whether the decoding should be done on the entire codestream, or be limited to the main header
+    Limiting the decoding to the main header makes it possible to extract the characteristics of the codestream
+    if == NO_LIMITATION, the entire codestream is decoded;
+    if == LIMIT_TO_MAIN_HEADER, only the main header is decoded;
+    */
+    OPJ_LIMIT_DECODING cp_limit_decoding;
+
+    unsigned int flags;
 } opj_dparameters_t;
 
 /** Common fields between JPEG-2000 compression and decompression master structs. */
@@ -432,17 +432,17 @@ typedef struct opj_dparameters {
 	void *j2k_handle;			/**< pointer to the J2K codec */\
 	void *jp2_handle;			/**< pointer to the JP2 codec */\
 	void *mj2_handle			/**< pointer to the MJ2 codec */
-	
+
 /* Routines that are to be used by both halves of the library are declared
  * to receive a pointer to this structure.  There are no actual instances of
  * opj_common_struct_t, only of opj_cinfo_t and opj_dinfo_t.
  */
 typedef struct opj_common_struct {
-  opj_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual opj_cinfo_t or
-   * opj_dinfo_t.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
+    opj_common_fields;		/* Fields common to both master struct types */
+    /* Additional fields follow in an actual opj_cinfo_t or
+     * opj_dinfo_t.  All three structs must agree on these
+     * initial fields!  (This would be a lot cleaner in C++.)
+     */
 } opj_common_struct_t;
 
 typedef opj_common_struct_t * opj_common_ptr;
@@ -451,21 +451,21 @@ typedef opj_common_struct_t * opj_common_ptr;
 Compression context info
 */
 typedef struct opj_cinfo {
-	/** Fields shared with opj_dinfo_t */
-	opj_common_fields;	
-	/* other specific fields go here */
+    /** Fields shared with opj_dinfo_t */
+    opj_common_fields;
+    /* other specific fields go here */
 } opj_cinfo_t;
 
 /**
 Decompression context info
 */
 typedef struct opj_dinfo {
-	/** Fields shared with opj_cinfo_t */
-	opj_common_fields;	
-	/* other specific fields go here */
+    /** Fields shared with opj_cinfo_t */
+    opj_common_fields;
+    /* other specific fields go here */
 } opj_dinfo_t;
 
-/* 
+/*
 ==========================================================
    I/O stream typedef definitions
 ==========================================================
@@ -483,25 +483,25 @@ typedef struct opj_dinfo {
 Byte input-output stream (CIO)
 */
 typedef struct opj_cio {
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** open mode (read/write) either OPJ_STREAM_READ or OPJ_STREAM_WRITE */
-	int openmode;
-	/** pointer to the start of the buffer */
-	unsigned char *buffer;
-	/** buffer size in bytes */
-	int length;
-
-	/** pointer to the start of the stream */
-	unsigned char *start;
-	/** pointer to the end of the stream */
-	unsigned char *end;
-	/** pointer to the current position */
-	unsigned char *bp;
+    /** codec context */
+    opj_common_ptr cinfo;
+
+    /** open mode (read/write) either OPJ_STREAM_READ or OPJ_STREAM_WRITE */
+    int openmode;
+    /** pointer to the start of the buffer */
+    unsigned char *buffer;
+    /** buffer size in bytes */
+    int length;
+
+    /** pointer to the start of the stream */
+    unsigned char *start;
+    /** pointer to the end of the stream */
+    unsigned char *end;
+    /** pointer to the current position */
+    unsigned char *bp;
 } opj_cio_t;
 
-/* 
+/*
 ==========================================================
    image typedef definitions
 ==========================================================
@@ -511,81 +511,81 @@ typedef struct opj_cio {
 Defines a single image component
 */
 typedef struct opj_image_comp {
-	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
-	int dx;
-	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	int dy;
-	/** data width */
-	int w;
-	/** data height */
-	int h;
-	/** x component offset compared to the whole image */
-	int x0;
-	/** y component offset compared to the whole image */
-	int y0;
-	/** precision */
-	int prec;
-	/** image depth in bits */
-	int bpp;
-	/** signed (1) / unsigned (0) */
-	int sgnd;
-	/** number of decoded resolution */
-	int resno_decoded;
-	/** number of division by 2 of the out image compared to the original size of image */
-	int factor;
-	/** image component data */
-	int *data;
+    /** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
+    int dx;
+    /** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
+    int dy;
+    /** data width */
+    int w;
+    /** data height */
+    int h;
+    /** x component offset compared to the whole image */
+    int x0;
+    /** y component offset compared to the whole image */
+    int y0;
+    /** precision */
+    int prec;
+    /** image depth in bits */
+    int bpp;
+    /** signed (1) / unsigned (0) */
+    int sgnd;
+    /** number of decoded resolution */
+    int resno_decoded;
+    /** number of division by 2 of the out image compared to the original size of image */
+    int factor;
+    /** image component data */
+    int *data;
 } opj_image_comp_t;
 
-/** 
+/**
 Defines image data and characteristics
 */
 typedef struct opj_image {
-	/** XOsiz: horizontal offset from the origin of the reference grid to the left side of the image area */
-	int x0;
-	/** YOsiz: vertical offset from the origin of the reference grid to the top side of the image area */
-	int y0;
-	/** Xsiz: width of the reference grid */
-	int x1;
-	/** Ysiz: height of the reference grid */
-	int y1;
-	/** number of components in the image */
-	int numcomps;
-	/** color space: sRGB, Greyscale or YUV */
-	OPJ_COLOR_SPACE color_space;
-	/** image components */
-	opj_image_comp_t *comps;
-	/** 'restricted' ICC profile */
-	unsigned char *icc_profile_buf;
-	/** size of ICC profile */
-	int icc_profile_len;
+    /** XOsiz: horizontal offset from the origin of the reference grid to the left side of the image area */
+    int x0;
+    /** YOsiz: vertical offset from the origin of the reference grid to the top side of the image area */
+    int y0;
+    /** Xsiz: width of the reference grid */
+    int x1;
+    /** Ysiz: height of the reference grid */
+    int y1;
+    /** number of components in the image */
+    int numcomps;
+    /** color space: sRGB, Greyscale or YUV */
+    OPJ_COLOR_SPACE color_space;
+    /** image components */
+    opj_image_comp_t *comps;
+    /** 'restricted' ICC profile */
+    unsigned char *icc_profile_buf;
+    /** size of ICC profile */
+    int icc_profile_len;
 } opj_image_t;
 
 /**
 Component parameters structure used by the opj_image_create function
 */
 typedef struct opj_image_comptparm {
-	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
-	int dx;
-	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	int dy;
-	/** data width */
-	int w;
-	/** data height */
-	int h;
-	/** x component offset compared to the whole image */
-	int x0;
-	/** y component offset compared to the whole image */
-	int y0;
-	/** precision */
-	int prec;
-	/** image depth in bits */
-	int bpp;
-	/** signed (1) / unsigned (0) */
-	int sgnd;
+    /** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
+    int dx;
+    /** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
+    int dy;
+    /** data width */
+    int w;
+    /** data height */
+    int h;
+    /** x component offset compared to the whole image */
+    int x0;
+    /** y component offset compared to the whole image */
+    int y0;
+    /** precision */
+    int prec;
+    /** image depth in bits */
+    int bpp;
+    /** signed (1) / unsigned (0) */
+    int sgnd;
 } opj_image_cmptparm_t;
 
-/* 
+/*
 ==========================================================
    Information on the JPEG 2000 codestream
 ==========================================================
@@ -595,14 +595,14 @@ typedef struct opj_image_comptparm {
 Index structure : Information concerning a packet inside tile
 */
 typedef struct opj_packet_info {
-	/** packet start position (including SOP marker if it exists) */
-	int start_pos;
-	/** end of packet header position (including EPH marker if it exists)*/
-	int end_ph_pos;
-	/** packet end position */
-	int end_pos;
-	/** packet distorsion */
-	double disto;
+    /** packet start position (including SOP marker if it exists) */
+    int start_pos;
+    /** end of packet header position (including EPH marker if it exists)*/
+    int end_ph_pos;
+    /** packet end position */
+    int end_pos;
+    /** packet distorsion */
+    double disto;
 } opj_packet_info_t;
 
 
@@ -611,12 +611,12 @@ typedef struct opj_packet_info {
 Marker structure
 */
 typedef struct opj_marker_info_t {
-	/** marker type */
-	unsigned short int type;
-	/** position in codestream */
-	int pos;
-	/** length, marker val included */
-	int len;
+    /** marker type */
+    unsigned short int type;
+    /** position in codestream */
+    int pos;
+    /** length, marker val included */
+    int len;
 } opj_marker_info_t;
 /* <<UniPG */
 
@@ -624,108 +624,108 @@ typedef struct opj_marker_info_t {
 Index structure : Information concerning tile-parts
 */
 typedef struct opj_tp_info {
-	/** start position of tile part */
-	int tp_start_pos;
-	/** end position of tile part header */
-	int tp_end_header;
-	/** end position of tile part */
-	int tp_end_pos;
-	/** start packet of tile part */
-	int tp_start_pack;
-	/** number of packets of tile part */
-	int tp_numpacks;
+    /** start position of tile part */
+    int tp_start_pos;
+    /** end position of tile part header */
+    int tp_end_header;
+    /** end position of tile part */
+    int tp_end_pos;
+    /** start packet of tile part */
+    int tp_start_pack;
+    /** number of packets of tile part */
+    int tp_numpacks;
 } opj_tp_info_t;
 
 /**
-Index structure : information regarding tiles 
+Index structure : information regarding tiles
 */
 typedef struct opj_tile_info {
-	/** value of thresh for each layer by tile cfr. Marcela   */
-	double *thresh;
-	/** number of tile */
-	int tileno;
-	/** start position */
-	int start_pos;
-	/** end position of the header */
-	int end_header;
-	/** end position */
-	int end_pos;
-	/** precinct number for each resolution level (width) */
-	int pw[33];
-	/** precinct number for each resolution level (height) */
-	int ph[33];
-	/** precinct size (in power of 2), in X for each resolution level */
-	int pdx[33];
-	/** precinct size (in power of 2), in Y for each resolution level */
-	int pdy[33];
-	/** information concerning packets inside tile */
-	opj_packet_info_t *packet;
-	/** add fixed_quality */
-	int numpix;
-	/** add fixed_quality */
-	double distotile;
-  	/** number of markers */
-	int marknum;
-	/** list of markers */
-	opj_marker_info_t *marker;
-	/** actual size of markers array */
-	int maxmarknum;
-	/** number of tile parts */
-	int num_tps;
-	/** information concerning tile parts */
-	opj_tp_info_t *tp;
+    /** value of thresh for each layer by tile cfr. Marcela   */
+    double *thresh;
+    /** number of tile */
+    int tileno;
+    /** start position */
+    int start_pos;
+    /** end position of the header */
+    int end_header;
+    /** end position */
+    int end_pos;
+    /** precinct number for each resolution level (width) */
+    int pw[33];
+    /** precinct number for each resolution level (height) */
+    int ph[33];
+    /** precinct size (in power of 2), in X for each resolution level */
+    int pdx[33];
+    /** precinct size (in power of 2), in Y for each resolution level */
+    int pdy[33];
+    /** information concerning packets inside tile */
+    opj_packet_info_t *packet;
+    /** add fixed_quality */
+    int numpix;
+    /** add fixed_quality */
+    double distotile;
+    /** number of markers */
+    int marknum;
+    /** list of markers */
+    opj_marker_info_t *marker;
+    /** actual size of markers array */
+    int maxmarknum;
+    /** number of tile parts */
+    int num_tps;
+    /** information concerning tile parts */
+    opj_tp_info_t *tp;
 } opj_tile_info_t;
 
 /**
 Index structure of the codestream
 */
 typedef struct opj_codestream_info {
-	/** maximum distortion reduction on the whole image (add for Marcela) */
-	double D_max;
-	/** packet number */
-	int packno;
-	/** writing the packet in the index with t2_encode_packets */
-	int index_write;
-	/** image width */
-	int image_w;
-	/** image height */
-	int image_h;
-	/** progression order */
-	OPJ_PROG_ORDER prog;
-	/** tile size in x */
-	int tile_x;
-	/** tile size in y */
-	int tile_y;
-	/** */
-	int tile_Ox;
-	/** */
-	int tile_Oy;
-	/** number of tiles in X */
-	int tw;
-	/** number of tiles in Y */
-	int th;
-	/** component numbers */
-	int numcomps;
-	/** number of layer */
-	int numlayers;
-	/** number of decomposition for each component */
-	int *numdecompos;
-/* UniPG>> */
-	/** number of markers */
-	int marknum;
-	/** list of markers */
-	opj_marker_info_t *marker;
-	/** actual size of markers array */
-	int maxmarknum;
-/* <<UniPG */
-	/** main header position */
-	int main_head_start;
-	/** main header position */
-	int main_head_end;
-	/** codestream's size */
-	int codestream_size;
-	/** information regarding tiles inside image */
-	opj_tile_info_t *tile;
+    /** maximum distortion reduction on the whole image (add for Marcela) */
+    double D_max;
+    /** packet number */
+    int packno;
+    /** writing the packet in the index with t2_encode_packets */
+    int index_write;
+    /** image width */
+    int image_w;
+    /** image height */
+    int image_h;
+    /** progression order */
+    OPJ_PROG_ORDER prog;
+    /** tile size in x */
+    int tile_x;
+    /** tile size in y */
+    int tile_y;
+    /** */
+    int tile_Ox;
+    /** */
+    int tile_Oy;
+    /** number of tiles in X */
+    int tw;
+    /** number of tiles in Y */
+    int th;
+    /** component numbers */
+    int numcomps;
+    /** number of layer */
+    int numlayers;
+    /** number of decomposition for each component */
+    int *numdecompos;
+    /* UniPG>> */
+    /** number of markers */
+    int marknum;
+    /** list of markers */
+    opj_marker_info_t *marker;
+    /** actual size of markers array */
+    int maxmarknum;
+    /* <<UniPG */
+    /** main header position */
+    int main_head_start;
+    /** main header position */
+    int main_head_end;
+    /** codestream's size */
+    int codestream_size;
+    /** information regarding tiles inside image */
+    opj_tile_info_t *tile;
 } opj_codestream_info_t;
 
 #ifdef __cplusplus
@@ -733,7 +733,7 @@ extern "C" {
 #endif
 
 
-/* 
+/*
 ==========================================================
    openjpeg version
 ==========================================================
@@ -741,7 +741,7 @@ extern "C" {
 
 OPJ_API const char * OPJ_CALLCONV opj_version(void);
 
-/* 
+/*
 ==========================================================
    image functions definitions
 ==========================================================
@@ -762,18 +762,18 @@ Deallocate any resources associated with an image
 */
 OPJ_API void OPJ_CALLCONV opj_image_destroy(opj_image_t *image);
 
-/* 
+/*
 ==========================================================
    stream functions definitions
 ==========================================================
 */
 
 /**
-Open and allocate a memory stream for read / write. 
-On reading, the user must provide a buffer containing encoded data. The buffer will be 
-wrapped by the returned CIO handle. 
-On writing, buffer parameters must be set to 0: a buffer will be allocated by the library 
-to contain encoded data. 
+Open and allocate a memory stream for read / write.
+On reading, the user must provide a buffer containing encoded data. The buffer will be
+wrapped by the returned CIO handle.
+On writing, buffer parameters must be set to 0: a buffer will be allocated by the library
+to contain encoded data.
 @param cinfo Codec context info
 @param buffer Reading: buffer address. Writing: NULL
 @param length Reading: buffer length. Writing: 0
@@ -800,7 +800,7 @@ Set position in byte stream
 */
 OPJ_API void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos);
 
-/* 
+/*
 ==========================================================
    event manager functions definitions
 ==========================================================
@@ -808,7 +808,7 @@ OPJ_API void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos);
 
 OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context);
 
-/* 
+/*
 ==========================================================
    codec functions definitions
 ==========================================================
@@ -831,13 +831,13 @@ Set decoding parameters to default values
 OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters);
 /**
 Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in j2k->cp. 
+Decoding parameters are returned in j2k->cp.
 @param dinfo decompressor handle
 @param parameters decompression parameters
 */
 OPJ_API void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters);
 /**
-Decode an image from a JPEG-2000 codestream 
+Decode an image from a JPEG-2000 codestream
 @param dinfo decompressor handle
 @param cio Input buffer stream
 @return Returns a decoded image if successful, returns NULL otherwise
@@ -864,7 +864,7 @@ Destroy a compressor handle
 */
 OPJ_API void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo);
 /**
-Set encoding parameters to default values, that means : 
+Set encoding parameters to default values, that means :
 <ul>
 <li>Lossless
 <li>1 tile
@@ -886,7 +886,7 @@ Set encoding parameters to default values, that means :
 */
 OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters);
 /**
-Setup the encoder parameters using the current image and using user parameters. 
+Setup the encoder parameters using the current image and using user parameters.
 @param cinfo Compressor handle
 @param parameters Compression parameters
 @param image Input filled image
diff --git a/src/lib/openmj2/opj_includes.h b/src/lib/openmj2/opj_includes.h
index 018bba21..226ac521 100644
--- a/src/lib/openmj2/opj_includes.h
+++ b/src/lib/openmj2/opj_includes.h
@@ -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.
  *
@@ -61,49 +61,50 @@
 
 /* Ignore GCC attributes if this is not GCC */
 #ifndef __GNUC__
-	#define __attribute__(x) /* __attribute__(x) */
+#define __attribute__(x) /* __attribute__(x) */
 #endif
 
 /*
-The inline keyword is supported by C99 but not by C90. 
-Most compilers implement their own version of this keyword ... 
+The inline keyword is supported by C99 but not by C90.
+Most compilers implement their own version of this keyword ...
 */
 #ifndef INLINE
-	#if defined(_MSC_VER)
-		#define INLINE __forceinline
-	#elif defined(__GNUC__)
-		#define INLINE __inline__
-	#elif defined(__MWERKS__)
-		#define INLINE inline
-	#else 
-		/* add other compilers here ... */
-		#define INLINE 
-	#endif /* defined(<Compiler>) */
+#if defined(_MSC_VER)
+#define INLINE __forceinline
+#elif defined(__GNUC__)
+#define INLINE __inline__
+#elif defined(__MWERKS__)
+#define INLINE inline
+#else
+/* add other compilers here ... */
+#define INLINE
+#endif /* defined(<Compiler>) */
 #endif /* INLINE */
 
 /* Are restricted pointers available? (C99) */
 #if (__STDC_VERSION__ != 199901L)
-	/* Not a C99 compiler */
-	#ifdef __GNUC__
-		#define restrict __restrict__
-	#else
-		#define restrict /* restrict */
-	#endif
+/* Not a C99 compiler */
+#ifdef __GNUC__
+#define restrict __restrict__
+#else
+#define restrict /* restrict */
+#endif
 #endif
 
 /* MSVC and Borland C do not have lrintf */
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-static INLINE long lrintf(float f){
+static INLINE long lrintf(float f)
+{
 #ifdef _M_X64
     return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
 #else
     int i;
- 
+
     _asm{
         fld f
         fistp i
     };
- 
+
     return i;
 #endif
 }
diff --git a/src/lib/openmj2/opj_malloc.h b/src/lib/openmj2/opj_malloc.h
index 1b62ab02..36f7f2d8 100644
--- a/src/lib/openmj2/opj_malloc.h
+++ b/src/lib/openmj2/opj_malloc.h
@@ -1,165 +1,166 @@
-/*

- * Copyright (c) 2005, Herve Drolon, FreeImage Team

- * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-#ifndef __OPJ_MALLOC_H

-#define __OPJ_MALLOC_H

-/**

-@file opj_malloc.h

-@brief Internal functions

-

-The functions in opj_malloc.h are internal utilities used for memory management.

-*/

-

-/** @defgroup MISC MISC - Miscellaneous internal functions */

-/*@{*/

-

-/** @name Exported functions */

-/*@{*/

-/* ----------------------------------------------------------------------- */

-

-/**

-Allocate an uninitialized memory block

-@param size Bytes to allocate

-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available

-*/

-#ifdef ALLOC_PERF_OPT

-void * OPJ_CALLCONV opj_malloc(size_t size);

-#else

-#define opj_malloc(size) malloc(size)

-#endif

-

-/**

-Allocate a memory block with elements initialized to 0

-@param num Blocks to allocate

-@param size Bytes per block to allocate

-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available

-*/

-#ifdef ALLOC_PERF_OPT

-void * OPJ_CALLCONV opj_calloc(size_t _NumOfElements, size_t _SizeOfElements);

-#else

-#define opj_calloc(num, size) calloc(num, size)

-#endif

-

-/**

-Allocate memory aligned to a 16 byte boundary

-@param size Bytes to allocate

-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available

-*/

-/* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */

-#ifdef _WIN32

-	/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */

-	#ifdef __GNUC__

-		#include <mm_malloc.h>

-		#define HAVE_MM_MALLOC

-	#else /* MSVC, Intel C++ */

-		#include <malloc.h>

-		#ifdef _mm_malloc

-			#define HAVE_MM_MALLOC

-		#endif

-	#endif

-#else /* Not _WIN32 */

-	#if defined(__sun)

-		#define HAVE_MEMALIGN

-  #elif defined(__FreeBSD__)

-    #define HAVE_POSIX_MEMALIGN

-	/* Linux x86_64 and OSX always align allocations to 16 bytes */

-	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)

-		#define HAVE_MEMALIGN

-		#include <malloc.h>			

-	#endif

-#endif

-

-#define opj_aligned_malloc(size) malloc(size)

-#define opj_aligned_free(m) free(m)

-

-#ifdef HAVE_MM_MALLOC

-	#undef opj_aligned_malloc

-	#define opj_aligned_malloc(size) _mm_malloc(size, 16)

-	#undef opj_aligned_free

-	#define opj_aligned_free(m) _mm_free(m)

-#endif

-

-#ifdef HAVE_MEMALIGN

-	extern void* memalign(size_t, size_t);

-	#undef opj_aligned_malloc

-	#define opj_aligned_malloc(size) memalign(16, (size))

-	#undef opj_aligned_free

-	#define opj_aligned_free(m) free(m)

-#endif

-

-#ifdef HAVE_POSIX_MEMALIGN

-	#undef opj_aligned_malloc

-	extern int posix_memalign(void**, size_t, size_t);

-

-	static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){

-		void* mem = NULL;

-		posix_memalign(&mem, 16, size);

-		return mem;

-	}

-	#undef opj_aligned_free

-	#define opj_aligned_free(m) free(m)

-#endif

-

-#ifdef ALLOC_PERF_OPT

-	#undef opj_aligned_malloc

-	#define opj_aligned_malloc(size) opj_malloc(size)

-	#undef opj_aligned_free

-	#define opj_aligned_free(m) opj_free(m)

-#endif

-

-/**

-Reallocate memory blocks.

-@param m Pointer to previously allocated memory block

-@param s New size in bytes

-@return Returns a void pointer to the reallocated (and possibly moved) memory block

-*/

-#ifdef ALLOC_PERF_OPT

-void * OPJ_CALLCONV opj_realloc(void * m, size_t s);

-#else

-#define opj_realloc(m, s) realloc(m, s)

-#endif

-

-/**

-Deallocates or frees a memory block.

-@param m Previously allocated memory block to be freed

-*/

-#ifdef ALLOC_PERF_OPT

-void OPJ_CALLCONV opj_free(void * m);

-#else

-#define opj_free(m) free(m)

-#endif

-

-#ifdef __GNUC__

-#pragma GCC poison malloc calloc realloc free

-#endif

-

-/* ----------------------------------------------------------------------- */

-/*@}*/

-

-/*@}*/

-

-#endif /* __OPJ_MALLOC_H */

-

+/*
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __OPJ_MALLOC_H
+#define __OPJ_MALLOC_H
+/**
+@file opj_malloc.h
+@brief Internal functions
+
+The functions in opj_malloc.h are internal utilities used for memory management.
+*/
+
+/** @defgroup MISC MISC - Miscellaneous internal functions */
+/*@{*/
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+
+/**
+Allocate an uninitialized memory block
+@param size Bytes to allocate
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+*/
+#ifdef ALLOC_PERF_OPT
+void * OPJ_CALLCONV opj_malloc(size_t size);
+#else
+#define opj_malloc(size) malloc(size)
+#endif
+
+/**
+Allocate a memory block with elements initialized to 0
+@param num Blocks to allocate
+@param size Bytes per block to allocate
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+*/
+#ifdef ALLOC_PERF_OPT
+void * OPJ_CALLCONV opj_calloc(size_t _NumOfElements, size_t _SizeOfElements);
+#else
+#define opj_calloc(num, size) calloc(num, size)
+#endif
+
+/**
+Allocate memory aligned to a 16 byte boundary
+@param size Bytes to allocate
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+*/
+/* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
+#ifdef _WIN32
+/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
+#ifdef __GNUC__
+#include <mm_malloc.h>
+#define HAVE_MM_MALLOC
+#else /* MSVC, Intel C++ */
+#include <malloc.h>
+#ifdef _mm_malloc
+#define HAVE_MM_MALLOC
+#endif
+#endif
+#else /* Not _WIN32 */
+#if defined(__sun)
+#define HAVE_MEMALIGN
+#elif defined(__FreeBSD__)
+#define HAVE_POSIX_MEMALIGN
+/* Linux x86_64 and OSX always align allocations to 16 bytes */
+#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
+#define HAVE_MEMALIGN
+#include <malloc.h>
+#endif
+#endif
+
+#define opj_aligned_malloc(size) malloc(size)
+#define opj_aligned_free(m) free(m)
+
+#ifdef HAVE_MM_MALLOC
+#undef opj_aligned_malloc
+#define opj_aligned_malloc(size) _mm_malloc(size, 16)
+#undef opj_aligned_free
+#define opj_aligned_free(m) _mm_free(m)
+#endif
+
+#ifdef HAVE_MEMALIGN
+extern void* memalign(size_t, size_t);
+#undef opj_aligned_malloc
+#define opj_aligned_malloc(size) memalign(16, (size))
+#undef opj_aligned_free
+#define opj_aligned_free(m) free(m)
+#endif
+
+#ifdef HAVE_POSIX_MEMALIGN
+#undef opj_aligned_malloc
+extern int posix_memalign(void**, size_t, size_t);
+
+static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size)
+{
+    void* mem = NULL;
+    posix_memalign(&mem, 16, size);
+    return mem;
+}
+#undef opj_aligned_free
+#define opj_aligned_free(m) free(m)
+#endif
+
+#ifdef ALLOC_PERF_OPT
+#undef opj_aligned_malloc
+#define opj_aligned_malloc(size) opj_malloc(size)
+#undef opj_aligned_free
+#define opj_aligned_free(m) opj_free(m)
+#endif
+
+/**
+Reallocate memory blocks.
+@param m Pointer to previously allocated memory block
+@param s New size in bytes
+@return Returns a void pointer to the reallocated (and possibly moved) memory block
+*/
+#ifdef ALLOC_PERF_OPT
+void * OPJ_CALLCONV opj_realloc(void * m, size_t s);
+#else
+#define opj_realloc(m, s) realloc(m, s)
+#endif
+
+/**
+Deallocates or frees a memory block.
+@param m Previously allocated memory block to be freed
+*/
+#ifdef ALLOC_PERF_OPT
+void OPJ_CALLCONV opj_free(void * m);
+#else
+#define opj_free(m) free(m)
+#endif
+
+#ifdef __GNUC__
+#pragma GCC poison malloc calloc realloc free
+#endif
+
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __OPJ_MALLOC_H */
+
diff --git a/src/lib/openmj2/pi.c b/src/lib/openmj2/pi.c
index a22078bb..4c616fd9 100644
--- a/src/lib/openmj2/pi.c
+++ b/src/lib/openmj2/pi.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2006-2007, Parvatha Elangovan
@@ -47,31 +47,31 @@
 /**
 Get next packet in layer-resolution-component-precinct order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi);
 /**
 Get next packet in resolution-layer-component-precinct order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi);
 /**
 Get next packet in resolution-precinct-component-layer order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi);
 /**
 Get next packet in precinct-component-resolution-layer order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi);
 /**
 Get next packet in component-precinct-resolution-layer order.
 @param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
+@return returns false if pi pointed to the last packet or else returns true
 */
 static opj_bool pi_next_cprl(opj_pi_iterator_t * pi);
 
@@ -79,891 +79,913 @@ static opj_bool pi_next_cprl(opj_pi_iterator_t * pi);
 
 /*@}*/
 
-/* 
+/*
 ==========================================================
    local functions
 ==========================================================
 */
 
-static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-	
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		res = &comp->resolutions[pi->resno];
-		goto LABEL_SKIP;
-	} else {
-		pi->first = 0;
-	}
-
-	for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-		for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1;
-		pi->resno++) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				if (pi->resno >= comp->numresolutions) {
-					continue;
-				}
-				res = &comp->resolutions[pi->resno];
-				if (!pi->tp_on){
-					pi->poc.precno1 = res->pw * res->ph;
-				}
-				for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
-					index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-					if (!pi->include[index]) {
-						pi->include[index] = 1;
-						return OPJ_TRUE;
-					}
-LABEL_SKIP:;
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
+static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        comp = &pi->comps[pi->compno];
+        res = &comp->resolutions[pi->resno];
+        goto LABEL_SKIP;
+    } else {
+        pi->first = 0;
+    }
+
+    for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+        for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1;
+                pi->resno++) {
+            for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+                comp = &pi->comps[pi->compno];
+                if (pi->resno >= comp->numresolutions) {
+                    continue;
+                }
+                res = &comp->resolutions[pi->resno];
+                if (!pi->tp_on) {
+                    pi->poc.precno1 = res->pw * res->ph;
+                }
+                for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
+                    index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+                    if (!pi->include[index]) {
+                        pi->include[index] = 1;
+                        return OPJ_TRUE;
+                    }
+LABEL_SKIP:
+                    ;
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		res = &comp->resolutions[pi->resno];
-		goto LABEL_SKIP;
-	} else {
-		pi->first = 0;
-	}
-
-	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-		for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				if (pi->resno >= comp->numresolutions) {
-					continue;
-				}
-				res = &comp->resolutions[pi->resno];
-				if(!pi->tp_on){
-					pi->poc.precno1 = res->pw * res->ph;
-				}
-				for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
-					index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-					if (!pi->include[index]) {
-						pi->include[index] = 1;
-						return OPJ_TRUE;
-					}
-LABEL_SKIP:;
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
+static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        comp = &pi->comps[pi->compno];
+        res = &comp->resolutions[pi->resno];
+        goto LABEL_SKIP;
+    } else {
+        pi->first = 0;
+    }
+
+    for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
+        for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+            for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+                comp = &pi->comps[pi->compno];
+                if (pi->resno >= comp->numresolutions) {
+                    continue;
+                }
+                res = &comp->resolutions[pi->resno];
+                if(!pi->tp_on) {
+                    pi->poc.precno1 = res->pw * res->ph;
+                }
+                for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
+                    index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+                    if (!pi->include[index]) {
+                        pi->include[index] = 1;
+                        return OPJ_TRUE;
+                    }
+LABEL_SKIP:
+                    ;
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-
-	if (!pi->first) {
-		goto LABEL_SKIP;
-	} else {
-		int compno, resno;
-		pi->first = 0;
-		pi->dx = 0;
-		pi->dy = 0;
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			comp = &pi->comps[compno];
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int dx, dy;
-				res = &comp->resolutions[resno];
-				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-				pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-				pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-			}
-		}
-	}
-if (!pi->tp_on){
-			pi->poc.ty0 = pi->ty0;
-			pi->poc.tx0 = pi->tx0;
-			pi->poc.ty1 = pi->ty1;
-			pi->poc.tx1 = pi->tx1;
-		}
-	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-		for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-			for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-				for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-					int levelno;
-					int trx0, try0;
-					int trx1, try1;
-					int rpx, rpy;
-					int prci, prcj;
-					comp = &pi->comps[pi->compno];
-					if (pi->resno >= comp->numresolutions) {
-						continue;
-					}
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-						continue;	
-					}
-					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-						continue; 
-					}
-					
-					if ((res->pw==0)||(res->ph==0)) continue;
-					
-					if ((trx0==trx1)||(try0==try1)) continue;
-					
-					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-						 - int_floordivpow2(trx0, res->pdx);
-					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-						 - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-						if (!pi->include[index]) {
-							pi->include[index] = 1;
-							return OPJ_TRUE;
-						}
-LABEL_SKIP:;
-					}
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
+static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        goto LABEL_SKIP;
+    } else {
+        int compno, resno;
+        pi->first = 0;
+        pi->dx = 0;
+        pi->dy = 0;
+        for (compno = 0; compno < pi->numcomps; compno++) {
+            comp = &pi->comps[compno];
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int dx, dy;
+                res = &comp->resolutions[resno];
+                dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+                dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+                pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+                pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+            }
+        }
+    }
+    if (!pi->tp_on) {
+        pi->poc.ty0 = pi->ty0;
+        pi->poc.tx0 = pi->tx0;
+        pi->poc.ty1 = pi->ty1;
+        pi->poc.tx1 = pi->tx1;
+    }
+    for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
+        for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+            for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
+                for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+                    int levelno;
+                    int trx0, try0;
+                    int trx1, try1;
+                    int rpx, rpy;
+                    int prci, prcj;
+                    comp = &pi->comps[pi->compno];
+                    if (pi->resno >= comp->numresolutions) {
+                        continue;
+                    }
+                    res = &comp->resolutions[pi->resno];
+                    levelno = comp->numresolutions - 1 - pi->resno;
+                    trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+                    try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+                    trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+                    try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+                    rpx = res->pdx + levelno;
+                    rpy = res->pdy + levelno;
+                    if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))) {
+                        continue;
+                    }
+                    if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))) {
+                        continue;
+                    }
+
+                    if ((res->pw==0)||(res->ph==0)) continue;
+
+                    if ((trx0==trx1)||(try0==try1)) continue;
+
+                    prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx)
+                           - int_floordivpow2(trx0, res->pdx);
+                    prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy)
+                           - int_floordivpow2(try0, res->pdy);
+                    pi->precno = prci + prcj * res->pw;
+                    for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+                        index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+                        if (!pi->include[index]) {
+                            pi->include[index] = 1;
+                            return OPJ_TRUE;
+                        }
+LABEL_SKIP:
+                        ;
+                    }
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		goto LABEL_SKIP;
-	} else {
-		int compno, resno;
-		pi->first = 0;
-		pi->dx = 0;
-		pi->dy = 0;
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			comp = &pi->comps[compno];
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int dx, dy;
-				res = &comp->resolutions[resno];
-				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-				pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-				pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-			}
-		}
-	}
-	if (!pi->tp_on){
-			pi->poc.ty0 = pi->ty0;
-			pi->poc.tx0 = pi->tx0;
-			pi->poc.ty1 = pi->ty1;
-			pi->poc.tx1 = pi->tx1;
-		}
-	for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-		for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
-					int levelno;
-					int trx0, try0;
-					int trx1, try1;
-					int rpx, rpy;
-					int prci, prcj;
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-						continue;	
-					}
-					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-						continue; 
-					}
-					
-					if ((res->pw==0)||(res->ph==0)) continue;
-					
-					if ((trx0==trx1)||(try0==try1)) continue;
-					
-					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-						 - int_floordivpow2(trx0, res->pdx);
-					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-						 - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-						if (!pi->include[index]) {
-							pi->include[index] = 1;
-							return OPJ_TRUE;
-						}	
-LABEL_SKIP:;
-					}
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
+static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        comp = &pi->comps[pi->compno];
+        goto LABEL_SKIP;
+    } else {
+        int compno, resno;
+        pi->first = 0;
+        pi->dx = 0;
+        pi->dy = 0;
+        for (compno = 0; compno < pi->numcomps; compno++) {
+            comp = &pi->comps[compno];
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int dx, dy;
+                res = &comp->resolutions[resno];
+                dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+                dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+                pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+                pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+            }
+        }
+    }
+    if (!pi->tp_on) {
+        pi->poc.ty0 = pi->ty0;
+        pi->poc.tx0 = pi->tx0;
+        pi->poc.ty1 = pi->ty1;
+        pi->poc.tx1 = pi->tx1;
+    }
+    for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+        for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
+            for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+                comp = &pi->comps[pi->compno];
+                for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
+                    int levelno;
+                    int trx0, try0;
+                    int trx1, try1;
+                    int rpx, rpy;
+                    int prci, prcj;
+                    res = &comp->resolutions[pi->resno];
+                    levelno = comp->numresolutions - 1 - pi->resno;
+                    trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+                    try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+                    trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+                    try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+                    rpx = res->pdx + levelno;
+                    rpy = res->pdy + levelno;
+                    if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))) {
+                        continue;
+                    }
+                    if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))) {
+                        continue;
+                    }
+
+                    if ((res->pw==0)||(res->ph==0)) continue;
+
+                    if ((trx0==trx1)||(try0==try1)) continue;
+
+                    prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx)
+                           - int_floordivpow2(trx0, res->pdx);
+                    prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy)
+                           - int_floordivpow2(try0, res->pdy);
+                    pi->precno = prci + prcj * res->pw;
+                    for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+                        index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+                        if (!pi->include[index]) {
+                            pi->include[index] = 1;
+                            return OPJ_TRUE;
+                        }
+LABEL_SKIP:
+                        ;
+                    }
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-static opj_bool pi_next_cprl(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		goto LABEL_SKIP;
-	} else {
-		pi->first = 0;
-	}
-
-	for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-		int resno;
-		comp = &pi->comps[pi->compno];
-		pi->dx = 0;
-		pi->dy = 0;
-		for (resno = 0; resno < comp->numresolutions; resno++) {
-			int dx, dy;
-			res = &comp->resolutions[resno];
-			dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-			dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-			pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-			pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-		}
-		if (!pi->tp_on){
-			pi->poc.ty0 = pi->ty0;
-			pi->poc.tx0 = pi->tx0;
-			pi->poc.ty1 = pi->ty1;
-			pi->poc.tx1 = pi->tx1;
-		}
-		for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-			for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
-					int levelno;
-					int trx0, try0;
-					int trx1, try1;
-					int rpx, rpy;
-					int prci, prcj;
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-						continue;	
-					}
-					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-						continue; 
-					}
-					
-					if ((res->pw==0)||(res->ph==0)) continue;
-					
-					if ((trx0==trx1)||(try0==try1)) continue;
-					
-					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-						 - int_floordivpow2(trx0, res->pdx);
-					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-						 - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-						if (!pi->include[index]) {
-							pi->include[index] = 1;
-							return OPJ_TRUE;
-						}
-LABEL_SKIP:;
-					}
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
+static opj_bool pi_next_cprl(opj_pi_iterator_t * pi)
+{
+    opj_pi_comp_t *comp = NULL;
+    opj_pi_resolution_t *res = NULL;
+    long index = 0;
+
+    if (!pi->first) {
+        comp = &pi->comps[pi->compno];
+        goto LABEL_SKIP;
+    } else {
+        pi->first = 0;
+    }
+
+    for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+        int resno;
+        comp = &pi->comps[pi->compno];
+        pi->dx = 0;
+        pi->dy = 0;
+        for (resno = 0; resno < comp->numresolutions; resno++) {
+            int dx, dy;
+            res = &comp->resolutions[resno];
+            dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+            dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+            pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+            pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+        }
+        if (!pi->tp_on) {
+            pi->poc.ty0 = pi->ty0;
+            pi->poc.tx0 = pi->tx0;
+            pi->poc.ty1 = pi->ty1;
+            pi->poc.tx1 = pi->tx1;
+        }
+        for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+            for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
+                for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
+                    int levelno;
+                    int trx0, try0;
+                    int trx1, try1;
+                    int rpx, rpy;
+                    int prci, prcj;
+                    res = &comp->resolutions[pi->resno];
+                    levelno = comp->numresolutions - 1 - pi->resno;
+                    trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+                    try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+                    trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+                    try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+                    rpx = res->pdx + levelno;
+                    rpy = res->pdy + levelno;
+                    if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))) {
+                        continue;
+                    }
+                    if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))) {
+                        continue;
+                    }
+
+                    if ((res->pw==0)||(res->ph==0)) continue;
+
+                    if ((trx0==trx1)||(try0==try1)) continue;
+
+                    prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx)
+                           - int_floordivpow2(trx0, res->pdx);
+                    prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy)
+                           - int_floordivpow2(try0, res->pdy);
+                    pi->precno = prci + prcj * res->pw;
+                    for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+                        index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+                        if (!pi->include[index]) {
+                            pi->include[index] = 1;
+                            return OPJ_TRUE;
+                        }
+LABEL_SKIP:
+                        ;
+                    }
+                }
+            }
+        }
+    }
+
+    return OPJ_FALSE;
 }
 
-/* 
+/*
 ==========================================================
    Packet iterator interface
 ==========================================================
 */
 
-opj_pi_iterator_t *pi_create_decode(opj_image_t *image, opj_cp_t *cp, int tileno) {
-	int p, q;
-	int compno, resno, pino;
-	opj_pi_iterator_t *pi = NULL;
-	opj_tcp_t *tcp = NULL;
-	opj_tccp_t *tccp = NULL;
-
-	tcp = &cp->tcps[tileno];
-
-	pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
-	if(!pi) {
-		/* TODO: throw an error */
-		return NULL;
-	}
-
-	for (pino = 0; pino < tcp->numpocs + 1; pino++) {	/* change */
-		int maxres = 0;
-		int maxprec = 0;
-		p = tileno % cp->tw;
-		q = tileno / cp->tw;
-
-		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-		pi[pino].numcomps = image->numcomps;
-
-		pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
-		if(!pi[pino].comps) {
-			/* TODO: throw an error */
-			pi_destroy(pi, cp, tileno);
-			return NULL;
-		}
-		
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			int tcx0, tcy0, tcx1, tcy1;
-			opj_pi_comp_t *comp = &pi[pino].comps[compno];
-			tccp = &tcp->tccps[compno];
-			comp->dx = image->comps[compno].dx;
-			comp->dy = image->comps[compno].dy;
-			comp->numresolutions = tccp->numresolutions;
-
-			comp->resolutions = (opj_pi_resolution_t*) opj_calloc(comp->numresolutions, sizeof(opj_pi_resolution_t));
-			if(!comp->resolutions) {
-				/* TODO: throw an error */
-				pi_destroy(pi, cp, tileno);
-				return NULL;
-			}
-
-			tcx0 = int_ceildiv(pi->tx0, comp->dx);
-			tcy0 = int_ceildiv(pi->ty0, comp->dy);
-			tcx1 = int_ceildiv(pi->tx1, comp->dx);
-			tcy1 = int_ceildiv(pi->ty1, comp->dy);
-			if (comp->numresolutions > maxres) {
-				maxres = comp->numresolutions;
-			}
-
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int levelno;
-				int rx0, ry0, rx1, ry1;
-				int px0, py0, px1, py1;
-				opj_pi_resolution_t *res = &comp->resolutions[resno];
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					res->pdx = tccp->prcw[resno];
-					res->pdy = tccp->prch[resno];
-				} else {
-					res->pdx = 15;
-					res->pdy = 15;
-				}
-				levelno = comp->numresolutions - 1 - resno;
-				rx0 = int_ceildivpow2(tcx0, levelno);
-				ry0 = int_ceildivpow2(tcy0, levelno);
-				rx1 = int_ceildivpow2(tcx1, levelno);
-				ry1 = int_ceildivpow2(tcy1, levelno);
-				px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
-				py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
-				px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
-				py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
-				res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
-				res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
-				
-				if (res->pw*res->ph > maxprec) {
-					maxprec = res->pw*res->ph;
-				}
-				
-			}
-		}
-		
-		tccp = &tcp->tccps[0];
-		pi[pino].step_p = 1;
-		pi[pino].step_c = maxprec * pi[pino].step_p;
-		pi[pino].step_r = image->numcomps * pi[pino].step_c;
-		pi[pino].step_l = maxres * pi[pino].step_r;
-		
-		if (pino == 0) {
-			pi[pino].include = (short int*) opj_calloc(image->numcomps * maxres * tcp->numlayers * maxprec, sizeof(short int));
-			if(!pi[pino].include) {
-				/* TODO: throw an error */
-				pi_destroy(pi, cp, tileno);
-				return NULL;
-			}
-		}
-		else {
-			pi[pino].include = pi[pino - 1].include;
-		}
-		
-		if (tcp->POC == 0) {
-			pi[pino].first = 1;
-			pi[pino].poc.resno0 = 0;
-			pi[pino].poc.compno0 = 0;
-			pi[pino].poc.layno1 = tcp->numlayers;
-			pi[pino].poc.resno1 = maxres;
-			pi[pino].poc.compno1 = image->numcomps;
-			pi[pino].poc.prg = tcp->prg;
-		} else {
-			pi[pino].first = 1;
-			pi[pino].poc.resno0 = tcp->pocs[pino].resno0;
-			pi[pino].poc.compno0 = tcp->pocs[pino].compno0;
-			pi[pino].poc.layno1 = tcp->pocs[pino].layno1;
-			pi[pino].poc.resno1 = tcp->pocs[pino].resno1;
-			pi[pino].poc.compno1 = tcp->pocs[pino].compno1;
-			pi[pino].poc.prg = tcp->pocs[pino].prg;
-		}
-		pi[pino].poc.layno0  = 0;
-		pi[pino].poc.precno0 = 0; 
-		pi[pino].poc.precno1 = maxprec;
-			
-	}
-	
-	return pi;
+opj_pi_iterator_t *pi_create_decode(opj_image_t *image, opj_cp_t *cp, int tileno)
+{
+    int p, q;
+    int compno, resno, pino;
+    opj_pi_iterator_t *pi = NULL;
+    opj_tcp_t *tcp = NULL;
+    opj_tccp_t *tccp = NULL;
+
+    tcp = &cp->tcps[tileno];
+
+    pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
+    if(!pi) {
+        /* TODO: throw an error */
+        return NULL;
+    }
+
+    for (pino = 0; pino < tcp->numpocs + 1; pino++) {	/* change */
+        int maxres = 0;
+        int maxprec = 0;
+        p = tileno % cp->tw;
+        q = tileno / cp->tw;
+
+        pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+        pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+        pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+        pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+        pi[pino].numcomps = image->numcomps;
+
+        pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
+        if(!pi[pino].comps) {
+            /* TODO: throw an error */
+            pi_destroy(pi, cp, tileno);
+            return NULL;
+        }
+
+        for (compno = 0; compno < pi->numcomps; compno++) {
+            int tcx0, tcy0, tcx1, tcy1;
+            opj_pi_comp_t *comp = &pi[pino].comps[compno];
+            tccp = &tcp->tccps[compno];
+            comp->dx = image->comps[compno].dx;
+            comp->dy = image->comps[compno].dy;
+            comp->numresolutions = tccp->numresolutions;
+
+            comp->resolutions = (opj_pi_resolution_t*) opj_calloc(comp->numresolutions, sizeof(opj_pi_resolution_t));
+            if(!comp->resolutions) {
+                /* TODO: throw an error */
+                pi_destroy(pi, cp, tileno);
+                return NULL;
+            }
+
+            tcx0 = int_ceildiv(pi->tx0, comp->dx);
+            tcy0 = int_ceildiv(pi->ty0, comp->dy);
+            tcx1 = int_ceildiv(pi->tx1, comp->dx);
+            tcy1 = int_ceildiv(pi->ty1, comp->dy);
+            if (comp->numresolutions > maxres) {
+                maxres = comp->numresolutions;
+            }
+
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int levelno;
+                int rx0, ry0, rx1, ry1;
+                int px0, py0, px1, py1;
+                opj_pi_resolution_t *res = &comp->resolutions[resno];
+                if (tccp->csty & J2K_CCP_CSTY_PRT) {
+                    res->pdx = tccp->prcw[resno];
+                    res->pdy = tccp->prch[resno];
+                } else {
+                    res->pdx = 15;
+                    res->pdy = 15;
+                }
+                levelno = comp->numresolutions - 1 - resno;
+                rx0 = int_ceildivpow2(tcx0, levelno);
+                ry0 = int_ceildivpow2(tcy0, levelno);
+                rx1 = int_ceildivpow2(tcx1, levelno);
+                ry1 = int_ceildivpow2(tcy1, levelno);
+                px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
+                py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
+                px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
+                py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
+                res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
+                res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
+
+                if (res->pw*res->ph > maxprec) {
+                    maxprec = res->pw*res->ph;
+                }
+
+            }
+        }
+
+        tccp = &tcp->tccps[0];
+        pi[pino].step_p = 1;
+        pi[pino].step_c = maxprec * pi[pino].step_p;
+        pi[pino].step_r = image->numcomps * pi[pino].step_c;
+        pi[pino].step_l = maxres * pi[pino].step_r;
+
+        if (pino == 0) {
+            pi[pino].include = (short int*) opj_calloc(image->numcomps * maxres * tcp->numlayers * maxprec, sizeof(short int));
+            if(!pi[pino].include) {
+                /* TODO: throw an error */
+                pi_destroy(pi, cp, tileno);
+                return NULL;
+            }
+        } else {
+            pi[pino].include = pi[pino - 1].include;
+        }
+
+        if (tcp->POC == 0) {
+            pi[pino].first = 1;
+            pi[pino].poc.resno0 = 0;
+            pi[pino].poc.compno0 = 0;
+            pi[pino].poc.layno1 = tcp->numlayers;
+            pi[pino].poc.resno1 = maxres;
+            pi[pino].poc.compno1 = image->numcomps;
+            pi[pino].poc.prg = tcp->prg;
+        } else {
+            pi[pino].first = 1;
+            pi[pino].poc.resno0 = tcp->pocs[pino].resno0;
+            pi[pino].poc.compno0 = tcp->pocs[pino].compno0;
+            pi[pino].poc.layno1 = tcp->pocs[pino].layno1;
+            pi[pino].poc.resno1 = tcp->pocs[pino].resno1;
+            pi[pino].poc.compno1 = tcp->pocs[pino].compno1;
+            pi[pino].poc.prg = tcp->pocs[pino].prg;
+        }
+        pi[pino].poc.layno0  = 0;
+        pi[pino].poc.precno0 = 0;
+        pi[pino].poc.precno1 = maxprec;
+
+    }
+
+    return pi;
+}
+
+
+opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno, J2K_T2_MODE t2_mode)
+{
+    int p, q, pino;
+    int compno, resno;
+    int maxres = 0;
+    int maxprec = 0;
+    opj_pi_iterator_t *pi = NULL;
+    opj_tcp_t *tcp = NULL;
+    opj_tccp_t *tccp = NULL;
+
+    tcp = &cp->tcps[tileno];
+
+    pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
+    if(!pi) {
+        return NULL;
+    }
+    pi->tp_on = cp->tp_on;
+
+    for(pino = 0; pino < tcp->numpocs+1 ; pino ++) {
+        p = tileno % cp->tw;
+        q = tileno / cp->tw;
+
+        pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+        pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+        pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+        pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+        pi[pino].numcomps = image->numcomps;
+
+        pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
+        if(!pi[pino].comps) {
+            pi_destroy(pi, cp, tileno);
+            return NULL;
+        }
+
+        for (compno = 0; compno < pi[pino].numcomps; compno++) {
+            int tcx0, tcy0, tcx1, tcy1;
+            opj_pi_comp_t *comp = &pi[pino].comps[compno];
+            tccp = &tcp->tccps[compno];
+            comp->dx = image->comps[compno].dx;
+            comp->dy = image->comps[compno].dy;
+            comp->numresolutions = tccp->numresolutions;
+
+            comp->resolutions = (opj_pi_resolution_t*) opj_malloc(comp->numresolutions * sizeof(opj_pi_resolution_t));
+            if(!comp->resolutions) {
+                pi_destroy(pi, cp, tileno);
+                return NULL;
+            }
+
+            tcx0 = int_ceildiv(pi[pino].tx0, comp->dx);
+            tcy0 = int_ceildiv(pi[pino].ty0, comp->dy);
+            tcx1 = int_ceildiv(pi[pino].tx1, comp->dx);
+            tcy1 = int_ceildiv(pi[pino].ty1, comp->dy);
+            if (comp->numresolutions > maxres) {
+                maxres = comp->numresolutions;
+            }
+
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int levelno;
+                int rx0, ry0, rx1, ry1;
+                int px0, py0, px1, py1;
+                opj_pi_resolution_t *res = &comp->resolutions[resno];
+                if (tccp->csty & J2K_CCP_CSTY_PRT) {
+                    res->pdx = tccp->prcw[resno];
+                    res->pdy = tccp->prch[resno];
+                } else {
+                    res->pdx = 15;
+                    res->pdy = 15;
+                }
+                levelno = comp->numresolutions - 1 - resno;
+                rx0 = int_ceildivpow2(tcx0, levelno);
+                ry0 = int_ceildivpow2(tcy0, levelno);
+                rx1 = int_ceildivpow2(tcx1, levelno);
+                ry1 = int_ceildivpow2(tcy1, levelno);
+                px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
+                py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
+                px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
+                py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
+                res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
+                res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
+
+                if (res->pw*res->ph > maxprec) {
+                    maxprec = res->pw * res->ph;
+                }
+            }
+        }
+
+        tccp = &tcp->tccps[0];
+        pi[pino].step_p = 1;
+        pi[pino].step_c = maxprec * pi[pino].step_p;
+        pi[pino].step_r = image->numcomps * pi[pino].step_c;
+        pi[pino].step_l = maxres * pi[pino].step_r;
+
+        for (compno = 0; compno < pi->numcomps; compno++) {
+            opj_pi_comp_t *comp = &pi->comps[compno];
+            for (resno = 0; resno < comp->numresolutions; resno++) {
+                int dx, dy;
+                opj_pi_resolution_t *res = &comp->resolutions[resno];
+                dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+                dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+                pi[pino].dx = !pi->dx ? dx : int_min(pi->dx, dx);
+                pi[pino].dy = !pi->dy ? dy : int_min(pi->dy, dy);
+            }
+        }
+
+        if (pino == 0) {
+            pi[pino].include = (short int*) opj_calloc(tcp->numlayers * pi[pino].step_l, sizeof(short int));
+            if(!pi[pino].include) {
+                pi_destroy(pi, cp, tileno);
+                return NULL;
+            }
+        } else {
+            pi[pino].include = pi[pino - 1].include;
+        }
+
+        /* Generation of boundaries for each prog flag*/
+        if(tcp->POC && ( cp->cinema || ((!cp->cinema) && (t2_mode == FINAL_PASS)))) {
+            tcp->pocs[pino].compS= tcp->pocs[pino].compno0;
+            tcp->pocs[pino].compE= tcp->pocs[pino].compno1;
+            tcp->pocs[pino].resS = tcp->pocs[pino].resno0;
+            tcp->pocs[pino].resE = tcp->pocs[pino].resno1;
+            tcp->pocs[pino].layE = tcp->pocs[pino].layno1;
+            tcp->pocs[pino].prg  = tcp->pocs[pino].prg1;
+            if (pino > 0)
+                tcp->pocs[pino].layS = (tcp->pocs[pino].layE > tcp->pocs[pino - 1].layE) ? tcp->pocs[pino - 1].layE : 0;
+        } else {
+            tcp->pocs[pino].compS= 0;
+            tcp->pocs[pino].compE= image->numcomps;
+            tcp->pocs[pino].resS = 0;
+            tcp->pocs[pino].resE = maxres;
+            tcp->pocs[pino].layS = 0;
+            tcp->pocs[pino].layE = tcp->numlayers;
+            tcp->pocs[pino].prg  = tcp->prg;
+        }
+        tcp->pocs[pino].prcS = 0;
+        tcp->pocs[pino].prcE = maxprec;;
+        tcp->pocs[pino].txS = pi[pino].tx0;
+        tcp->pocs[pino].txE = pi[pino].tx1;
+        tcp->pocs[pino].tyS = pi[pino].ty0;
+        tcp->pocs[pino].tyE = pi[pino].ty1;
+        tcp->pocs[pino].dx = pi[pino].dx;
+        tcp->pocs[pino].dy = pi[pino].dy;
+    }
+    return pi;
 }
 
 
-opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno, J2K_T2_MODE t2_mode){ 
-	int p, q, pino;
-	int compno, resno;
-	int maxres = 0;
-	int maxprec = 0;
-	opj_pi_iterator_t *pi = NULL;
-	opj_tcp_t *tcp = NULL;
-	opj_tccp_t *tccp = NULL;
-	
-	tcp = &cp->tcps[tileno];
-
-	pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
-	if(!pi) {	return NULL;}
-	pi->tp_on = cp->tp_on;
-
-	for(pino = 0;pino < tcp->numpocs+1 ; pino ++){
-		p = tileno % cp->tw;
-		q = tileno / cp->tw;
-
-		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-		pi[pino].numcomps = image->numcomps;
-		
-		pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
-		if(!pi[pino].comps) {
-			pi_destroy(pi, cp, tileno);
-			return NULL;
-		}
-		
-		for (compno = 0; compno < pi[pino].numcomps; compno++) {
-			int tcx0, tcy0, tcx1, tcy1;
-			opj_pi_comp_t *comp = &pi[pino].comps[compno];
-			tccp = &tcp->tccps[compno];
-			comp->dx = image->comps[compno].dx;
-			comp->dy = image->comps[compno].dy;
-			comp->numresolutions = tccp->numresolutions;
-
-			comp->resolutions = (opj_pi_resolution_t*) opj_malloc(comp->numresolutions * sizeof(opj_pi_resolution_t));
-			if(!comp->resolutions) {
-				pi_destroy(pi, cp, tileno);
-				return NULL;
-			}
-
-			tcx0 = int_ceildiv(pi[pino].tx0, comp->dx);
-			tcy0 = int_ceildiv(pi[pino].ty0, comp->dy);
-			tcx1 = int_ceildiv(pi[pino].tx1, comp->dx);
-			tcy1 = int_ceildiv(pi[pino].ty1, comp->dy);
-			if (comp->numresolutions > maxres) {
-				maxres = comp->numresolutions;
-			}
-
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int levelno;
-				int rx0, ry0, rx1, ry1;
-				int px0, py0, px1, py1;
-				opj_pi_resolution_t *res = &comp->resolutions[resno];
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					res->pdx = tccp->prcw[resno];
-					res->pdy = tccp->prch[resno];
-				} else {
-					res->pdx = 15;
-					res->pdy = 15;
-				}
-				levelno = comp->numresolutions - 1 - resno;
-				rx0 = int_ceildivpow2(tcx0, levelno);
-				ry0 = int_ceildivpow2(tcy0, levelno);
-				rx1 = int_ceildivpow2(tcx1, levelno);
-				ry1 = int_ceildivpow2(tcy1, levelno);
-				px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
-				py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
-				px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
-				py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
-				res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
-				res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
-
-				if (res->pw*res->ph > maxprec) {
-					maxprec = res->pw * res->ph;
-				}
-			}
-		}
-		
-		tccp = &tcp->tccps[0];
-		pi[pino].step_p = 1;
-		pi[pino].step_c = maxprec * pi[pino].step_p;
-		pi[pino].step_r = image->numcomps * pi[pino].step_c;
-		pi[pino].step_l = maxres * pi[pino].step_r;
-		
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			opj_pi_comp_t *comp = &pi->comps[compno];
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int dx, dy;
-				opj_pi_resolution_t *res = &comp->resolutions[resno];
-				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-				pi[pino].dx = !pi->dx ? dx : int_min(pi->dx, dx);
-				pi[pino].dy = !pi->dy ? dy : int_min(pi->dy, dy);
-			}
-		}
-
-		if (pino == 0) {
-			pi[pino].include = (short int*) opj_calloc(tcp->numlayers * pi[pino].step_l, sizeof(short int));
-			if(!pi[pino].include) {
-				pi_destroy(pi, cp, tileno);
-				return NULL;
-			}
-		}
-		else {
-			pi[pino].include = pi[pino - 1].include;
-		}
-		
-		/* Generation of boundaries for each prog flag*/
-			if(tcp->POC && ( cp->cinema || ((!cp->cinema) && (t2_mode == FINAL_PASS)))){
-				tcp->pocs[pino].compS= tcp->pocs[pino].compno0;
-				tcp->pocs[pino].compE= tcp->pocs[pino].compno1;
-				tcp->pocs[pino].resS = tcp->pocs[pino].resno0;
-				tcp->pocs[pino].resE = tcp->pocs[pino].resno1;
-				tcp->pocs[pino].layE = tcp->pocs[pino].layno1;
-				tcp->pocs[pino].prg  = tcp->pocs[pino].prg1;
-				if (pino > 0)
-					tcp->pocs[pino].layS = (tcp->pocs[pino].layE > tcp->pocs[pino - 1].layE) ? tcp->pocs[pino - 1].layE : 0;
-			}else {
-				tcp->pocs[pino].compS= 0;
-				tcp->pocs[pino].compE= image->numcomps;
-				tcp->pocs[pino].resS = 0;
-				tcp->pocs[pino].resE = maxres;
-				tcp->pocs[pino].layS = 0;
-				tcp->pocs[pino].layE = tcp->numlayers;
-				tcp->pocs[pino].prg  = tcp->prg;
-			}
-			tcp->pocs[pino].prcS = 0;
-			tcp->pocs[pino].prcE = maxprec;;
-			tcp->pocs[pino].txS = pi[pino].tx0;
-			tcp->pocs[pino].txE = pi[pino].tx1;
-			tcp->pocs[pino].tyS = pi[pino].ty0;
-			tcp->pocs[pino].tyE = pi[pino].ty1;
-			tcp->pocs[pino].dx = pi[pino].dx;
-			tcp->pocs[pino].dy = pi[pino].dy;
-		}
-			return pi;
-	}
-
-
-
-void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno) {
-	int compno, pino;
-	opj_tcp_t *tcp = &cp->tcps[tileno];
-	if(pi) {
-		for (pino = 0; pino < tcp->numpocs + 1; pino++) {	
-			if(pi[pino].comps) {
-				for (compno = 0; compno < pi->numcomps; compno++) {
-					opj_pi_comp_t *comp = &pi[pino].comps[compno];
-					if(comp->resolutions) {
-						opj_free(comp->resolutions);
-					}
-				}
-				opj_free(pi[pino].comps);
-			}
-		}
-		if(pi->include) {
-			opj_free(pi->include);
-		}
-		opj_free(pi);
-	}
+
+void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno)
+{
+    int compno, pino;
+    opj_tcp_t *tcp = &cp->tcps[tileno];
+    if(pi) {
+        for (pino = 0; pino < tcp->numpocs + 1; pino++) {
+            if(pi[pino].comps) {
+                for (compno = 0; compno < pi->numcomps; compno++) {
+                    opj_pi_comp_t *comp = &pi[pino].comps[compno];
+                    if(comp->resolutions) {
+                        opj_free(comp->resolutions);
+                    }
+                }
+                opj_free(pi[pino].comps);
+            }
+        }
+        if(pi->include) {
+            opj_free(pi->include);
+        }
+        opj_free(pi);
+    }
 }
 
-opj_bool pi_next(opj_pi_iterator_t * pi) {
-	switch (pi->poc.prg) {
-		case LRCP:
-			return pi_next_lrcp(pi);
-		case RLCP:
-			return pi_next_rlcp(pi);
-		case RPCL:
-			return pi_next_rpcl(pi);
-		case PCRL:
-			return pi_next_pcrl(pi);
-		case CPRL:
-			return pi_next_cprl(pi);
-		case PROG_UNKNOWN:
-			return OPJ_FALSE;
-	}
-	
-	return OPJ_FALSE;
+opj_bool pi_next(opj_pi_iterator_t * pi)
+{
+    switch (pi->poc.prg) {
+    case LRCP:
+        return pi_next_lrcp(pi);
+    case RLCP:
+        return pi_next_rlcp(pi);
+    case RPCL:
+        return pi_next_rpcl(pi);
+    case PCRL:
+        return pi_next_pcrl(pi);
+    case CPRL:
+        return pi_next_cprl(pi);
+    case PROG_UNKNOWN:
+        return OPJ_FALSE;
+    }
+
+    return OPJ_FALSE;
 }
 
-opj_bool pi_create_encode( opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos, J2K_T2_MODE t2_mode,int cur_totnum_tp){
-	char prog[4];
-	int i;
-	int incr_top=1,resetX=0;
-	opj_tcp_t *tcps =&cp->tcps[tileno];
-	opj_poc_t *tcp= &tcps->pocs[pino];
-
-	pi[pino].first = 1;
-	pi[pino].poc.prg = tcp->prg;
-
-	switch(tcp->prg){
-		case CPRL: strncpy(prog, "CPRL",4);
-			break;
-		case LRCP: strncpy(prog, "LRCP",4);
-			break;
-		case PCRL: strncpy(prog, "PCRL",4);
-			break;
-		case RLCP: strncpy(prog, "RLCP",4);
-			break;
-		case RPCL: strncpy(prog, "RPCL",4);
-			break;
-		case PROG_UNKNOWN: 
-			return OPJ_TRUE;
-	}
-
-	if(!(cp->tp_on && ((!cp->cinema && (t2_mode == FINAL_PASS)) || cp->cinema))){
-		pi[pino].poc.resno0 = tcp->resS;
-		pi[pino].poc.resno1 = tcp->resE;
-		pi[pino].poc.compno0 = tcp->compS;
-		pi[pino].poc.compno1 = tcp->compE;
-		pi[pino].poc.layno0 = tcp->layS;
-		pi[pino].poc.layno1 = tcp->layE;
-		pi[pino].poc.precno0 = tcp->prcS;
-		pi[pino].poc.precno1 = tcp->prcE;
-		pi[pino].poc.tx0 = tcp->txS;
-		pi[pino].poc.ty0 = tcp->tyS;
-		pi[pino].poc.tx1 = tcp->txE;
-		pi[pino].poc.ty1 = tcp->tyE;
-	}else {
-		if( tpnum < cur_totnum_tp){
-			for(i=3;i>=0;i--){
-				switch(prog[i]){
-				case 'C':
-					if (i > tppos){
-						pi[pino].poc.compno0 = tcp->compS;
-						pi[pino].poc.compno1 = tcp->compE;
-					}else{
-						if (tpnum == 0){
-							tcp->comp_t = tcp->compS;
-							pi[pino].poc.compno0 = tcp->comp_t;
-							pi[pino].poc.compno1 = tcp->comp_t+1;
-							tcp->comp_t+=1;
-						}else{
-							if (incr_top == 1){
-								if(tcp->comp_t ==tcp->compE){
-									tcp->comp_t = tcp->compS;
-									pi[pino].poc.compno0 = tcp->comp_t;
-									pi[pino].poc.compno1 = tcp->comp_t+1;
-									tcp->comp_t+=1;
-									incr_top=1;
-								}else{
-									pi[pino].poc.compno0 = tcp->comp_t;
-									pi[pino].poc.compno1 = tcp->comp_t+1;
-									tcp->comp_t+=1;
-									incr_top=0;
-								}
-							}else{
-								pi[pino].poc.compno0 = tcp->comp_t-1;
-								pi[pino].poc.compno1 = tcp->comp_t;
-							}
-						}
-					}
-					break;
-
-				case 'R':
-					if (i > tppos){
-						pi[pino].poc.resno0 = tcp->resS;
-						pi[pino].poc.resno1 = tcp->resE;
-					}else{
-						if (tpnum == 0){
-							tcp->res_t = tcp->resS;
-							pi[pino].poc.resno0 = tcp->res_t;
-							pi[pino].poc.resno1 = tcp->res_t+1;
-							tcp->res_t+=1;
-						}else{
-							if (incr_top == 1){
-								if(tcp->res_t==tcp->resE){
-									tcp->res_t = tcp->resS;
-									pi[pino].poc.resno0 = tcp->res_t;
-									pi[pino].poc.resno1 = tcp->res_t+1;
-									tcp->res_t+=1;
-									incr_top=1;
-								}else{
-									pi[pino].poc.resno0 = tcp->res_t;
-									pi[pino].poc.resno1 = tcp->res_t+1;
-									tcp->res_t+=1;
-									incr_top=0;
-								}
-							}else{
-								pi[pino].poc.resno0 = tcp->res_t - 1;
-								pi[pino].poc.resno1 = tcp->res_t;
-							}
-						}
-					}
-					break;
-
-				case 'L':
-					if (i > tppos){
-						pi[pino].poc.layno0 = tcp->layS;
-						pi[pino].poc.layno1 = tcp->layE;
-					}else{
-						if (tpnum == 0){
-							tcp->lay_t = tcp->layS;
-							pi[pino].poc.layno0 = tcp->lay_t;
-							pi[pino].poc.layno1 = tcp->lay_t+1;
-							tcp->lay_t+=1;
-						}else{
-							if (incr_top == 1){
-								if(tcp->lay_t == tcp->layE){
-									tcp->lay_t = tcp->layS;
-									pi[pino].poc.layno0 = tcp->lay_t;
-									pi[pino].poc.layno1 = tcp->lay_t+1;
-									tcp->lay_t+=1;
-									incr_top=1;
-								}else{
-									pi[pino].poc.layno0 = tcp->lay_t;
-									pi[pino].poc.layno1 = tcp->lay_t+1;
-									tcp->lay_t+=1;
-									incr_top=0;
-								}
-							}else{
-								pi[pino].poc.layno0 = tcp->lay_t - 1;
-								pi[pino].poc.layno1 = tcp->lay_t;
-							}
-						}
-					}
-					break;
-
-				case 'P':
-					switch(tcp->prg){
-						case LRCP:
-						case RLCP:
-							if (i > tppos){
-								pi[pino].poc.precno0 = tcp->prcS;
-								pi[pino].poc.precno1 = tcp->prcE;
-							}else{
-								if (tpnum == 0){
-									tcp->prc_t = tcp->prcS;
-									pi[pino].poc.precno0 = tcp->prc_t;
-									pi[pino].poc.precno1 = tcp->prc_t+1;
-									tcp->prc_t+=1; 
-								}else{
-									if (incr_top == 1){
-										if(tcp->prc_t == tcp->prcE){
-											tcp->prc_t = tcp->prcS;
-											pi[pino].poc.precno0 = tcp->prc_t;
-											pi[pino].poc.precno1 = tcp->prc_t+1;
-											tcp->prc_t+=1;
-											incr_top=1;
-										}else{
-											pi[pino].poc.precno0 = tcp->prc_t;
-											pi[pino].poc.precno1 = tcp->prc_t+1;
-											tcp->prc_t+=1;
-											incr_top=0;
-										}
-									}else{
-										pi[pino].poc.precno0 = tcp->prc_t - 1;
-										pi[pino].poc.precno1 = tcp->prc_t;
-									}
-								}
-							}
-						break;
-						default:
-							if (i > tppos){
-								pi[pino].poc.tx0 = tcp->txS;
-								pi[pino].poc.ty0 = tcp->tyS;
-								pi[pino].poc.tx1 = tcp->txE;
-								pi[pino].poc.ty1 = tcp->tyE;
-							}else{
-								if (tpnum == 0){
-									tcp->tx0_t = tcp->txS;
-									tcp->ty0_t = tcp->tyS;
-									pi[pino].poc.tx0 = tcp->tx0_t;
-									pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
-									pi[pino].poc.ty0 = tcp->ty0_t;
-									pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-									tcp->tx0_t = pi[pino].poc.tx1;
-									tcp->ty0_t = pi[pino].poc.ty1;
-								}else{
-									if (incr_top == 1){
-										if(tcp->tx0_t >= tcp->txE){
-											if(tcp->ty0_t >= tcp->tyE){
-												tcp->ty0_t = tcp->tyS;
-												pi[pino].poc.ty0 = tcp->ty0_t;
-												pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-												tcp->ty0_t = pi[pino].poc.ty1;
-												incr_top=1;resetX=1;
-											}else{
-												pi[pino].poc.ty0 = tcp->ty0_t;
-												pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-												tcp->ty0_t = pi[pino].poc.ty1;
-												incr_top=0;resetX=1;
-											}
-											if(resetX==1){
-												tcp->tx0_t = tcp->txS;
-												pi[pino].poc.tx0 = tcp->tx0_t;
-												pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
-												tcp->tx0_t = pi[pino].poc.tx1;
-											}
-										}else{
-											pi[pino].poc.tx0 = tcp->tx0_t;
-											pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
-											tcp->tx0_t = pi[pino].poc.tx1;
-											pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
-											pi[pino].poc.ty1 = tcp->ty0_t ;
-											incr_top=0;
-										}
-									}else{
-										pi[pino].poc.tx0 = tcp->tx0_t - tcp->dx - (tcp->tx0_t % tcp->dx);
-										pi[pino].poc.tx1 = tcp->tx0_t ;
-										pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
-										pi[pino].poc.ty1 = tcp->ty0_t ;
-									}
-								}
-							}
-						break;
-						}
-						break;
-				}		
-			} 
-		}
-	}	
-	return OPJ_FALSE;
+opj_bool pi_create_encode( opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos, J2K_T2_MODE t2_mode,int cur_totnum_tp)
+{
+    char prog[4];
+    int i;
+    int incr_top=1,resetX=0;
+    opj_tcp_t *tcps =&cp->tcps[tileno];
+    opj_poc_t *tcp= &tcps->pocs[pino];
+
+    pi[pino].first = 1;
+    pi[pino].poc.prg = tcp->prg;
+
+    switch(tcp->prg) {
+    case CPRL:
+        strncpy(prog, "CPRL",4);
+        break;
+    case LRCP:
+        strncpy(prog, "LRCP",4);
+        break;
+    case PCRL:
+        strncpy(prog, "PCRL",4);
+        break;
+    case RLCP:
+        strncpy(prog, "RLCP",4);
+        break;
+    case RPCL:
+        strncpy(prog, "RPCL",4);
+        break;
+    case PROG_UNKNOWN:
+        return OPJ_TRUE;
+    }
+
+    if(!(cp->tp_on && ((!cp->cinema && (t2_mode == FINAL_PASS)) || cp->cinema))) {
+        pi[pino].poc.resno0 = tcp->resS;
+        pi[pino].poc.resno1 = tcp->resE;
+        pi[pino].poc.compno0 = tcp->compS;
+        pi[pino].poc.compno1 = tcp->compE;
+        pi[pino].poc.layno0 = tcp->layS;
+        pi[pino].poc.layno1 = tcp->layE;
+        pi[pino].poc.precno0 = tcp->prcS;
+        pi[pino].poc.precno1 = tcp->prcE;
+        pi[pino].poc.tx0 = tcp->txS;
+        pi[pino].poc.ty0 = tcp->tyS;
+        pi[pino].poc.tx1 = tcp->txE;
+        pi[pino].poc.ty1 = tcp->tyE;
+    } else {
+        if( tpnum < cur_totnum_tp) {
+            for(i=3; i>=0; i--) {
+                switch(prog[i]) {
+                case 'C':
+                    if (i > tppos) {
+                        pi[pino].poc.compno0 = tcp->compS;
+                        pi[pino].poc.compno1 = tcp->compE;
+                    } else {
+                        if (tpnum == 0) {
+                            tcp->comp_t = tcp->compS;
+                            pi[pino].poc.compno0 = tcp->comp_t;
+                            pi[pino].poc.compno1 = tcp->comp_t+1;
+                            tcp->comp_t+=1;
+                        } else {
+                            if (incr_top == 1) {
+                                if(tcp->comp_t ==tcp->compE) {
+                                    tcp->comp_t = tcp->compS;
+                                    pi[pino].poc.compno0 = tcp->comp_t;
+                                    pi[pino].poc.compno1 = tcp->comp_t+1;
+                                    tcp->comp_t+=1;
+                                    incr_top=1;
+                                } else {
+                                    pi[pino].poc.compno0 = tcp->comp_t;
+                                    pi[pino].poc.compno1 = tcp->comp_t+1;
+                                    tcp->comp_t+=1;
+                                    incr_top=0;
+                                }
+                            } else {
+                                pi[pino].poc.compno0 = tcp->comp_t-1;
+                                pi[pino].poc.compno1 = tcp->comp_t;
+                            }
+                        }
+                    }
+                    break;
+
+                case 'R':
+                    if (i > tppos) {
+                        pi[pino].poc.resno0 = tcp->resS;
+                        pi[pino].poc.resno1 = tcp->resE;
+                    } else {
+                        if (tpnum == 0) {
+                            tcp->res_t = tcp->resS;
+                            pi[pino].poc.resno0 = tcp->res_t;
+                            pi[pino].poc.resno1 = tcp->res_t+1;
+                            tcp->res_t+=1;
+                        } else {
+                            if (incr_top == 1) {
+                                if(tcp->res_t==tcp->resE) {
+                                    tcp->res_t = tcp->resS;
+                                    pi[pino].poc.resno0 = tcp->res_t;
+                                    pi[pino].poc.resno1 = tcp->res_t+1;
+                                    tcp->res_t+=1;
+                                    incr_top=1;
+                                } else {
+                                    pi[pino].poc.resno0 = tcp->res_t;
+                                    pi[pino].poc.resno1 = tcp->res_t+1;
+                                    tcp->res_t+=1;
+                                    incr_top=0;
+                                }
+                            } else {
+                                pi[pino].poc.resno0 = tcp->res_t - 1;
+                                pi[pino].poc.resno1 = tcp->res_t;
+                            }
+                        }
+                    }
+                    break;
+
+                case 'L':
+                    if (i > tppos) {
+                        pi[pino].poc.layno0 = tcp->layS;
+                        pi[pino].poc.layno1 = tcp->layE;
+                    } else {
+                        if (tpnum == 0) {
+                            tcp->lay_t = tcp->layS;
+                            pi[pino].poc.layno0 = tcp->lay_t;
+                            pi[pino].poc.layno1 = tcp->lay_t+1;
+                            tcp->lay_t+=1;
+                        } else {
+                            if (incr_top == 1) {
+                                if(tcp->lay_t == tcp->layE) {
+                                    tcp->lay_t = tcp->layS;
+                                    pi[pino].poc.layno0 = tcp->lay_t;
+                                    pi[pino].poc.layno1 = tcp->lay_t+1;
+                                    tcp->lay_t+=1;
+                                    incr_top=1;
+                                } else {
+                                    pi[pino].poc.layno0 = tcp->lay_t;
+                                    pi[pino].poc.layno1 = tcp->lay_t+1;
+                                    tcp->lay_t+=1;
+                                    incr_top=0;
+                                }
+                            } else {
+                                pi[pino].poc.layno0 = tcp->lay_t - 1;
+                                pi[pino].poc.layno1 = tcp->lay_t;
+                            }
+                        }
+                    }
+                    break;
+
+                case 'P':
+                    switch(tcp->prg) {
+                    case LRCP:
+                    case RLCP:
+                        if (i > tppos) {
+                            pi[pino].poc.precno0 = tcp->prcS;
+                            pi[pino].poc.precno1 = tcp->prcE;
+                        } else {
+                            if (tpnum == 0) {
+                                tcp->prc_t = tcp->prcS;
+                                pi[pino].poc.precno0 = tcp->prc_t;
+                                pi[pino].poc.precno1 = tcp->prc_t+1;
+                                tcp->prc_t+=1;
+                            } else {
+                                if (incr_top == 1) {
+                                    if(tcp->prc_t == tcp->prcE) {
+                                        tcp->prc_t = tcp->prcS;
+                                        pi[pino].poc.precno0 = tcp->prc_t;
+                                        pi[pino].poc.precno1 = tcp->prc_t+1;
+                                        tcp->prc_t+=1;
+                                        incr_top=1;
+                                    } else {
+                                        pi[pino].poc.precno0 = tcp->prc_t;
+                                        pi[pino].poc.precno1 = tcp->prc_t+1;
+                                        tcp->prc_t+=1;
+                                        incr_top=0;
+                                    }
+                                } else {
+                                    pi[pino].poc.precno0 = tcp->prc_t - 1;
+                                    pi[pino].poc.precno1 = tcp->prc_t;
+                                }
+                            }
+                        }
+                        break;
+                    default:
+                        if (i > tppos) {
+                            pi[pino].poc.tx0 = tcp->txS;
+                            pi[pino].poc.ty0 = tcp->tyS;
+                            pi[pino].poc.tx1 = tcp->txE;
+                            pi[pino].poc.ty1 = tcp->tyE;
+                        } else {
+                            if (tpnum == 0) {
+                                tcp->tx0_t = tcp->txS;
+                                tcp->ty0_t = tcp->tyS;
+                                pi[pino].poc.tx0 = tcp->tx0_t;
+                                pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
+                                pi[pino].poc.ty0 = tcp->ty0_t;
+                                pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+                                tcp->tx0_t = pi[pino].poc.tx1;
+                                tcp->ty0_t = pi[pino].poc.ty1;
+                            } else {
+                                if (incr_top == 1) {
+                                    if(tcp->tx0_t >= tcp->txE) {
+                                        if(tcp->ty0_t >= tcp->tyE) {
+                                            tcp->ty0_t = tcp->tyS;
+                                            pi[pino].poc.ty0 = tcp->ty0_t;
+                                            pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+                                            tcp->ty0_t = pi[pino].poc.ty1;
+                                            incr_top=1;
+                                            resetX=1;
+                                        } else {
+                                            pi[pino].poc.ty0 = tcp->ty0_t;
+                                            pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+                                            tcp->ty0_t = pi[pino].poc.ty1;
+                                            incr_top=0;
+                                            resetX=1;
+                                        }
+                                        if(resetX==1) {
+                                            tcp->tx0_t = tcp->txS;
+                                            pi[pino].poc.tx0 = tcp->tx0_t;
+                                            pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
+                                            tcp->tx0_t = pi[pino].poc.tx1;
+                                        }
+                                    } else {
+                                        pi[pino].poc.tx0 = tcp->tx0_t;
+                                        pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
+                                        tcp->tx0_t = pi[pino].poc.tx1;
+                                        pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
+                                        pi[pino].poc.ty1 = tcp->ty0_t ;
+                                        incr_top=0;
+                                    }
+                                } else {
+                                    pi[pino].poc.tx0 = tcp->tx0_t - tcp->dx - (tcp->tx0_t % tcp->dx);
+                                    pi[pino].poc.tx1 = tcp->tx0_t ;
+                                    pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
+                                    pi[pino].poc.ty1 = tcp->ty0_t ;
+                                }
+                            }
+                        }
+                        break;
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    return OPJ_FALSE;
 }
 
diff --git a/src/lib/openmj2/pi.h b/src/lib/openmj2/pi.h
index 7f2fe3ef..c4a18f7d 100644
--- a/src/lib/openmj2/pi.h
+++ b/src/lib/openmj2/pi.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -53,54 +53,54 @@ by some function in T2.C.
 FIXME: documentation
 */
 typedef struct opj_pi_resolution {
-  int pdx, pdy;
-  int pw, ph;
+    int pdx, pdy;
+    int pw, ph;
 } opj_pi_resolution_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_pi_comp {
-  int dx, dy;
-  /** number of resolution levels */
-  int numresolutions;
-  opj_pi_resolution_t *resolutions;
+    int dx, dy;
+    /** number of resolution levels */
+    int numresolutions;
+    opj_pi_resolution_t *resolutions;
 } opj_pi_comp_t;
 
-/** 
-Packet iterator 
+/**
+Packet iterator
 */
 typedef struct opj_pi_iterator {
-	/** Enabling Tile part generation*/
-	char tp_on;
-	/** precise if the packet has been already used (useful for progression order change) */
-	short int *include;
-	/** layer step used to localize the packet in the include vector */
-	int step_l;
-	/** resolution step used to localize the packet in the include vector */
-	int step_r;	
-	/** component step used to localize the packet in the include vector */
-	int step_c;	
-	/** precinct step used to localize the packet in the include vector */
-	int step_p;	
-	/** component that identify the packet */
-	int compno;
-	/** resolution that identify the packet */
-	int resno;
-	/** precinct that identify the packet */
-	int precno;
-	/** layer that identify the packet */
-	int layno;   
-	/** 0 if the first packet */
-	int first;
-	/** progression order change information */
-	opj_poc_t poc;
-	/** number of components in the image */
-	int numcomps;
-	/** Components*/
-	opj_pi_comp_t *comps;
-	int tx0, ty0, tx1, ty1;
-	int x, y, dx, dy;
+    /** Enabling Tile part generation*/
+    char tp_on;
+    /** precise if the packet has been already used (useful for progression order change) */
+    short int *include;
+    /** layer step used to localize the packet in the include vector */
+    int step_l;
+    /** resolution step used to localize the packet in the include vector */
+    int step_r;
+    /** component step used to localize the packet in the include vector */
+    int step_c;
+    /** precinct step used to localize the packet in the include vector */
+    int step_p;
+    /** component that identify the packet */
+    int compno;
+    /** resolution that identify the packet */
+    int resno;
+    /** precinct that identify the packet */
+    int precno;
+    /** layer that identify the packet */
+    int layno;
+    /** 0 if the first packet */
+    int first;
+    /** progression order change information */
+    opj_poc_t poc;
+    /** number of components in the image */
+    int numcomps;
+    /** Components*/
+    opj_pi_comp_t *comps;
+    int tx0, ty0, tx1, ty1;
+    int x, y, dx, dy;
 } opj_pi_iterator_t;
 
 /** @name Exported functions */
@@ -118,7 +118,7 @@ Create a packet iterator for Encoder
 opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno,J2K_T2_MODE t2_mode);
 /**
 Modify the packet iterator for enabling tile part generation
-@param pi Handle to the packet iterator generated in pi_initialise_encode  
+@param pi Handle to the packet iterator generated in pi_initialise_encode
 @param cp Coding parameters
 @param tileno Number that identifies the tile for which to list the packets
 @param pino Iterator index for pi
@@ -126,7 +126,7 @@ Modify the packet iterator for enabling tile part generation
 @param tppos The position of the tile part flag in the progression order
 @param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
 @param cur_totnum_tp The total number of tile parts in the current tile
-@return Returns true if an error is detected 
+@return Returns true if an error is detected
 */
 opj_bool pi_create_encode(opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos, J2K_T2_MODE t2_mode,int cur_totnum_tp);
 /**
@@ -151,7 +151,7 @@ void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno);
 /**
 Modify the packet iterator to point to the next packet
 @param pi Packet iterator to modify
-@return Returns false if pi pointed to the last packet or else returns true 
+@return Returns false if pi pointed to the last packet or else returns true
 */
 opj_bool pi_next(opj_pi_iterator_t * pi);
 /* ----------------------------------------------------------------------- */
diff --git a/src/lib/openmj2/raw.c b/src/lib/openmj2/raw.c
index dd82d1fb..ed6d57d1 100644
--- a/src/lib/openmj2/raw.c
+++ b/src/lib/openmj2/raw.c
@@ -1,12 +1,12 @@
 /*
- * 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.
  *
  * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2014, Professor Benoit Macq
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -35,59 +35,64 @@
 
 #include "opj_includes.h"
 
-/* 
+/*
 ==========================================================
    local functions
 ==========================================================
 */
 
 
-/* 
+/*
 ==========================================================
    RAW encoding interface
 ==========================================================
 */
 
-opj_raw_t* raw_create(void) {
-	opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t));
-	return raw;
+opj_raw_t* raw_create(void)
+{
+    opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t));
+    return raw;
 }
 
-void raw_destroy(opj_raw_t *raw) {
-	if(raw) {
-		opj_free(raw);
-	}
+void raw_destroy(opj_raw_t *raw)
+{
+    if(raw) {
+        opj_free(raw);
+    }
 }
 
-int raw_numbytes(opj_raw_t *raw) {
-	return raw->bp - raw->start;
+int raw_numbytes(opj_raw_t *raw)
+{
+    return raw->bp - raw->start;
 }
 
-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;
+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;
 }
 
-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++;
-		}
-	}
-	raw->ct--;
-	d = (raw->c >> raw->ct) & 0x01;
-	
-	return d;
+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++;
+        }
+    }
+    raw->ct--;
+    d = (raw->c >> raw->ct) & 0x01;
+
+    return d;
 }
 
diff --git a/src/lib/openmj2/raw.h b/src/lib/openmj2/raw.h
index 6dbd0553..51655040 100644
--- a/src/lib/openmj2/raw.h
+++ b/src/lib/openmj2/raw.h
@@ -1,12 +1,12 @@
 /*
- * 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.
  *
  * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2014, Professor Benoit Macq
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -50,27 +50,27 @@ with the corresponding mode switch.
 RAW encoding operations
 */
 typedef struct opj_raw {
-	/** temporary buffer where bits are coded or decoded */
-	unsigned char c;
-	/** number of bits already read or free to write */
-	unsigned int ct;
-	/** maximum length to decode */
-	unsigned int lenmax;
-	/** length decoded */
-	unsigned int len;
-	/** pointer to the current position in the buffer */
-	unsigned char *bp;
-	/** pointer to the start of the buffer */
-	unsigned char *start;
-	/** pointer to the end of the buffer */
-	unsigned char *end;
+    /** temporary buffer where bits are coded or decoded */
+    unsigned char c;
+    /** number of bits already read or free to write */
+    unsigned int ct;
+    /** maximum length to decode */
+    unsigned int lenmax;
+    /** length decoded */
+    unsigned int len;
+    /** pointer to the current position in the buffer */
+    unsigned char *bp;
+    /** pointer to the start of the buffer */
+    unsigned char *start;
+    /** pointer to the end of the buffer */
+    unsigned char *end;
 } opj_raw_t;
 
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
-Create a new RAW handle 
+Create a new RAW handle
 @return Returns a new RAW handle if successful, returns NULL otherwise
 */
 opj_raw_t* raw_create(void);
diff --git a/src/lib/openmj2/t1.c b/src/lib/openmj2/t1.c
index af2d564d..4d76229c 100644
--- a/src/lib/openmj2/t1.c
+++ b/src/lib/openmj2/t1.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
@@ -56,185 +56,185 @@ static void t1_updateflags(flag_t *flagsp, int s, int stride);
 Encode significant pass
 */
 static void t1_enc_sigpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int bpno,
-		int one,
-		int *nmsedec,
-		char type,
-		int vsc);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int bpno,
+    int one,
+    int *nmsedec,
+    char type,
+    int vsc);
 /**
 Decode significant pass
 */
 static INLINE void t1_dec_sigpass_step_raw(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int vsc);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf,
+    int vsc);
 static INLINE void t1_dec_sigpass_step_mqc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf);
 static INLINE void t1_dec_sigpass_step_mqc_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int vsc);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf,
+    int vsc);
 /**
 Encode significant pass
 */
 static void t1_enc_sigpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int *nmsedec,
-		char type,
-		int cblksty);
+    opj_t1_t *t1,
+    int bpno,
+    int orient,
+    int *nmsedec,
+    char type,
+    int cblksty);
 /**
 Decode significant pass
 */
 static void t1_dec_sigpass_raw(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int cblksty);
+    opj_t1_t *t1,
+    int bpno,
+    int orient,
+    int cblksty);
 static void t1_dec_sigpass_mqc(
-		opj_t1_t *t1,
-		int bpno,
-		int orient);
+    opj_t1_t *t1,
+    int bpno,
+    int orient);
 static void t1_dec_sigpass_mqc_vsc(
-		opj_t1_t *t1,
-		int bpno,
-		int orient);
+    opj_t1_t *t1,
+    int bpno,
+    int orient);
 /**
 Encode refinement pass
 */
 static void t1_enc_refpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int bpno,
-		int one,
-		int *nmsedec,
-		char type,
-		int vsc);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int bpno,
+    int one,
+    int *nmsedec,
+    char type,
+    int vsc);
 /**
 Decode refinement pass
 */
 static INLINE void t1_dec_refpass_step_raw(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf,
-		int vsc);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int poshalf,
+    int neghalf,
+    int vsc);
 static INLINE void t1_dec_refpass_step_mqc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int poshalf,
+    int neghalf);
 static INLINE void t1_dec_refpass_step_mqc_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf,
-		int vsc);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int poshalf,
+    int neghalf,
+    int vsc);
 
 /**
 Encode refinement pass
 */
 static void t1_enc_refpass(
-		opj_t1_t *t1,
-		int bpno,
-		int *nmsedec,
-		char type,
-		int cblksty);
+    opj_t1_t *t1,
+    int bpno,
+    int *nmsedec,
+    char type,
+    int cblksty);
 /**
 Decode refinement pass
 */
 static void t1_dec_refpass_raw(
-		opj_t1_t *t1,
-		int bpno,
-		int cblksty);
+    opj_t1_t *t1,
+    int bpno,
+    int cblksty);
 static void t1_dec_refpass_mqc(
-		opj_t1_t *t1,
-		int bpno);
+    opj_t1_t *t1,
+    int bpno);
 static void t1_dec_refpass_mqc_vsc(
-		opj_t1_t *t1,
-		int bpno);
+    opj_t1_t *t1,
+    int bpno);
 /**
 Encode clean-up pass
 */
 static void t1_enc_clnpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int bpno,
-		int one,
-		int *nmsedec,
-		int partial,
-		int vsc);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int bpno,
+    int one,
+    int *nmsedec,
+    int partial,
+    int vsc);
 /**
 Decode clean-up pass
 */
 static void t1_dec_clnpass_step_partial(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf);
 static void t1_dec_clnpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf);
 static void t1_dec_clnpass_step_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int partial,
-		int vsc);
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf,
+    int partial,
+    int vsc);
 /**
 Encode clean-up pass
 */
 static void t1_enc_clnpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int *nmsedec,
-		int cblksty);
+    opj_t1_t *t1,
+    int bpno,
+    int orient,
+    int *nmsedec,
+    int cblksty);
 /**
 Decode clean-up pass
 */
 static void t1_dec_clnpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int cblksty);
+    opj_t1_t *t1,
+    int bpno,
+    int orient,
+    int cblksty);
 static double t1_getwmsedec(
-		int nmsedec,
-		int compno,
-		int level,
-		int orient,
-		int bpno,
-		int qmfbid,
-		double stepsize,
-		int numcomps,
-		int mct);
+    int nmsedec,
+    int compno,
+    int level,
+    int orient,
+    int bpno,
+    int qmfbid,
+    double stepsize,
+    int numcomps,
+    int mct);
 /**
 Encode 1 code-block
 @param t1 T1 handle
@@ -250,17 +250,17 @@ Encode 1 code-block
 @param tile
 */
 static void t1_encode_cblk(
-		opj_t1_t *t1,
-		opj_tcd_cblk_enc_t* cblk,
-		int orient,
-		int compno,
-		int level,
-		int qmfbid,
-		double stepsize,
-		int cblksty,
-		int numcomps,
-		int mct,
-		opj_tcd_tile_t * tile);
+    opj_t1_t *t1,
+    opj_tcd_cblk_enc_t* cblk,
+    int orient,
+    int compno,
+    int level,
+    int qmfbid,
+    double stepsize,
+    int cblksty,
+    int numcomps,
+    int mct,
+    opj_tcd_tile_t * tile);
 /**
 Decode 1 code-block
 @param t1 T1 handle
@@ -270,11 +270,11 @@ Decode 1 code-block
 @param cblksty Code-block style
 */
 static void t1_decode_cblk(
-		opj_t1_t *t1,
-		opj_tcd_cblk_dec_t* cblk,
-		int orient,
-		int roishift,
-		int cblksty);
+    opj_t1_t *t1,
+    opj_tcd_cblk_dec_t* cblk,
+    int orient,
+    int roishift,
+    int cblksty);
 
 /*@}*/
 
@@ -282,1310 +282,1317 @@ static void t1_decode_cblk(
 
 /* ----------------------------------------------------------------------- */
 
-static char t1_getctxno_zc(int f, int orient) {
-	return lut_ctxno_zc[(orient << 8) | (f & T1_SIG_OTH)];
+static char t1_getctxno_zc(int f, int orient)
+{
+    return lut_ctxno_zc[(orient << 8) | (f & T1_SIG_OTH)];
 }
 
-static char t1_getctxno_sc(int f) {
-	return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
+static char t1_getctxno_sc(int f)
+{
+    return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
 }
 
-static int t1_getctxno_mag(int f) {
-	int tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
-	int tmp2 = (f & T1_REFINE) ? T1_CTXNO_MAG + 2 : tmp1;
-	return (tmp2);
+static int t1_getctxno_mag(int f)
+{
+    int tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
+    int tmp2 = (f & T1_REFINE) ? T1_CTXNO_MAG + 2 : tmp1;
+    return (tmp2);
 }
 
-static char t1_getspb(int f) {
-	return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
+static char t1_getspb(int f)
+{
+    return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
 }
 
-static short t1_getnmsedec_sig(int x, int bitpos) {
-	if (bitpos > T1_NMSEDEC_FRACBITS) {
-		return lut_nmsedec_sig[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
-	}
-	
-	return lut_nmsedec_sig0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
+static short t1_getnmsedec_sig(int x, int bitpos)
+{
+    if (bitpos > T1_NMSEDEC_FRACBITS) {
+        return lut_nmsedec_sig[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
+    }
+
+    return lut_nmsedec_sig0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
 }
 
-static short t1_getnmsedec_ref(int x, int bitpos) {
-	if (bitpos > T1_NMSEDEC_FRACBITS) {
-		return lut_nmsedec_ref[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
-	}
+static short t1_getnmsedec_ref(int x, int bitpos)
+{
+    if (bitpos > T1_NMSEDEC_FRACBITS) {
+        return lut_nmsedec_ref[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
+    }
 
     return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
 }
 
-static void t1_updateflags(flag_t *flagsp, int s, int stride) {
-	flag_t *np = flagsp - stride;
-	flag_t *sp = flagsp + stride;
-
-	static const flag_t mod[] = {
-		T1_SIG_S, T1_SIG_S|T1_SGN_S,
-		T1_SIG_E, T1_SIG_E|T1_SGN_E,
-		T1_SIG_W, T1_SIG_W|T1_SGN_W,
-		T1_SIG_N, T1_SIG_N|T1_SGN_N
-	};
-
-	np[-1] |= T1_SIG_SE;
-	np[0]  |= mod[s];
-	np[1]  |= T1_SIG_SW;
-
-	flagsp[-1] |= mod[s+2];
-	flagsp[0]  |= T1_SIG;
-	flagsp[1]  |= mod[s+4];
-
-	sp[-1] |= T1_SIG_NE;
-	sp[0]  |= mod[s+6];
-	sp[1]  |= T1_SIG_NW;
+static void t1_updateflags(flag_t *flagsp, int s, int stride)
+{
+    flag_t *np = flagsp - stride;
+    flag_t *sp = flagsp + stride;
+
+    static const flag_t mod[] = {
+        T1_SIG_S, T1_SIG_S|T1_SGN_S,
+        T1_SIG_E, T1_SIG_E|T1_SGN_E,
+        T1_SIG_W, T1_SIG_W|T1_SGN_W,
+        T1_SIG_N, T1_SIG_N|T1_SGN_N
+    };
+
+    np[-1] |= T1_SIG_SE;
+    np[0]  |= mod[s];
+    np[1]  |= T1_SIG_SW;
+
+    flagsp[-1] |= mod[s+2];
+    flagsp[0]  |= T1_SIG;
+    flagsp[1]  |= mod[s+4];
+
+    sp[-1] |= T1_SIG_NE;
+    sp[0]  |= mod[s+6];
+    sp[1]  |= T1_SIG_NW;
 }
 
 static void t1_enc_sigpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int bpno,
-		int one,
-		int *nmsedec,
-		char type,
-		int vsc)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int bpno,
+    int one,
+    int *nmsedec,
+    char type,
+    int vsc)
 {
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-		v = int_abs(*datap) & one ? 1 : 0;
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));	/* ESSAI */
-		if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-			mqc_bypass_enc(mqc, v);
-		} else {
-			mqc_encode(mqc, v);
-		}
-		if (v) {
-			v = *datap < 0 ? 1 : 0;
-			*nmsedec +=	t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));	/* ESSAI */
-			if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-				mqc_bypass_enc(mqc, v);
-			} else {
-				mqc_encode(mqc, v ^ t1_getspb(flag));
-			}
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-		*flagsp |= T1_VISIT;
-	}
+    int v, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+    if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+        v = int_abs(*datap) & one ? 1 : 0;
+        mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));	/* ESSAI */
+        if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
+            mqc_bypass_enc(mqc, v);
+        } else {
+            mqc_encode(mqc, v);
+        }
+        if (v) {
+            v = *datap < 0 ? 1 : 0;
+            *nmsedec +=	t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
+            mqc_setcurctx(mqc, t1_getctxno_sc(flag));	/* ESSAI */
+            if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
+                mqc_bypass_enc(mqc, v);
+            } else {
+                mqc_encode(mqc, v ^ t1_getspb(flag));
+            }
+            t1_updateflags(flagsp, v, t1->flags_stride);
+        }
+        *flagsp |= T1_VISIT;
+    }
 }
 
 static INLINE void t1_dec_sigpass_step_raw(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int vsc)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf,
+    int vsc)
 {
-	int v, flag;
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-	
-	OPJ_ARG_NOT_USED(orient);
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-			if (raw_decode(raw)) {
-				v = raw_decode(raw);	/* ESSAI */
-				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
-			}
-		*flagsp |= T1_VISIT;
-	}
+    int v, flag;
+    opj_raw_t *raw = t1->raw;	/* RAW component */
+
+    OPJ_ARG_NOT_USED(orient);
+
+    flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+    if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+        if (raw_decode(raw)) {
+            v = raw_decode(raw);	/* ESSAI */
+            *datap = v ? -oneplushalf : oneplushalf;
+            t1_updateflags(flagsp, v, t1->flags_stride);
+        }
+        *flagsp |= T1_VISIT;
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static INLINE void t1_dec_sigpass_step_mqc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf)
 {
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = *flagsp;
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-			if (mqc_decode(mqc)) {
-				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-				v = mqc_decode(mqc) ^ t1_getspb(flag);
-				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
-			}
-		*flagsp |= T1_VISIT;
-	}
+    int v, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = *flagsp;
+    if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+        mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
+        if (mqc_decode(mqc)) {
+            mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+            v = mqc_decode(mqc) ^ t1_getspb(flag);
+            *datap = v ? -oneplushalf : oneplushalf;
+            t1_updateflags(flagsp, v, t1->flags_stride);
+        }
+        *flagsp |= T1_VISIT;
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static INLINE void t1_dec_sigpass_step_mqc_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int vsc)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf,
+    int vsc)
 {
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		if (mqc_decode(mqc)) {
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = mqc_decode(mqc) ^ t1_getspb(flag);
-			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-		*flagsp |= T1_VISIT;
-	}
+    int v, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+    if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+        mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
+        if (mqc_decode(mqc)) {
+            mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+            v = mqc_decode(mqc) ^ t1_getspb(flag);
+            *datap = v ? -oneplushalf : oneplushalf;
+            t1_updateflags(flagsp, v, t1->flags_stride);
+        }
+        *flagsp |= T1_VISIT;
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_enc_sigpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int *nmsedec,
-		char type,
-		int cblksty)
+    opj_t1_t *t1,
+    int bpno,
+    int orient,
+    int *nmsedec,
+    char type,
+    int cblksty)
 {
-	int i, j, k, one, vsc;
-	*nmsedec = 0;
-	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_enc_sigpass_step(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						bpno,
-						one,
-						nmsedec,
-						type,
-						vsc);
-			}
-		}
-	}
+    int i, j, k, one, vsc;
+    *nmsedec = 0;
+    one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+    for (k = 0; k < t1->h; k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            for (j = k; j < k + 4 && j < t1->h; ++j) {
+                vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+                t1_enc_sigpass_step(
+                    t1,
+                    &t1->flags[((j+1) * t1->flags_stride) + i + 1],
+                    &t1->data[(j * t1->w) + i],
+                    orient,
+                    bpno,
+                    one,
+                    nmsedec,
+                    type,
+                    vsc);
+            }
+        }
+    }
 }
 
 static void t1_dec_sigpass_raw(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int cblksty)
+    opj_t1_t *t1,
+    int bpno,
+    int orient,
+    int cblksty)
 {
-	int i, j, k, one, half, oneplushalf, vsc;
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_dec_sigpass_step_raw(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						oneplushalf,
-						vsc);
-			}
-		}
-	}
+    int i, j, k, one, half, oneplushalf, vsc;
+    one = 1 << bpno;
+    half = one >> 1;
+    oneplushalf = one | half;
+    for (k = 0; k < t1->h; k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            for (j = k; j < k + 4 && j < t1->h; ++j) {
+                vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+                t1_dec_sigpass_step_raw(
+                    t1,
+                    &t1->flags[((j+1) * t1->flags_stride) + i + 1],
+                    &t1->data[(j * t1->w) + i],
+                    orient,
+                    oneplushalf,
+                    vsc);
+            }
+        }
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_dec_sigpass_mqc(
-		opj_t1_t *t1,
-		int bpno,
-		int orient)
+    opj_t1_t *t1,
+    int bpno,
+    int orient)
 {
-	int i, j, k, one, half, oneplushalf;
-	int *data1 = t1->data;
-	flag_t *flags1 = &t1->flags[1];
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	for (k = 0; k < (t1->h & ~3); k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			int *data2 = data1 + i;
-			flag_t *flags2 = flags1 + i;
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-		}
-		data1 += t1->w << 2;
-		flags1 += t1->flags_stride << 2;
-	}
-	for (i = 0; i < t1->w; ++i) {
-		int *data2 = data1 + i;
-		flag_t *flags2 = flags1 + i;
-		for (j = k; j < t1->h; ++j) {
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-		}
-	}
+    int i, j, k, one, half, oneplushalf;
+    int *data1 = t1->data;
+    flag_t *flags1 = &t1->flags[1];
+    one = 1 << bpno;
+    half = one >> 1;
+    oneplushalf = one | half;
+    for (k = 0; k < (t1->h & ~3); k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            int *data2 = data1 + i;
+            flag_t *flags2 = flags1 + i;
+            flags2 += t1->flags_stride;
+            t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
+            data2 += t1->w;
+            flags2 += t1->flags_stride;
+            t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
+            data2 += t1->w;
+            flags2 += t1->flags_stride;
+            t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
+            data2 += t1->w;
+            flags2 += t1->flags_stride;
+            t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
+            data2 += t1->w;
+        }
+        data1 += t1->w << 2;
+        flags1 += t1->flags_stride << 2;
+    }
+    for (i = 0; i < t1->w; ++i) {
+        int *data2 = data1 + i;
+        flag_t *flags2 = flags1 + i;
+        for (j = k; j < t1->h; ++j) {
+            flags2 += t1->flags_stride;
+            t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
+            data2 += t1->w;
+        }
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_dec_sigpass_mqc_vsc(
-		opj_t1_t *t1,
-		int bpno,
-		int orient)
+    opj_t1_t *t1,
+    int bpno,
+    int orient)
 {
-	int i, j, k, one, half, oneplushalf, vsc;
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = (j == k + 3 || j == t1->h - 1) ? 1 : 0;
-				t1_dec_sigpass_step_mqc_vsc(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						oneplushalf,
-						vsc);
-			}
-		}
-	}
+    int i, j, k, one, half, oneplushalf, vsc;
+    one = 1 << bpno;
+    half = one >> 1;
+    oneplushalf = one | half;
+    for (k = 0; k < t1->h; k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            for (j = k; j < k + 4 && j < t1->h; ++j) {
+                vsc = (j == k + 3 || j == t1->h - 1) ? 1 : 0;
+                t1_dec_sigpass_step_mqc_vsc(
+                    t1,
+                    &t1->flags[((j+1) * t1->flags_stride) + i + 1],
+                    &t1->data[(j * t1->w) + i],
+                    orient,
+                    oneplushalf,
+                    vsc);
+            }
+        }
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_enc_refpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int bpno,
-		int one,
-		int *nmsedec,
-		char type,
-		int vsc)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int bpno,
+    int one,
+    int *nmsedec,
+    char type,
+    int vsc)
 {
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-		*nmsedec += t1_getnmsedec_ref(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
-		v = int_abs(*datap) & one ? 1 : 0;
-		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
-		if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-			mqc_bypass_enc(mqc, v);
-		} else {
-			mqc_encode(mqc, v);
-		}
-		*flagsp |= T1_REFINE;
-	}
+    int v, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+    if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
+        *nmsedec += t1_getnmsedec_ref(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
+        v = int_abs(*datap) & one ? 1 : 0;
+        mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
+        if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
+            mqc_bypass_enc(mqc, v);
+        } else {
+            mqc_encode(mqc, v);
+        }
+        *flagsp |= T1_REFINE;
+    }
 }
 
 static INLINE void t1_dec_refpass_step_raw(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf,
-		int vsc)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int poshalf,
+    int neghalf,
+    int vsc)
 {
-	int v, t, flag;
-	
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-			v = raw_decode(raw);
-		t = v ? poshalf : neghalf;
-		*datap += *datap < 0 ? -t : t;
-		*flagsp |= T1_REFINE;
-	}
+    int v, t, flag;
+
+    opj_raw_t *raw = t1->raw;	/* RAW component */
+
+    flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+    if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
+        v = raw_decode(raw);
+        t = v ? poshalf : neghalf;
+        *datap += *datap < 0 ? -t : t;
+        *flagsp |= T1_REFINE;
+    }
 }				/* VSC and  BYPASS by Antonin  */
 
 static INLINE void t1_dec_refpass_step_mqc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int poshalf,
+    int neghalf)
 {
-	int v, t, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = *flagsp;
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
-			v = mqc_decode(mqc);
-		t = v ? poshalf : neghalf;
-		*datap += *datap < 0 ? -t : t;
-		*flagsp |= T1_REFINE;
-		}
+    int v, t, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = *flagsp;
+    if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
+        mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
+        v = mqc_decode(mqc);
+        t = v ? poshalf : neghalf;
+        *datap += *datap < 0 ? -t : t;
+        *flagsp |= T1_REFINE;
+    }
 }				/* VSC and  BYPASS by Antonin  */
 
 static INLINE void t1_dec_refpass_step_mqc_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf,
-		int vsc)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int poshalf,
+    int neghalf,
+    int vsc)
 {
-	int v, t, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
-		v = mqc_decode(mqc);
-		t = v ? poshalf : neghalf;
-		*datap += *datap < 0 ? -t : t;
-		*flagsp |= T1_REFINE;
-	}
+    int v, t, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+    if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
+        mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
+        v = mqc_decode(mqc);
+        t = v ? poshalf : neghalf;
+        *datap += *datap < 0 ? -t : t;
+        *flagsp |= T1_REFINE;
+    }
 }				/* VSC and  BYPASS by Antonin  */
 
 static void t1_enc_refpass(
-		opj_t1_t *t1,
-		int bpno,
-		int *nmsedec,
-		char type,
-		int cblksty)
+    opj_t1_t *t1,
+    int bpno,
+    int *nmsedec,
+    char type,
+    int cblksty)
 {
-	int i, j, k, one, vsc;
-	*nmsedec = 0;
-	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_enc_refpass_step(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						bpno,
-						one,
-						nmsedec,
-						type,
-						vsc);
-			}
-		}
-	}
+    int i, j, k, one, vsc;
+    *nmsedec = 0;
+    one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+    for (k = 0; k < t1->h; k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            for (j = k; j < k + 4 && j < t1->h; ++j) {
+                vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+                t1_enc_refpass_step(
+                    t1,
+                    &t1->flags[((j+1) * t1->flags_stride) + i + 1],
+                    &t1->data[(j * t1->w) + i],
+                    bpno,
+                    one,
+                    nmsedec,
+                    type,
+                    vsc);
+            }
+        }
+    }
 }
 
 static void t1_dec_refpass_raw(
-		opj_t1_t *t1,
-		int bpno,
-		int cblksty)
+    opj_t1_t *t1,
+    int bpno,
+    int cblksty)
 {
-	int i, j, k, one, poshalf, neghalf;
-	int vsc;
-	one = 1 << bpno;
-	poshalf = one >> 1;
-	neghalf = bpno > 0 ? -poshalf : -1;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_dec_refpass_step_raw(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						poshalf,
-						neghalf,
-						vsc);
-			}
-		}
-	}
+    int i, j, k, one, poshalf, neghalf;
+    int vsc;
+    one = 1 << bpno;
+    poshalf = one >> 1;
+    neghalf = bpno > 0 ? -poshalf : -1;
+    for (k = 0; k < t1->h; k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            for (j = k; j < k + 4 && j < t1->h; ++j) {
+                vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+                t1_dec_refpass_step_raw(
+                    t1,
+                    &t1->flags[((j+1) * t1->flags_stride) + i + 1],
+                    &t1->data[(j * t1->w) + i],
+                    poshalf,
+                    neghalf,
+                    vsc);
+            }
+        }
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_dec_refpass_mqc(
-		opj_t1_t *t1,
-		int bpno)
+    opj_t1_t *t1,
+    int bpno)
 {
-	int i, j, k, one, poshalf, neghalf;
-	int *data1 = t1->data;
-	flag_t *flags1 = &t1->flags[1];
-	one = 1 << bpno;
-	poshalf = one >> 1;
-	neghalf = bpno > 0 ? -poshalf : -1;
-	for (k = 0; k < (t1->h & ~3); k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			int *data2 = data1 + i;
-			flag_t *flags2 = flags1 + i;
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-		}
-		data1 += t1->w << 2;
-		flags1 += t1->flags_stride << 2;
-	}
-	for (i = 0; i < t1->w; ++i) {
-		int *data2 = data1 + i;
-		flag_t *flags2 = flags1 + i;
-		for (j = k; j < t1->h; ++j) {
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-		}
-	}
+    int i, j, k, one, poshalf, neghalf;
+    int *data1 = t1->data;
+    flag_t *flags1 = &t1->flags[1];
+    one = 1 << bpno;
+    poshalf = one >> 1;
+    neghalf = bpno > 0 ? -poshalf : -1;
+    for (k = 0; k < (t1->h & ~3); k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            int *data2 = data1 + i;
+            flag_t *flags2 = flags1 + i;
+            flags2 += t1->flags_stride;
+            t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
+            data2 += t1->w;
+            flags2 += t1->flags_stride;
+            t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
+            data2 += t1->w;
+            flags2 += t1->flags_stride;
+            t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
+            data2 += t1->w;
+            flags2 += t1->flags_stride;
+            t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
+            data2 += t1->w;
+        }
+        data1 += t1->w << 2;
+        flags1 += t1->flags_stride << 2;
+    }
+    for (i = 0; i < t1->w; ++i) {
+        int *data2 = data1 + i;
+        flag_t *flags2 = flags1 + i;
+        for (j = k; j < t1->h; ++j) {
+            flags2 += t1->flags_stride;
+            t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
+            data2 += t1->w;
+        }
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_dec_refpass_mqc_vsc(
-		opj_t1_t *t1,
-		int bpno)
+    opj_t1_t *t1,
+    int bpno)
 {
-	int i, j, k, one, poshalf, neghalf;
-	int vsc;
-	one = 1 << bpno;
-	poshalf = one >> 1;
-	neghalf = bpno > 0 ? -poshalf : -1;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_dec_refpass_step_mqc_vsc(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						poshalf,
-						neghalf,
-						vsc);
-			}
-		}
-	}
+    int i, j, k, one, poshalf, neghalf;
+    int vsc;
+    one = 1 << bpno;
+    poshalf = one >> 1;
+    neghalf = bpno > 0 ? -poshalf : -1;
+    for (k = 0; k < t1->h; k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            for (j = k; j < k + 4 && j < t1->h; ++j) {
+                vsc = ((j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+                t1_dec_refpass_step_mqc_vsc(
+                    t1,
+                    &t1->flags[((j+1) * t1->flags_stride) + i + 1],
+                    &t1->data[(j * t1->w) + i],
+                    poshalf,
+                    neghalf,
+                    vsc);
+            }
+        }
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_enc_clnpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int bpno,
-		int one,
-		int *nmsedec,
-		int partial,
-		int vsc)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int bpno,
+    int one,
+    int *nmsedec,
+    int partial,
+    int vsc)
 {
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if (partial) {
-		goto LABEL_PARTIAL;
-	}
-	if (!(*flagsp & (T1_SIG | T1_VISIT))) {
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		v = int_abs(*datap) & one ? 1 : 0;
-		mqc_encode(mqc, v);
-		if (v) {
+    int v, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+    if (partial) {
+        goto LABEL_PARTIAL;
+    }
+    if (!(*flagsp & (T1_SIG | T1_VISIT))) {
+        mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
+        v = int_abs(*datap) & one ? 1 : 0;
+        mqc_encode(mqc, v);
+        if (v) {
 LABEL_PARTIAL:
-			*nmsedec += t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = *datap < 0 ? 1 : 0;
-			mqc_encode(mqc, v ^ t1_getspb(flag));
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-	}
-	*flagsp &= ~T1_VISIT;
+            *nmsedec += t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
+            mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+            v = *datap < 0 ? 1 : 0;
+            mqc_encode(mqc, v ^ t1_getspb(flag));
+            t1_updateflags(flagsp, v, t1->flags_stride);
+        }
+    }
+    *flagsp &= ~T1_VISIT;
 }
 
 static void t1_dec_clnpass_step_partial(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf)
 {
-	int v, flag;
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	OPJ_ARG_NOT_USED(orient);
-	
-	flag = *flagsp;
-	mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-	v = mqc_decode(mqc) ^ t1_getspb(flag);
-	*datap = v ? -oneplushalf : oneplushalf;
-	t1_updateflags(flagsp, v, t1->flags_stride);
-	*flagsp &= ~T1_VISIT;
+    int v, flag;
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    OPJ_ARG_NOT_USED(orient);
+
+    flag = *flagsp;
+    mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+    v = mqc_decode(mqc) ^ t1_getspb(flag);
+    *datap = v ? -oneplushalf : oneplushalf;
+    t1_updateflags(flagsp, v, t1->flags_stride);
+    *flagsp &= ~T1_VISIT;
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_dec_clnpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf)
 {
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = *flagsp;
-	if (!(flag & (T1_SIG | T1_VISIT))) {
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		if (mqc_decode(mqc)) {
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = mqc_decode(mqc) ^ t1_getspb(flag);
-			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-	}
-	*flagsp &= ~T1_VISIT;
+    int v, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = *flagsp;
+    if (!(flag & (T1_SIG | T1_VISIT))) {
+        mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
+        if (mqc_decode(mqc)) {
+            mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+            v = mqc_decode(mqc) ^ t1_getspb(flag);
+            *datap = v ? -oneplushalf : oneplushalf;
+            t1_updateflags(flagsp, v, t1->flags_stride);
+        }
+    }
+    *flagsp &= ~T1_VISIT;
 }				/* VSC and  BYPASS by Antonin */
 
 static void t1_dec_clnpass_step_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int partial,
-		int vsc)
+    opj_t1_t *t1,
+    flag_t *flagsp,
+    int *datap,
+    int orient,
+    int oneplushalf,
+    int partial,
+    int vsc)
 {
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if (partial) {
-		goto LABEL_PARTIAL;
-	}
-	if (!(flag & (T1_SIG | T1_VISIT))) {
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		if (mqc_decode(mqc)) {
+    int v, flag;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+    if (partial) {
+        goto LABEL_PARTIAL;
+    }
+    if (!(flag & (T1_SIG | T1_VISIT))) {
+        mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
+        if (mqc_decode(mqc)) {
 LABEL_PARTIAL:
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = mqc_decode(mqc) ^ t1_getspb(flag);
-			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-	}
-	*flagsp &= ~T1_VISIT;
+            mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+            v = mqc_decode(mqc) ^ t1_getspb(flag);
+            *datap = v ? -oneplushalf : oneplushalf;
+            t1_updateflags(flagsp, v, t1->flags_stride);
+        }
+    }
+    *flagsp &= ~T1_VISIT;
 }
 
 static void t1_enc_clnpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int *nmsedec,
-		int cblksty)
+    opj_t1_t *t1,
+    int bpno,
+    int orient,
+    int *nmsedec,
+    int cblksty)
 {
-	int i, j, k, one, agg, runlen, vsc;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	*nmsedec = 0;
-	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			if (k + 3 < t1->h) {
-				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				} else {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				}
-			} else {
-				agg = 0;
-			}
-			if (agg) {
-				for (runlen = 0; runlen < 4; ++runlen) {
-					if (int_abs(t1->data[((k + runlen)*t1->w) + i]) & one)
-						break;
-				}
-				mqc_setcurctx(mqc, T1_CTXNO_AGG);
-				mqc_encode(mqc, runlen != 4);
-				if (runlen == 4) {
-					continue;
-				}
-				mqc_setcurctx(mqc, T1_CTXNO_UNI);
-				mqc_encode(mqc, runlen >> 1);
-				mqc_encode(mqc, runlen & 1);
-			} else {
-				runlen = 0;
-			}
-			for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_enc_clnpass_step(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						bpno,
-						one,
-						nmsedec,
-						agg && (j == k + runlen),
-						vsc);
-			}
-		}
-	}
+    int i, j, k, one, agg, runlen, vsc;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    *nmsedec = 0;
+    one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+    for (k = 0; k < t1->h; k += 4) {
+        for (i = 0; i < t1->w; ++i) {
+            if (k + 3 < t1->h) {
+                if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+                    agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || (MACRO_t1_flags(1 + k + 3,1 + i)
+                                & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+                } else {
+                    agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+                }
+            } else {
+                agg = 0;
+            }
+            if (agg) {
+                for (runlen = 0; runlen < 4; ++runlen) {
+                    if (int_abs(t1->data[((k + runlen)*t1->w) + i]) & one)
+                        break;
+                }
+                mqc_setcurctx(mqc, T1_CTXNO_AGG);
+                mqc_encode(mqc, runlen != 4);
+                if (runlen == 4) {
+                    continue;
+                }
+                mqc_setcurctx(mqc, T1_CTXNO_UNI);
+                mqc_encode(mqc, runlen >> 1);
+                mqc_encode(mqc, runlen & 1);
+            } else {
+                runlen = 0;
+            }
+            for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
+                vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+                t1_enc_clnpass_step(
+                    t1,
+                    &t1->flags[((j+1) * t1->flags_stride) + i + 1],
+                    &t1->data[(j * t1->w) + i],
+                    orient,
+                    bpno,
+                    one,
+                    nmsedec,
+                    agg && (j == k + runlen),
+                    vsc);
+            }
+        }
+    }
 }
 
 static void t1_dec_clnpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int cblksty)
+    opj_t1_t *t1,
+    int bpno,
+    int orient,
+    int cblksty)
 {
-	int i, j, k, one, half, oneplushalf, agg, runlen, vsc;
-	int segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			if (k + 3 < t1->h) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				} else {
-				agg = 0;
-			}
-			if (agg) {
-				mqc_setcurctx(mqc, T1_CTXNO_AGG);
-				if (!mqc_decode(mqc)) {
-					continue;
-				}
-				mqc_setcurctx(mqc, T1_CTXNO_UNI);
-				runlen = mqc_decode(mqc);
-				runlen = (runlen << 1) | mqc_decode(mqc);
-			} else {
-				runlen = 0;
-			}
-			for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
-					vsc = (j == k + 3 || j == t1->h - 1) ? 1 : 0;
-					t1_dec_clnpass_step_vsc(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						oneplushalf,
-						agg && (j == k + runlen),
-						vsc);
-			}
-		}
-	}
-	} else {
-		int *data1 = t1->data;
-		flag_t *flags1 = &t1->flags[1];
-		for (k = 0; k < (t1->h & ~3); k += 4) {
-			for (i = 0; i < t1->w; ++i) {
-				int *data2 = data1 + i;
-				flag_t *flags2 = flags1 + i;
-				agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				if (agg) {
-					mqc_setcurctx(mqc, T1_CTXNO_AGG);
-					if (!mqc_decode(mqc)) {
-						continue;
-					}
-					mqc_setcurctx(mqc, T1_CTXNO_UNI);
-					runlen = mqc_decode(mqc);
-					runlen = (runlen << 1) | mqc_decode(mqc);
-					flags2 += runlen * t1->flags_stride;
-					data2 += runlen * t1->w;
-					for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
-						flags2 += t1->flags_stride;
-						if (agg && (j == k + runlen)) {
-							t1_dec_clnpass_step_partial(t1, flags2, data2, orient, oneplushalf);
-						} else {
-							t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-						}
-						data2 += t1->w;
-					}
-				} else {
-					flags2 += t1->flags_stride;
-					t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-					data2 += t1->w;
-					flags2 += t1->flags_stride;
-					t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-					data2 += t1->w;
-					flags2 += t1->flags_stride;
-					t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-					data2 += t1->w;
-					flags2 += t1->flags_stride;
-					t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-					data2 += t1->w;
-				}
-			}
-			data1 += t1->w << 2;
-			flags1 += t1->flags_stride << 2;
-		}
-		for (i = 0; i < t1->w; ++i) {
-			int *data2 = data1 + i;
-			flag_t *flags2 = flags1 + i;
-			for (j = k; j < t1->h; ++j) {
-				flags2 += t1->flags_stride;
-				t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-				data2 += t1->w;
-			}
-		}
-	}
-
-	if (segsym) {
-		int v = 0;
-		mqc_setcurctx(mqc, T1_CTXNO_UNI);
-		v = mqc_decode(mqc);
-		v = (v << 1) | mqc_decode(mqc);
-		v = (v << 1) | mqc_decode(mqc);
-		v = (v << 1) | mqc_decode(mqc);
-		/*
-		if (v!=0xa) {
-			opj_event_msg(t1->cinfo, EVT_WARNING, "Bad segmentation symbol %x\n", v);
-		} 
-		*/
-	}
+    int i, j, k, one, half, oneplushalf, agg, runlen, vsc;
+    int segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    one = 1 << bpno;
+    half = one >> 1;
+    oneplushalf = one | half;
+    if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+        for (k = 0; k < t1->h; k += 4) {
+            for (i = 0; i < t1->w; ++i) {
+                if (k + 3 < t1->h) {
+                    agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                            || (MACRO_t1_flags(1 + k + 3,1 + i)
+                                & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+                } else {
+                    agg = 0;
+                }
+                if (agg) {
+                    mqc_setcurctx(mqc, T1_CTXNO_AGG);
+                    if (!mqc_decode(mqc)) {
+                        continue;
+                    }
+                    mqc_setcurctx(mqc, T1_CTXNO_UNI);
+                    runlen = mqc_decode(mqc);
+                    runlen = (runlen << 1) | mqc_decode(mqc);
+                } else {
+                    runlen = 0;
+                }
+                for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
+                    vsc = (j == k + 3 || j == t1->h - 1) ? 1 : 0;
+                    t1_dec_clnpass_step_vsc(
+                        t1,
+                        &t1->flags[((j+1) * t1->flags_stride) + i + 1],
+                        &t1->data[(j * t1->w) + i],
+                        orient,
+                        oneplushalf,
+                        agg && (j == k + runlen),
+                        vsc);
+                }
+            }
+        }
+    } else {
+        int *data1 = t1->data;
+        flag_t *flags1 = &t1->flags[1];
+        for (k = 0; k < (t1->h & ~3); k += 4) {
+            for (i = 0; i < t1->w; ++i) {
+                int *data2 = data1 + i;
+                flag_t *flags2 = flags1 + i;
+                agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                        || MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                        || MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+                        || MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+                if (agg) {
+                    mqc_setcurctx(mqc, T1_CTXNO_AGG);
+                    if (!mqc_decode(mqc)) {
+                        continue;
+                    }
+                    mqc_setcurctx(mqc, T1_CTXNO_UNI);
+                    runlen = mqc_decode(mqc);
+                    runlen = (runlen << 1) | mqc_decode(mqc);
+                    flags2 += runlen * t1->flags_stride;
+                    data2 += runlen * t1->w;
+                    for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
+                        flags2 += t1->flags_stride;
+                        if (agg && (j == k + runlen)) {
+                            t1_dec_clnpass_step_partial(t1, flags2, data2, orient, oneplushalf);
+                        } else {
+                            t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
+                        }
+                        data2 += t1->w;
+                    }
+                } else {
+                    flags2 += t1->flags_stride;
+                    t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
+                    data2 += t1->w;
+                    flags2 += t1->flags_stride;
+                    t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
+                    data2 += t1->w;
+                    flags2 += t1->flags_stride;
+                    t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
+                    data2 += t1->w;
+                    flags2 += t1->flags_stride;
+                    t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
+                    data2 += t1->w;
+                }
+            }
+            data1 += t1->w << 2;
+            flags1 += t1->flags_stride << 2;
+        }
+        for (i = 0; i < t1->w; ++i) {
+            int *data2 = data1 + i;
+            flag_t *flags2 = flags1 + i;
+            for (j = k; j < t1->h; ++j) {
+                flags2 += t1->flags_stride;
+                t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
+                data2 += t1->w;
+            }
+        }
+    }
+
+    if (segsym) {
+        int v = 0;
+        mqc_setcurctx(mqc, T1_CTXNO_UNI);
+        v = mqc_decode(mqc);
+        v = (v << 1) | mqc_decode(mqc);
+        v = (v << 1) | mqc_decode(mqc);
+        v = (v << 1) | mqc_decode(mqc);
+        /*
+        if (v!=0xa) {
+        	opj_event_msg(t1->cinfo, EVT_WARNING, "Bad segmentation symbol %x\n", v);
+        }
+        */
+    }
 }				/* VSC and  BYPASS by Antonin */
 
 
 /** mod fixed_quality */
 static double t1_getwmsedec(
-		int nmsedec,
-		int compno,
-		int level,
-		int orient,
-		int bpno,
-		int qmfbid,
-		double stepsize,
-		int numcomps,
-		int mct)
+    int nmsedec,
+    int compno,
+    int level,
+    int orient,
+    int bpno,
+    int qmfbid,
+    double stepsize,
+    int numcomps,
+    int mct)
 {
-	double w1, w2, wmsedec;
-	if (qmfbid == 1) {
-		w1 = (mct && numcomps==3) ? mct_getnorm(compno) : 1.0;
-		w2 = dwt_getnorm(level, orient);
-	} else {			/* if (qmfbid == 0) */
-		w1 = (mct && numcomps==3) ? mct_getnorm_real(compno) : 1.0;
-		w2 = dwt_getnorm_real(level, orient);
-	}
-	wmsedec = w1 * w2 * stepsize * (1 << bpno);
-	wmsedec *= wmsedec * nmsedec / 8192.0;
-	
-	return wmsedec;
+    double w1, w2, wmsedec;
+    if (qmfbid == 1) {
+        w1 = (mct && numcomps==3) ? mct_getnorm(compno) : 1.0;
+        w2 = dwt_getnorm(level, orient);
+    } else {			/* if (qmfbid == 0) */
+        w1 = (mct && numcomps==3) ? mct_getnorm_real(compno) : 1.0;
+        w2 = dwt_getnorm_real(level, orient);
+    }
+    wmsedec = w1 * w2 * stepsize * (1 << bpno);
+    wmsedec *= wmsedec * nmsedec / 8192.0;
+
+    return wmsedec;
 }
 
 static opj_bool allocate_buffers(
-		opj_t1_t *t1,
-		int w,
-		int h)
+    opj_t1_t *t1,
+    int w,
+    int h)
 {
-	int datasize=w * h;
-	int flagssize;
-
-	if(datasize > t1->datasize){
-		opj_aligned_free(t1->data);
-		t1->data = (int*) opj_aligned_malloc(datasize * sizeof(int));
-		if(!t1->data){
-			return OPJ_FALSE;
-		}
-		t1->datasize=datasize;
-	}
-	memset(t1->data,0,datasize * sizeof(int));
-
-	t1->flags_stride=w+2;
-	flagssize=t1->flags_stride * (h+2);
-
-	if(flagssize > t1->flagssize){
-		opj_aligned_free(t1->flags);
-		t1->flags = (flag_t*) opj_aligned_malloc(flagssize * sizeof(flag_t));
-		if(!t1->flags){
-			return OPJ_FALSE;
-		}
-		t1->flagssize=flagssize;
-	}
-	memset(t1->flags,0,flagssize * sizeof(flag_t));
-
-	t1->w=w;
-	t1->h=h;
-
-	return OPJ_TRUE;
+    int datasize=w * h;
+    int flagssize;
+
+    if(datasize > t1->datasize) {
+        opj_aligned_free(t1->data);
+        t1->data = (int*) opj_aligned_malloc(datasize * sizeof(int));
+        if(!t1->data) {
+            return OPJ_FALSE;
+        }
+        t1->datasize=datasize;
+    }
+    memset(t1->data,0,datasize * sizeof(int));
+
+    t1->flags_stride=w+2;
+    flagssize=t1->flags_stride * (h+2);
+
+    if(flagssize > t1->flagssize) {
+        opj_aligned_free(t1->flags);
+        t1->flags = (flag_t*) opj_aligned_malloc(flagssize * sizeof(flag_t));
+        if(!t1->flags) {
+            return OPJ_FALSE;
+        }
+        t1->flagssize=flagssize;
+    }
+    memset(t1->flags,0,flagssize * sizeof(flag_t));
+
+    t1->w=w;
+    t1->h=h;
+
+    return OPJ_TRUE;
 }
 
 /** mod fixed_quality */
 static void t1_encode_cblk(
-		opj_t1_t *t1,
-		opj_tcd_cblk_enc_t* cblk,
-		int orient,
-		int compno,
-		int level,
-		int qmfbid,
-		double stepsize,
-		int cblksty,
-		int numcomps,
-		int mct,
-		opj_tcd_tile_t * tile)
+    opj_t1_t *t1,
+    opj_tcd_cblk_enc_t* cblk,
+    int orient,
+    int compno,
+    int level,
+    int qmfbid,
+    double stepsize,
+    int cblksty,
+    int numcomps,
+    int mct,
+    opj_tcd_tile_t * tile)
 {
-	double cumwmsedec = 0.0;
-
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-
-	int passno, bpno, passtype;
-	int nmsedec = 0;
-	int i, max;
-	char type = T1_TYPE_MQ;
-	double tempwmsedec;
-
-	max = 0;
-	for (i = 0; i < t1->w * t1->h; ++i) {
-		int tmp = abs(t1->data[i]);
-		max = int_max(max, tmp);
-	}
-
-	cblk->numbps = max ? (int_floorlog2(max) + 1) - T1_NMSEDEC_FRACBITS : 0;
-	
-	bpno = cblk->numbps - 1;
-	passtype = 2;
-	
-	mqc_resetstates(mqc);
-	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-	mqc_init_enc(mqc, cblk->data);
-	
-	for (passno = 0; bpno >= 0; ++passno) {
-		opj_tcd_pass_t *pass = &cblk->passes[passno];
-		int correction = 3;
-		type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
-		
-		switch (passtype) {
-			case 0:
-				t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
-				break;
-			case 1:
-				t1_enc_refpass(t1, bpno, &nmsedec, type, cblksty);
-				break;
-			case 2:
-				t1_enc_clnpass(t1, bpno, orient, &nmsedec, cblksty);
-				/* code switch SEGMARK (i.e. SEGSYM) */
-				if (cblksty & J2K_CCP_CBLKSTY_SEGSYM)
-					mqc_segmark_enc(mqc);
-				break;
-		}
-		
-		/* fixed_quality */
-		tempwmsedec = t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps, mct);
-		cumwmsedec += tempwmsedec;
-		tile->distotile += tempwmsedec;
-		
-		/* Code switch "RESTART" (i.e. TERMALL) */
-		if ((cblksty & J2K_CCP_CBLKSTY_TERMALL)	&& !((passtype == 2) && (bpno - 1 < 0))) {
-			if (type == T1_TYPE_RAW) {
-				mqc_flush(mqc);
-				correction = 1;
-				/* correction = mqc_bypass_flush_enc(); */
-			} else {			/* correction = mqc_restart_enc(); */
-				mqc_flush(mqc);
-				correction = 1;
-			}
-			pass->term = 1;
-		} else {
-			if (((bpno < (cblk->numbps - 4) && (passtype > 0)) 
-				|| ((bpno == (cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
-				if (type == T1_TYPE_RAW) {
-					mqc_flush(mqc);
-					correction = 1;
-					/* correction = mqc_bypass_flush_enc(); */
-				} else {		/* correction = mqc_restart_enc(); */
-					mqc_flush(mqc);
-					correction = 1;
-				}
-				pass->term = 1;
-			} else {
-				pass->term = 0;
-			}
-		}
-		
-		if (++passtype == 3) {
-			passtype = 0;
-			bpno--;
-		}
-		
-		if (pass->term && bpno > 0) {
-			type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
-			if (type == T1_TYPE_RAW)
-				mqc_bypass_init_enc(mqc);
-			else
-				mqc_restart_init_enc(mqc);
-		}
-		
-		pass->distortiondec = cumwmsedec;
-		pass->rate = mqc_numbytes(mqc) + correction;	/* FIXME */
-		
-		/* Code-switch "RESET" */
-		if (cblksty & J2K_CCP_CBLKSTY_RESET)
-			mqc_reset_enc(mqc);
-	}
-	
-	/* Code switch "ERTERM" (i.e. PTERM) */
-	if (cblksty & J2K_CCP_CBLKSTY_PTERM)
-		mqc_erterm_enc(mqc);
-	else /* Default coding */ if (!(cblksty & J2K_CCP_CBLKSTY_LAZY))
-		mqc_flush(mqc);
-	
-	cblk->totalpasses = passno;
-
-	for (passno = 0; passno<cblk->totalpasses; passno++) {
-		opj_tcd_pass_t *pass = &cblk->passes[passno];
-		if (pass->rate > mqc_numbytes(mqc))
-			pass->rate = mqc_numbytes(mqc);
-		/*Preventing generation of FF as last data byte of a pass*/
-		if((pass->rate>1) && (cblk->data[pass->rate - 1] == 0xFF)){
-			pass->rate--;
-		}
-		pass->len = pass->rate - (passno == 0 ? 0 : cblk->passes[passno - 1].rate);		
-	}
+    double cumwmsedec = 0.0;
+
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    int passno, bpno, passtype;
+    int nmsedec = 0;
+    int i, max;
+    char type = T1_TYPE_MQ;
+    double tempwmsedec;
+
+    max = 0;
+    for (i = 0; i < t1->w * t1->h; ++i) {
+        int tmp = abs(t1->data[i]);
+        max = int_max(max, tmp);
+    }
+
+    cblk->numbps = max ? (int_floorlog2(max) + 1) - T1_NMSEDEC_FRACBITS : 0;
+
+    bpno = cblk->numbps - 1;
+    passtype = 2;
+
+    mqc_resetstates(mqc);
+    mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+    mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+    mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+    mqc_init_enc(mqc, cblk->data);
+
+    for (passno = 0; bpno >= 0; ++passno) {
+        opj_tcd_pass_t *pass = &cblk->passes[passno];
+        int correction = 3;
+        type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
+
+        switch (passtype) {
+        case 0:
+            t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
+            break;
+        case 1:
+            t1_enc_refpass(t1, bpno, &nmsedec, type, cblksty);
+            break;
+        case 2:
+            t1_enc_clnpass(t1, bpno, orient, &nmsedec, cblksty);
+            /* code switch SEGMARK (i.e. SEGSYM) */
+            if (cblksty & J2K_CCP_CBLKSTY_SEGSYM)
+                mqc_segmark_enc(mqc);
+            break;
+        }
+
+        /* fixed_quality */
+        tempwmsedec = t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps, mct);
+        cumwmsedec += tempwmsedec;
+        tile->distotile += tempwmsedec;
+
+        /* Code switch "RESTART" (i.e. TERMALL) */
+        if ((cblksty & J2K_CCP_CBLKSTY_TERMALL)	&& !((passtype == 2) && (bpno - 1 < 0))) {
+            if (type == T1_TYPE_RAW) {
+                mqc_flush(mqc);
+                correction = 1;
+                /* correction = mqc_bypass_flush_enc(); */
+            } else {			/* correction = mqc_restart_enc(); */
+                mqc_flush(mqc);
+                correction = 1;
+            }
+            pass->term = 1;
+        } else {
+            if (((bpno < (cblk->numbps - 4) && (passtype > 0))
+                    || ((bpno == (cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
+                if (type == T1_TYPE_RAW) {
+                    mqc_flush(mqc);
+                    correction = 1;
+                    /* correction = mqc_bypass_flush_enc(); */
+                } else {		/* correction = mqc_restart_enc(); */
+                    mqc_flush(mqc);
+                    correction = 1;
+                }
+                pass->term = 1;
+            } else {
+                pass->term = 0;
+            }
+        }
+
+        if (++passtype == 3) {
+            passtype = 0;
+            bpno--;
+        }
+
+        if (pass->term && bpno > 0) {
+            type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
+            if (type == T1_TYPE_RAW)
+                mqc_bypass_init_enc(mqc);
+            else
+                mqc_restart_init_enc(mqc);
+        }
+
+        pass->distortiondec = cumwmsedec;
+        pass->rate = mqc_numbytes(mqc) + correction;	/* FIXME */
+
+        /* Code-switch "RESET" */
+        if (cblksty & J2K_CCP_CBLKSTY_RESET)
+            mqc_reset_enc(mqc);
+    }
+
+    /* Code switch "ERTERM" (i.e. PTERM) */
+    if (cblksty & J2K_CCP_CBLKSTY_PTERM)
+        mqc_erterm_enc(mqc);
+    else /* Default coding */ if (!(cblksty & J2K_CCP_CBLKSTY_LAZY))
+        mqc_flush(mqc);
+
+    cblk->totalpasses = passno;
+
+    for (passno = 0; passno<cblk->totalpasses; passno++) {
+        opj_tcd_pass_t *pass = &cblk->passes[passno];
+        if (pass->rate > mqc_numbytes(mqc))
+            pass->rate = mqc_numbytes(mqc);
+        /*Preventing generation of FF as last data byte of a pass*/
+        if((pass->rate>1) && (cblk->data[pass->rate - 1] == 0xFF)) {
+            pass->rate--;
+        }
+        pass->len = pass->rate - (passno == 0 ? 0 : cblk->passes[passno - 1].rate);
+    }
 }
 
 static void t1_decode_cblk(
-		opj_t1_t *t1,
-		opj_tcd_cblk_dec_t* cblk,
-		int orient,
-		int roishift,
-		int cblksty)
+    opj_t1_t *t1,
+    opj_tcd_cblk_dec_t* cblk,
+    int orient,
+    int roishift,
+    int cblksty)
 {
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-
-	int bpno, passtype;
-	int segno, passno;
-	char type = T1_TYPE_MQ; /* BYPASS mode */
-
-	if(!allocate_buffers(
-				t1,
-				cblk->x1 - cblk->x0,
-				cblk->y1 - cblk->y0))
-	{
-		return;
-	}
-
-	bpno = roishift + cblk->numbps - 1;
-	passtype = 2;
-	
-	mqc_resetstates(mqc);
-	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-	
-	for (segno = 0; segno < cblk->numsegs; ++segno) {
-		opj_tcd_seg_t *seg = &cblk->segs[segno];
-		
-		/* BYPASS mode */
-		type = ((bpno <= (cblk->numbps - 1) - 4) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
-		/* FIXME: slviewer gets here with a null pointer. Why? Partially downloaded and/or corrupt textures? */
-		if(seg->data == NULL){
-			continue;
-		}
-		if (type == T1_TYPE_RAW) {
-			raw_init_dec(raw, (*seg->data) + seg->dataindex, seg->len);
-		} else {
-			mqc_init_dec(mqc, (*seg->data) + seg->dataindex, seg->len);
-		}
-		
-		for (passno = 0; passno < seg->numpasses; ++passno) {
-			switch (passtype) {
-				case 0:
-					if (type == T1_TYPE_RAW) {
-						t1_dec_sigpass_raw(t1, bpno+1, orient, cblksty);
-					} else {
-						if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-							t1_dec_sigpass_mqc_vsc(t1, bpno+1, orient);
-						} else {
-							t1_dec_sigpass_mqc(t1, bpno+1, orient);
-						}
-					}
-					break;
-				case 1:
-					if (type == T1_TYPE_RAW) {
-						t1_dec_refpass_raw(t1, bpno+1, cblksty);
-					} else {
-						if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-							t1_dec_refpass_mqc_vsc(t1, bpno+1);
-						} else {
-							t1_dec_refpass_mqc(t1, bpno+1);
-						}
-					}
-					break;
-				case 2:
-					t1_dec_clnpass(t1, bpno+1, orient, cblksty);
-					break;
-			}
-			
-			if ((cblksty & J2K_CCP_CBLKSTY_RESET) && type == T1_TYPE_MQ) {
-				mqc_resetstates(mqc);
-				mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);				
-				mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-				mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-			}
-			if (++passtype == 3) {
-				passtype = 0;
-				bpno--;
-			}
-		}
-	}
+    opj_raw_t *raw = t1->raw;	/* RAW component */
+    opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+    int bpno, passtype;
+    int segno, passno;
+    char type = T1_TYPE_MQ; /* BYPASS mode */
+
+    if(!allocate_buffers(
+                t1,
+                cblk->x1 - cblk->x0,
+                cblk->y1 - cblk->y0)) {
+        return;
+    }
+
+    bpno = roishift + cblk->numbps - 1;
+    passtype = 2;
+
+    mqc_resetstates(mqc);
+    mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+    mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+    mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+
+    for (segno = 0; segno < cblk->numsegs; ++segno) {
+        opj_tcd_seg_t *seg = &cblk->segs[segno];
+
+        /* BYPASS mode */
+        type = ((bpno <= (cblk->numbps - 1) - 4) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
+        /* FIXME: slviewer gets here with a null pointer. Why? Partially downloaded and/or corrupt textures? */
+        if(seg->data == NULL) {
+            continue;
+        }
+        if (type == T1_TYPE_RAW) {
+            raw_init_dec(raw, (*seg->data) + seg->dataindex, seg->len);
+        } else {
+            mqc_init_dec(mqc, (*seg->data) + seg->dataindex, seg->len);
+        }
+
+        for (passno = 0; passno < seg->numpasses; ++passno) {
+            switch (passtype) {
+            case 0:
+                if (type == T1_TYPE_RAW) {
+                    t1_dec_sigpass_raw(t1, bpno+1, orient, cblksty);
+                } else {
+                    if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+                        t1_dec_sigpass_mqc_vsc(t1, bpno+1, orient);
+                    } else {
+                        t1_dec_sigpass_mqc(t1, bpno+1, orient);
+                    }
+                }
+                break;
+            case 1:
+                if (type == T1_TYPE_RAW) {
+                    t1_dec_refpass_raw(t1, bpno+1, cblksty);
+                } else {
+                    if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+                        t1_dec_refpass_mqc_vsc(t1, bpno+1);
+                    } else {
+                        t1_dec_refpass_mqc(t1, bpno+1);
+                    }
+                }
+                break;
+            case 2:
+                t1_dec_clnpass(t1, bpno+1, orient, cblksty);
+                break;
+            }
+
+            if ((cblksty & J2K_CCP_CBLKSTY_RESET) && type == T1_TYPE_MQ) {
+                mqc_resetstates(mqc);
+                mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+                mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+                mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+            }
+            if (++passtype == 3) {
+                passtype = 0;
+                bpno--;
+            }
+        }
+    }
 }
 
 /* ----------------------------------------------------------------------- */
 
-opj_t1_t* t1_create(opj_common_ptr cinfo) {
-	opj_t1_t *t1 = (opj_t1_t*) opj_malloc(sizeof(opj_t1_t));
-	if(!t1)
-		return NULL;
+opj_t1_t* t1_create(opj_common_ptr cinfo)
+{
+    opj_t1_t *t1 = (opj_t1_t*) opj_malloc(sizeof(opj_t1_t));
+    if(!t1)
+        return NULL;
 
-	t1->cinfo = cinfo;
-	/* create MQC and RAW handles */
-	t1->mqc = mqc_create();
-	t1->raw = raw_create();
+    t1->cinfo = cinfo;
+    /* create MQC and RAW handles */
+    t1->mqc = mqc_create();
+    t1->raw = raw_create();
 
-	t1->data=NULL;
-	t1->flags=NULL;
-	t1->datasize=0;
-	t1->flagssize=0;
+    t1->data=NULL;
+    t1->flags=NULL;
+    t1->datasize=0;
+    t1->flagssize=0;
 
-	return t1;
+    return t1;
 }
 
-void t1_destroy(opj_t1_t *t1) {
-	if(t1) {
-		/* destroy MQC and RAW handles */
-		mqc_destroy(t1->mqc);
-		raw_destroy(t1->raw);
-		opj_aligned_free(t1->data);
-		opj_aligned_free(t1->flags);
-		opj_free(t1);
-	}
+void t1_destroy(opj_t1_t *t1)
+{
+    if(t1) {
+        /* destroy MQC and RAW handles */
+        mqc_destroy(t1->mqc);
+        raw_destroy(t1->raw);
+        opj_aligned_free(t1->data);
+        opj_aligned_free(t1->flags);
+        opj_free(t1);
+    }
 }
 
 void t1_encode_cblks(
-		opj_t1_t *t1,
-		opj_tcd_tile_t *tile,
-		opj_tcp_t *tcp)
+    opj_t1_t *t1,
+    opj_tcd_tile_t *tile,
+    opj_tcp_t *tcp)
 {
-	int compno, resno, bandno, precno, cblkno;
-
-	tile->distotile = 0;		/* fixed_quality */
-
-	for (compno = 0; compno < tile->numcomps; ++compno) {
-		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
-		opj_tccp_t* tccp = &tcp->tccps[compno];
-		int tile_w = tilec->x1 - tilec->x0;
-
-		for (resno = 0; resno < tilec->numresolutions; ++resno) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-			for (bandno = 0; bandno < res->numbands; ++bandno) {
-				opj_tcd_band_t* restrict band = &res->bands[bandno];
-        int bandconst = 8192 * 8192 / ((int) floor(band->stepsize * 8192));
-
-				for (precno = 0; precno < res->pw * res->ph; ++precno) {
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) {
-						opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-						int* restrict datap;
-						int* restrict tiledp;
-						int cblk_w;
-						int cblk_h;
-						int i, j;
-
-						int x = cblk->x0 - band->x0;
-						int y = cblk->y0 - band->y0;
-						if (band->bandno & 1) {
-							opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
-							x += pres->x1 - pres->x0;
-						}
-						if (band->bandno & 2) {
-							opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
-							y += pres->y1 - pres->y0;
-						}
-
-						if(!allocate_buffers(
-									t1,
-									cblk->x1 - cblk->x0,
-									cblk->y1 - cblk->y0))
-						{
-							return;
-						}
-
-						datap=t1->data;
-						cblk_w = t1->w;
-						cblk_h = t1->h;
-
-						tiledp=&tilec->data[(y * tile_w) + x];
-						if (tccp->qmfbid == 1) {
-							for (j = 0; j < cblk_h; ++j) {
-								for (i = 0; i < cblk_w; ++i) {
-									int tmp = tiledp[(j * tile_w) + i];
-									datap[(j * cblk_w) + i] = tmp << T1_NMSEDEC_FRACBITS;
-								}
-							}
-						} else {		/* if (tccp->qmfbid == 0) */
-							for (j = 0; j < cblk_h; ++j) {
-								for (i = 0; i < cblk_w; ++i) {
-									int tmp = tiledp[(j * tile_w) + i];
-									datap[(j * cblk_w) + i] =
-										fix_mul(
-										tmp,
-										bandconst) >> (11 - T1_NMSEDEC_FRACBITS);
-								}
-							}
-						}
-
-						t1_encode_cblk(
-								t1,
-								cblk,
-								band->bandno,
-								compno,
-								tilec->numresolutions - 1 - resno,
-								tccp->qmfbid,
-								band->stepsize,
-								tccp->cblksty,
-								tile->numcomps,
-								tcp->mct,
-								tile);
-
-					} /* cblkno */
-				} /* precno */
-			} /* bandno */
-		} /* resno  */
-	} /* compno  */
+    int compno, resno, bandno, precno, cblkno;
+
+    tile->distotile = 0;		/* fixed_quality */
+
+    for (compno = 0; compno < tile->numcomps; ++compno) {
+        opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
+        opj_tccp_t* tccp = &tcp->tccps[compno];
+        int tile_w = tilec->x1 - tilec->x0;
+
+        for (resno = 0; resno < tilec->numresolutions; ++resno) {
+            opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+            for (bandno = 0; bandno < res->numbands; ++bandno) {
+                opj_tcd_band_t* restrict band = &res->bands[bandno];
+                int bandconst = 8192 * 8192 / ((int) floor(band->stepsize * 8192));
+
+                for (precno = 0; precno < res->pw * res->ph; ++precno) {
+                    opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+                    for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) {
+                        opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+                        int* restrict datap;
+                        int* restrict tiledp;
+                        int cblk_w;
+                        int cblk_h;
+                        int i, j;
+
+                        int x = cblk->x0 - band->x0;
+                        int y = cblk->y0 - band->y0;
+                        if (band->bandno & 1) {
+                            opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
+                            x += pres->x1 - pres->x0;
+                        }
+                        if (band->bandno & 2) {
+                            opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
+                            y += pres->y1 - pres->y0;
+                        }
+
+                        if(!allocate_buffers(
+                                    t1,
+                                    cblk->x1 - cblk->x0,
+                                    cblk->y1 - cblk->y0)) {
+                            return;
+                        }
+
+                        datap=t1->data;
+                        cblk_w = t1->w;
+                        cblk_h = t1->h;
+
+                        tiledp=&tilec->data[(y * tile_w) + x];
+                        if (tccp->qmfbid == 1) {
+                            for (j = 0; j < cblk_h; ++j) {
+                                for (i = 0; i < cblk_w; ++i) {
+                                    int tmp = tiledp[(j * tile_w) + i];
+                                    datap[(j * cblk_w) + i] = tmp << T1_NMSEDEC_FRACBITS;
+                                }
+                            }
+                        } else {		/* if (tccp->qmfbid == 0) */
+                            for (j = 0; j < cblk_h; ++j) {
+                                for (i = 0; i < cblk_w; ++i) {
+                                    int tmp = tiledp[(j * tile_w) + i];
+                                    datap[(j * cblk_w) + i] =
+                                        fix_mul(
+                                            tmp,
+                                            bandconst) >> (11 - T1_NMSEDEC_FRACBITS);
+                                }
+                            }
+                        }
+
+                        t1_encode_cblk(
+                            t1,
+                            cblk,
+                            band->bandno,
+                            compno,
+                            tilec->numresolutions - 1 - resno,
+                            tccp->qmfbid,
+                            band->stepsize,
+                            tccp->cblksty,
+                            tile->numcomps,
+                            tcp->mct,
+                            tile);
+
+                    } /* cblkno */
+                } /* precno */
+            } /* bandno */
+        } /* resno  */
+    } /* compno  */
 }
 
 void t1_decode_cblks(
-		opj_t1_t* t1,
-		opj_tcd_tilecomp_t* tilec,
-		opj_tccp_t* tccp)
+    opj_t1_t* t1,
+    opj_tcd_tilecomp_t* tilec,
+    opj_tccp_t* tccp)
 {
-	int resno, bandno, precno, cblkno;
-
-	int tile_w = tilec->x1 - tilec->x0;
-
-	for (resno = 0; resno < tilec->numresolutions; ++resno) {
-		opj_tcd_resolution_t* res = &tilec->resolutions[resno];
-
-		for (bandno = 0; bandno < res->numbands; ++bandno) {
-			opj_tcd_band_t* restrict band = &res->bands[bandno];
-
-			for (precno = 0; precno < res->pw * res->ph; ++precno) {
-				opj_tcd_precinct_t* precinct = &band->precincts[precno];
-
-				for (cblkno = 0; cblkno < precinct->cw * precinct->ch; ++cblkno) {
-					opj_tcd_cblk_dec_t* cblk = &precinct->cblks.dec[cblkno];
-					int* restrict datap;
-					int cblk_w, cblk_h;
-					int x, y;
-					int i, j;
-
-					t1_decode_cblk(
-							t1,
-							cblk,
-							band->bandno,
-							tccp->roishift,
-							tccp->cblksty);
-
-					x = cblk->x0 - band->x0;
-					y = cblk->y0 - band->y0;
-					if (band->bandno & 1) {
-						opj_tcd_resolution_t* pres = &tilec->resolutions[resno - 1];
-						x += pres->x1 - pres->x0;
-					}
-					if (band->bandno & 2) {
-						opj_tcd_resolution_t* pres = &tilec->resolutions[resno - 1];
-						y += pres->y1 - pres->y0;
-					}
-
-					datap=t1->data;
-					cblk_w = t1->w;
-					cblk_h = t1->h;
-
-					if (tccp->roishift) {
-						int thresh = 1 << tccp->roishift;
-						for (j = 0; j < cblk_h; ++j) {
-							for (i = 0; i < cblk_w; ++i) {
-								int val = datap[(j * cblk_w) + i];
-								int mag = abs(val);
-								if (mag >= thresh) {
-									mag >>= tccp->roishift;
-									datap[(j * cblk_w) + i] = val < 0 ? -mag : mag;
-								}
-							}
-						}
-					}
-
-					if (tccp->qmfbid == 1) {
-						int* restrict tiledp = &tilec->data[(y * tile_w) + x];
-						for (j = 0; j < cblk_h; ++j) {
-							for (i = 0; i < cblk_w; ++i) {
-								int tmp = datap[(j * cblk_w) + i];
-								((int*)tiledp)[(j * tile_w) + i] = tmp / 2;
-							}
-						}
-					} else {		/* if (tccp->qmfbid == 0) */
-						float* restrict tiledp = (float*) &tilec->data[(y * tile_w) + x];
-						for (j = 0; j < cblk_h; ++j) {
-							float* restrict tiledp2 = tiledp;
-							for (i = 0; i < cblk_w; ++i) {
-								float tmp = *datap * band->stepsize;
-								*tiledp2 = tmp;
-								datap++;
-								tiledp2++;
-							}
-							tiledp += tile_w;
-						}
-					}
-					opj_free(cblk->data);
-					opj_free(cblk->segs);
-				} /* cblkno */
-				opj_free(precinct->cblks.dec);
+    int resno, bandno, precno, cblkno;
+
+    int tile_w = tilec->x1 - tilec->x0;
+
+    for (resno = 0; resno < tilec->numresolutions; ++resno) {
+        opj_tcd_resolution_t* res = &tilec->resolutions[resno];
+
+        for (bandno = 0; bandno < res->numbands; ++bandno) {
+            opj_tcd_band_t* restrict band = &res->bands[bandno];
+
+            for (precno = 0; precno < res->pw * res->ph; ++precno) {
+                opj_tcd_precinct_t* precinct = &band->precincts[precno];
+
+                for (cblkno = 0; cblkno < precinct->cw * precinct->ch; ++cblkno) {
+                    opj_tcd_cblk_dec_t* cblk = &precinct->cblks.dec[cblkno];
+                    int* restrict datap;
+                    int cblk_w, cblk_h;
+                    int x, y;
+                    int i, j;
+
+                    t1_decode_cblk(
+                        t1,
+                        cblk,
+                        band->bandno,
+                        tccp->roishift,
+                        tccp->cblksty);
+
+                    x = cblk->x0 - band->x0;
+                    y = cblk->y0 - band->y0;
+                    if (band->bandno & 1) {
+                        opj_tcd_resolution_t* pres = &tilec->resolutions[resno - 1];
+                        x += pres->x1 - pres->x0;
+                    }
+                    if (band->bandno & 2) {
+                        opj_tcd_resolution_t* pres = &tilec->resolutions[resno - 1];
+                        y += pres->y1 - pres->y0;
+                    }
+
+                    datap=t1->data;
+                    cblk_w = t1->w;
+                    cblk_h = t1->h;
+
+                    if (tccp->roishift) {
+                        int thresh = 1 << tccp->roishift;
+                        for (j = 0; j < cblk_h; ++j) {
+                            for (i = 0; i < cblk_w; ++i) {
+                                int val = datap[(j * cblk_w) + i];
+                                int mag = abs(val);
+                                if (mag >= thresh) {
+                                    mag >>= tccp->roishift;
+                                    datap[(j * cblk_w) + i] = val < 0 ? -mag : mag;
+                                }
+                            }
+                        }
+                    }
+
+                    if (tccp->qmfbid == 1) {
+                        int* restrict tiledp = &tilec->data[(y * tile_w) + x];
+                        for (j = 0; j < cblk_h; ++j) {
+                            for (i = 0; i < cblk_w; ++i) {
+                                int tmp = datap[(j * cblk_w) + i];
+                                ((int*)tiledp)[(j * tile_w) + i] = tmp / 2;
+                            }
+                        }
+                    } else {		/* if (tccp->qmfbid == 0) */
+                        float* restrict tiledp = (float*) &tilec->data[(y * tile_w) + x];
+                        for (j = 0; j < cblk_h; ++j) {
+                            float* restrict tiledp2 = tiledp;
+                            for (i = 0; i < cblk_w; ++i) {
+                                float tmp = *datap * band->stepsize;
+                                *tiledp2 = tmp;
+                                datap++;
+                                tiledp2++;
+                            }
+                            tiledp += tile_w;
+                        }
+                    }
+                    opj_free(cblk->data);
+                    opj_free(cblk->segs);
+                } /* cblkno */
+                opj_free(precinct->cblks.dec);
                 precinct->cblks.dec = NULL;
-			} /* precno */
-		} /* bandno */
-	} /* resno */
+            } /* precno */
+        } /* bandno */
+    } /* resno */
 }
 
diff --git a/src/lib/openmj2/t1.h b/src/lib/openmj2/t1.h
index ac39e45c..658d2ebc 100644
--- a/src/lib/openmj2/t1.h
+++ b/src/lib/openmj2/t1.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -97,21 +97,21 @@ typedef short flag_t;
 Tier-1 coding (coding of code-block coefficients)
 */
 typedef struct opj_t1 {
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** MQC component */
-	opj_mqc_t *mqc;
-	/** RAW component */
-	opj_raw_t *raw;
-
-	int *data;
-	flag_t *flags;
-	int w;
-	int h;
-	int datasize;
-	int flagssize;
-	int flags_stride;
+    /** codec context */
+    opj_common_ptr cinfo;
+
+    /** MQC component */
+    opj_mqc_t *mqc;
+    /** RAW component */
+    opj_raw_t *raw;
+
+    int *data;
+    flag_t *flags;
+    int w;
+    int h;
+    int datasize;
+    int flagssize;
+    int flags_stride;
 } opj_t1_t;
 
 #define MACRO_t1_flags(x,y) t1->flags[((x)*(t1->flags_stride))+(y)]
@@ -120,7 +120,7 @@ typedef struct opj_t1 {
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
-Create a new T1 handle 
+Create a new T1 handle
 and initialize the look-up tables of the Tier-1 coder/decoder
 @return Returns a new T1 handle if successful, returns NULL otherwise
 @see t1_init_luts
diff --git a/src/lib/openmj2/t1_luts.h b/src/lib/openmj2/t1_luts.h
index e5e33f66..278a594c 100644
--- a/src/lib/openmj2/t1_luts.h
+++ b/src/lib/openmj2/t1_luts.h
@@ -1,143 +1,143 @@
 /* This file was automatically generated by t1_generate_luts.c */
 
 static char lut_ctxno_zc[1024] = {
-  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  0, 3, 3, 6, 3, 6, 6, 8, 3, 6, 6, 8, 6, 8, 8, 8, 1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 
-  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8
+    0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    0, 3, 3, 6, 3, 6, 6, 8, 3, 6, 6, 8, 6, 8, 8, 8, 1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8,
+    1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8,
+    1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8,
+    2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8,
+    1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8,
+    2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8,
+    2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8,
+    2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8
 };
 
 static char lut_ctxno_sc[256] = {
-  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd
+    0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd,
+    0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc,
+    0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa,
+    0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9,
+    0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc,
+    0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb,
+    0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9,
+    0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa,
+    0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa,
+    0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9,
+    0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb,
+    0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc,
+    0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9,
+    0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa,
+    0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc,
+    0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd
 };
 
 static char lut_spb[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 
-  0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 
-  0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 
-  0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 
-  0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0,
+    0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0,
+    0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1,
+    0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 };
 
 static short lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0180, 0x0300, 0x0480, 0x0600, 0x0780, 0x0900, 0x0a80, 
-  0x0c00, 0x0d80, 0x0f00, 0x1080, 0x1200, 0x1380, 0x1500, 0x1680, 
-  0x1800, 0x1980, 0x1b00, 0x1c80, 0x1e00, 0x1f80, 0x2100, 0x2280, 
-  0x2400, 0x2580, 0x2700, 0x2880, 0x2a00, 0x2b80, 0x2d00, 0x2e80, 
-  0x3000, 0x3180, 0x3300, 0x3480, 0x3600, 0x3780, 0x3900, 0x3a80, 
-  0x3c00, 0x3d80, 0x3f00, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680, 
-  0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5100, 0x5280, 
-  0x5400, 0x5580, 0x5700, 0x5880, 0x5a00, 0x5b80, 0x5d00, 0x5e80, 
-  0x6000, 0x6180, 0x6300, 0x6480, 0x6600, 0x6780, 0x6900, 0x6a80, 
-  0x6c00, 0x6d80, 0x6f00, 0x7080, 0x7200, 0x7380, 0x7500, 0x7680
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0180, 0x0300, 0x0480, 0x0600, 0x0780, 0x0900, 0x0a80,
+    0x0c00, 0x0d80, 0x0f00, 0x1080, 0x1200, 0x1380, 0x1500, 0x1680,
+    0x1800, 0x1980, 0x1b00, 0x1c80, 0x1e00, 0x1f80, 0x2100, 0x2280,
+    0x2400, 0x2580, 0x2700, 0x2880, 0x2a00, 0x2b80, 0x2d00, 0x2e80,
+    0x3000, 0x3180, 0x3300, 0x3480, 0x3600, 0x3780, 0x3900, 0x3a80,
+    0x3c00, 0x3d80, 0x3f00, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680,
+    0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5100, 0x5280,
+    0x5400, 0x5580, 0x5700, 0x5880, 0x5a00, 0x5b80, 0x5d00, 0x5e80,
+    0x6000, 0x6180, 0x6300, 0x6480, 0x6600, 0x6780, 0x6900, 0x6a80,
+    0x6c00, 0x6d80, 0x6f00, 0x7080, 0x7200, 0x7380, 0x7500, 0x7680
 };
 
 static short lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080, 
-  0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200, 
-  0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400, 
-  0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
-  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00, 
-  0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180, 
-  0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780, 
-  0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00, 
-  0x2000, 0x2100, 0x2200, 0x2300, 0x2400, 0x2500, 0x2680, 0x2780, 
-  0x2880, 0x2980, 0x2b00, 0x2c00, 0x2d00, 0x2e80, 0x2f80, 0x3100, 
-  0x3200, 0x3380, 0x3480, 0x3600, 0x3700, 0x3880, 0x3a00, 0x3b00, 
-  0x3c80, 0x3e00, 0x3f80, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680, 
-  0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5180, 0x5300, 
-  0x5480, 0x5600, 0x5800, 0x5980, 0x5b00, 0x5d00, 0x5e80, 0x6080, 
-  0x6200, 0x6400, 0x6580, 0x6780, 0x6900, 0x6b00, 0x6d00, 0x6e80, 
-  0x7080, 0x7280, 0x7480, 0x7600, 0x7800, 0x7a00, 0x7c00, 0x7e00
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080,
+    0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200,
+    0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400,
+    0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780,
+    0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00,
+    0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180,
+    0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780,
+    0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00,
+    0x2000, 0x2100, 0x2200, 0x2300, 0x2400, 0x2500, 0x2680, 0x2780,
+    0x2880, 0x2980, 0x2b00, 0x2c00, 0x2d00, 0x2e80, 0x2f80, 0x3100,
+    0x3200, 0x3380, 0x3480, 0x3600, 0x3700, 0x3880, 0x3a00, 0x3b00,
+    0x3c80, 0x3e00, 0x3f80, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680,
+    0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5180, 0x5300,
+    0x5480, 0x5600, 0x5800, 0x5980, 0x5b00, 0x5d00, 0x5e80, 0x6080,
+    0x6200, 0x6400, 0x6580, 0x6780, 0x6900, 0x6b00, 0x6d00, 0x6e80,
+    0x7080, 0x7280, 0x7480, 0x7600, 0x7800, 0x7a00, 0x7c00, 0x7e00
 };
 
 static short lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {
-  0x1800, 0x1780, 0x1700, 0x1680, 0x1600, 0x1580, 0x1500, 0x1480, 
-  0x1400, 0x1380, 0x1300, 0x1280, 0x1200, 0x1180, 0x1100, 0x1080, 
-  0x1000, 0x0f80, 0x0f00, 0x0e80, 0x0e00, 0x0d80, 0x0d00, 0x0c80, 
-  0x0c00, 0x0b80, 0x0b00, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880, 
-  0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0500, 0x0480, 
-  0x0400, 0x0380, 0x0300, 0x0280, 0x0200, 0x0180, 0x0100, 0x0080, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380, 
-  0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
-  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b00, 0x0b80, 
-  0x0c00, 0x0c80, 0x0d00, 0x0d80, 0x0e00, 0x0e80, 0x0f00, 0x0f80, 
-  0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380, 
-  0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780
+    0x1800, 0x1780, 0x1700, 0x1680, 0x1600, 0x1580, 0x1500, 0x1480,
+    0x1400, 0x1380, 0x1300, 0x1280, 0x1200, 0x1180, 0x1100, 0x1080,
+    0x1000, 0x0f80, 0x0f00, 0x0e80, 0x0e00, 0x0d80, 0x0d00, 0x0c80,
+    0x0c00, 0x0b80, 0x0b00, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880,
+    0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0500, 0x0480,
+    0x0400, 0x0380, 0x0300, 0x0280, 0x0200, 0x0180, 0x0100, 0x0080,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380,
+    0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780,
+    0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b00, 0x0b80,
+    0x0c00, 0x0c80, 0x0d00, 0x0d80, 0x0e00, 0x0e80, 0x0f00, 0x0f80,
+    0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380,
+    0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780
 };
 
 static short lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {
-  0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x1b00, 0x1a80, 0x1980, 
-  0x1880, 0x1780, 0x1700, 0x1600, 0x1500, 0x1480, 0x1380, 0x1300, 
-  0x1200, 0x1180, 0x1080, 0x1000, 0x0f00, 0x0e80, 0x0e00, 0x0d00, 
-  0x0c80, 0x0c00, 0x0b80, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880, 
-  0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0580, 0x0500, 
-  0x0480, 0x0400, 0x0400, 0x0380, 0x0300, 0x0300, 0x0280, 0x0280, 
-  0x0200, 0x0200, 0x0180, 0x0180, 0x0100, 0x0100, 0x0100, 0x0080, 
-  0x0080, 0x0080, 0x0080, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080, 
-  0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200, 
-  0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400, 
-  0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
-  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00, 
-  0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180, 
-  0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780, 
-  0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00
+    0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x1b00, 0x1a80, 0x1980,
+    0x1880, 0x1780, 0x1700, 0x1600, 0x1500, 0x1480, 0x1380, 0x1300,
+    0x1200, 0x1180, 0x1080, 0x1000, 0x0f00, 0x0e80, 0x0e00, 0x0d00,
+    0x0c80, 0x0c00, 0x0b80, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880,
+    0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0580, 0x0500,
+    0x0480, 0x0400, 0x0400, 0x0380, 0x0300, 0x0300, 0x0280, 0x0280,
+    0x0200, 0x0200, 0x0180, 0x0180, 0x0100, 0x0100, 0x0100, 0x0080,
+    0x0080, 0x0080, 0x0080, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080,
+    0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200,
+    0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400,
+    0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780,
+    0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00,
+    0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180,
+    0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780,
+    0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00
 };
 
diff --git a/src/lib/openmj2/t2.c b/src/lib/openmj2/t2.c
index 9762762f..530a9c88 100644
--- a/src/lib/openmj2/t2.c
+++ b/src/lib/openmj2/t2.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -59,9 +59,9 @@ Encode a packet of a tile to a destination buffer
 @param pi Packet identity
 @param dest Destination buffer
 @param len Length of the destination buffer
-@param cstr_info Codestream information structure 
+@param cstr_info Codestream information structure
 @param tileno Number of the tile encoded
-@return 
+@return
 */
 static int t2_encode_packet(opj_tcd_tile_t *tile, opj_tcp_t *tcp, opj_pi_iterator_t *pi, unsigned char *dest, int len, opj_codestream_info_t *cstr_info, int tileno);
 /**
@@ -80,10 +80,10 @@ Decode a packet of a tile from a source buffer
 @param tcp Tile coding parameters
 @param pi Packet identity
 @param pack_info Packet information
-@return 
+@return
 */
-static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *tile, 
-														opj_tcp_t *tcp, opj_pi_iterator_t *pi, opj_packet_info_t *pack_info);
+static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *tile,
+                            opj_tcp_t *tcp, opj_pi_iterator_t *pi, opj_packet_info_t *pack_info);
 
 /*@}*/
 
@@ -93,733 +93,738 @@ static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_t
 
 /* #define RESTART 0x04 */
 
-static void t2_putcommacode(opj_bio_t *bio, int n) {
-	while (--n >= 0) {
-		bio_write(bio, 1, 1);
-	}
-	bio_write(bio, 0, 1);
+static void t2_putcommacode(opj_bio_t *bio, int n)
+{
+    while (--n >= 0) {
+        bio_write(bio, 1, 1);
+    }
+    bio_write(bio, 0, 1);
 }
 
-static int t2_getcommacode(opj_bio_t *bio) {
-	int n;
-	for (n = 0; bio_read(bio, 1); n++) {
-		;
-	}
-	return n;
+static int t2_getcommacode(opj_bio_t *bio)
+{
+    int n;
+    for (n = 0; bio_read(bio, 1); n++) {
+        ;
+    }
+    return n;
 }
 
-static void t2_putnumpasses(opj_bio_t *bio, int n) {
-	if (n == 1) {
-		bio_write(bio, 0, 1);
-	} else if (n == 2) {
-		bio_write(bio, 2, 2);
-	} else if (n <= 5) {
-		bio_write(bio, 0xc | (n - 3), 4);
-	} else if (n <= 36) {
-		bio_write(bio, 0x1e0 | (n - 6), 9);
-	} else if (n <= 164) {
-		bio_write(bio, 0xff80 | (n - 37), 16);
-	}
+static void t2_putnumpasses(opj_bio_t *bio, int n)
+{
+    if (n == 1) {
+        bio_write(bio, 0, 1);
+    } else if (n == 2) {
+        bio_write(bio, 2, 2);
+    } else if (n <= 5) {
+        bio_write(bio, 0xc | (n - 3), 4);
+    } else if (n <= 36) {
+        bio_write(bio, 0x1e0 | (n - 6), 9);
+    } else if (n <= 164) {
+        bio_write(bio, 0xff80 | (n - 37), 16);
+    }
 }
 
-static int t2_getnumpasses(opj_bio_t *bio) {
-	int n;
-	if (!bio_read(bio, 1))
-		return 1;
-	if (!bio_read(bio, 1))
-		return 2;
-	if ((n = bio_read(bio, 2)) != 3)
-		return (3 + n);
-	if ((n = bio_read(bio, 5)) != 31)
-		return (6 + n);
-	return (37 + bio_read(bio, 7));
+static int t2_getnumpasses(opj_bio_t *bio)
+{
+    int n;
+    if (!bio_read(bio, 1))
+        return 1;
+    if (!bio_read(bio, 1))
+        return 2;
+    if ((n = bio_read(bio, 2)) != 3)
+        return (3 + n);
+    if ((n = bio_read(bio, 5)) != 31)
+        return (6 + n);
+    return (37 + bio_read(bio, 7));
 }
 
-static int t2_encode_packet(opj_tcd_tile_t * tile, opj_tcp_t * tcp, opj_pi_iterator_t *pi, unsigned char *dest, int length, opj_codestream_info_t *cstr_info, int tileno) {
-	int bandno, cblkno;
-	unsigned char *c = dest;
-
-	int compno = pi->compno;	/* component value */
-	int resno  = pi->resno;		/* resolution level value */
-	int precno = pi->precno;	/* precinct value */
-	int layno  = pi->layno;		/* quality layer value */
-
-	opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-	opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-	
-	opj_bio_t *bio = NULL;	/* BIO component */
-	
-	/* <SOP 0xff91> */
-	if (tcp->csty & J2K_CP_CSTY_SOP) {
-		c[0] = 255;
-		c[1] = 145;
-		c[2] = 0;
-		c[3] = 4;
-		c[4] = (unsigned char)((tile->packno % 65536) / 256);
-		c[5] = (unsigned char)((tile->packno % 65536) % 256);
-		c += 6;
-	}
-	/* </SOP> */
-	
-	if (!layno) {
-		for (bandno = 0; bandno < res->numbands; bandno++) {
-			opj_tcd_band_t *band = &res->bands[bandno];
-			opj_tcd_precinct_t *prc = &band->precincts[precno];
-			tgt_reset(prc->incltree);
-			tgt_reset(prc->imsbtree);
-			for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-				opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-				cblk->numpasses = 0;
-				tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
-			}
-		}
-	}
-	
-	bio = bio_create();
-	bio_init_enc(bio, c, length);
-	bio_write(bio, 1, 1);		/* Empty header bit */
-	
-	/* Writing Packet header */
-	for (bandno = 0; bandno < res->numbands; bandno++) {
-		opj_tcd_band_t *band = &res->bands[bandno];
-		opj_tcd_precinct_t *prc = &band->precincts[precno];
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-			opj_tcd_layer_t *layer = &cblk->layers[layno];
-			if (!cblk->numpasses && layer->numpasses) {
-				tgt_setvalue(prc->incltree, cblkno, layno);
-			}
-		}
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-			opj_tcd_layer_t *layer = &cblk->layers[layno];
-			int increment = 0;
-			int nump = 0;
-			int len = 0, passno;
-			/* cblk inclusion bits */
-			if (!cblk->numpasses) {
-				tgt_encode(bio, prc->incltree, cblkno, layno + 1);
-			} else {
-				bio_write(bio, layer->numpasses != 0, 1);
-			}
-			/* if cblk not included, go to the next cblk  */
-			if (!layer->numpasses) {
-				continue;
-			}
-			/* if first instance of cblk --> zero bit-planes information */
-			if (!cblk->numpasses) {
-				cblk->numlenbits = 3;
-				tgt_encode(bio, prc->imsbtree, cblkno, 999);
-			}
-			/* number of coding passes included */
-			t2_putnumpasses(bio, layer->numpasses);
-			
-			/* computation of the increase of the length indicator and insertion in the header     */
-			for (passno = cblk->numpasses; passno < cblk->numpasses + layer->numpasses; passno++) {
-				opj_tcd_pass_t *pass = &cblk->passes[passno];
-				nump++;
-				len += pass->len;
-				if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
-					increment = int_max(increment, int_floorlog2(len) + 1 - (cblk->numlenbits + int_floorlog2(nump)));
-					len = 0;
-					nump = 0;
-				}
-			}
-			t2_putcommacode(bio, increment);
-
-			/* computation of the new Length indicator */
-			cblk->numlenbits += increment;
-
-			/* insertion of the codeword segment length */
-			for (passno = cblk->numpasses; passno < cblk->numpasses + layer->numpasses; passno++) {
-				opj_tcd_pass_t *pass = &cblk->passes[passno];
-				nump++;
-				len += pass->len;
-				if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
-					bio_write(bio, len, cblk->numlenbits + int_floorlog2(nump));
-					len = 0;
-					nump = 0;
-				}
-			}
-		}
-	}
-
-	if (bio_flush(bio)) {
-		bio_destroy(bio);
-		return -999;		/* modified to eliminate longjmp !! */
-	}
-
-	c += bio_numbytes(bio);
-	bio_destroy(bio);
-	
-	/* <EPH 0xff92> */
-	if (tcp->csty & J2K_CP_CSTY_EPH) {
-		c[0] = 255;
-		c[1] = 146;
-		c += 2;
-	}
-	/* </EPH> */
-
-	/* << INDEX */
-	/* End of packet header position. Currently only represents the distance to start of packet
-	// Will be updated later by incrementing with packet start value */
-	if(cstr_info && cstr_info->index_write) {
-		opj_packet_info_t *info_PK = &cstr_info->tile[tileno].packet[cstr_info->packno];
-		info_PK->end_ph_pos = (int)(c - dest);
-	}
-	/* INDEX >> */
-	
-	/* Writing the packet body */
-	
-	for (bandno = 0; bandno < res->numbands; bandno++) {
-		opj_tcd_band_t *band = &res->bands[bandno];
-		opj_tcd_precinct_t *prc = &band->precincts[precno];
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-			opj_tcd_layer_t *layer = &cblk->layers[layno];
-			if (!layer->numpasses) {
-				continue;
-			}
-			if (c + layer->len > dest + length) {
-				return -999;
-			}
-			
-			memcpy(c, layer->data, layer->len);
-			cblk->numpasses += layer->numpasses;
-			c += layer->len;
-			/* << INDEX */ 
-			if(cstr_info && cstr_info->index_write) {
-				opj_packet_info_t *info_PK = &cstr_info->tile[tileno].packet[cstr_info->packno];
-				info_PK->disto += layer->disto;
-				if (cstr_info->D_max < info_PK->disto) {
-					cstr_info->D_max = info_PK->disto;
-				}
-			}
-			/* INDEX >> */
-		}
-	}
-	
-	return (c - dest);
+static int t2_encode_packet(opj_tcd_tile_t * tile, opj_tcp_t * tcp, opj_pi_iterator_t *pi, unsigned char *dest, int length, opj_codestream_info_t *cstr_info, int tileno)
+{
+    int bandno, cblkno;
+    unsigned char *c = dest;
+
+    int compno = pi->compno;	/* component value */
+    int resno  = pi->resno;		/* resolution level value */
+    int precno = pi->precno;	/* precinct value */
+    int layno  = pi->layno;		/* quality layer value */
+
+    opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+    opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+    opj_bio_t *bio = NULL;	/* BIO component */
+
+    /* <SOP 0xff91> */
+    if (tcp->csty & J2K_CP_CSTY_SOP) {
+        c[0] = 255;
+        c[1] = 145;
+        c[2] = 0;
+        c[3] = 4;
+        c[4] = (unsigned char)((tile->packno % 65536) / 256);
+        c[5] = (unsigned char)((tile->packno % 65536) % 256);
+        c += 6;
+    }
+    /* </SOP> */
+
+    if (!layno) {
+        for (bandno = 0; bandno < res->numbands; bandno++) {
+            opj_tcd_band_t *band = &res->bands[bandno];
+            opj_tcd_precinct_t *prc = &band->precincts[precno];
+            tgt_reset(prc->incltree);
+            tgt_reset(prc->imsbtree);
+            for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+                cblk->numpasses = 0;
+                tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
+            }
+        }
+    }
+
+    bio = bio_create();
+    bio_init_enc(bio, c, length);
+    bio_write(bio, 1, 1);		/* Empty header bit */
+
+    /* Writing Packet header */
+    for (bandno = 0; bandno < res->numbands; bandno++) {
+        opj_tcd_band_t *band = &res->bands[bandno];
+        opj_tcd_precinct_t *prc = &band->precincts[precno];
+        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+            opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+            opj_tcd_layer_t *layer = &cblk->layers[layno];
+            if (!cblk->numpasses && layer->numpasses) {
+                tgt_setvalue(prc->incltree, cblkno, layno);
+            }
+        }
+        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+            opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+            opj_tcd_layer_t *layer = &cblk->layers[layno];
+            int increment = 0;
+            int nump = 0;
+            int len = 0, passno;
+            /* cblk inclusion bits */
+            if (!cblk->numpasses) {
+                tgt_encode(bio, prc->incltree, cblkno, layno + 1);
+            } else {
+                bio_write(bio, layer->numpasses != 0, 1);
+            }
+            /* if cblk not included, go to the next cblk  */
+            if (!layer->numpasses) {
+                continue;
+            }
+            /* if first instance of cblk --> zero bit-planes information */
+            if (!cblk->numpasses) {
+                cblk->numlenbits = 3;
+                tgt_encode(bio, prc->imsbtree, cblkno, 999);
+            }
+            /* number of coding passes included */
+            t2_putnumpasses(bio, layer->numpasses);
+
+            /* computation of the increase of the length indicator and insertion in the header     */
+            for (passno = cblk->numpasses; passno < cblk->numpasses + layer->numpasses; passno++) {
+                opj_tcd_pass_t *pass = &cblk->passes[passno];
+                nump++;
+                len += pass->len;
+                if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
+                    increment = int_max(increment, int_floorlog2(len) + 1 - (cblk->numlenbits + int_floorlog2(nump)));
+                    len = 0;
+                    nump = 0;
+                }
+            }
+            t2_putcommacode(bio, increment);
+
+            /* computation of the new Length indicator */
+            cblk->numlenbits += increment;
+
+            /* insertion of the codeword segment length */
+            for (passno = cblk->numpasses; passno < cblk->numpasses + layer->numpasses; passno++) {
+                opj_tcd_pass_t *pass = &cblk->passes[passno];
+                nump++;
+                len += pass->len;
+                if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
+                    bio_write(bio, len, cblk->numlenbits + int_floorlog2(nump));
+                    len = 0;
+                    nump = 0;
+                }
+            }
+        }
+    }
+
+    if (bio_flush(bio)) {
+        bio_destroy(bio);
+        return -999;		/* modified to eliminate longjmp !! */
+    }
+
+    c += bio_numbytes(bio);
+    bio_destroy(bio);
+
+    /* <EPH 0xff92> */
+    if (tcp->csty & J2K_CP_CSTY_EPH) {
+        c[0] = 255;
+        c[1] = 146;
+        c += 2;
+    }
+    /* </EPH> */
+
+    /* << INDEX */
+    /* End of packet header position. Currently only represents the distance to start of packet
+    // Will be updated later by incrementing with packet start value */
+    if(cstr_info && cstr_info->index_write) {
+        opj_packet_info_t *info_PK = &cstr_info->tile[tileno].packet[cstr_info->packno];
+        info_PK->end_ph_pos = (int)(c - dest);
+    }
+    /* INDEX >> */
+
+    /* Writing the packet body */
+
+    for (bandno = 0; bandno < res->numbands; bandno++) {
+        opj_tcd_band_t *band = &res->bands[bandno];
+        opj_tcd_precinct_t *prc = &band->precincts[precno];
+        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+            opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+            opj_tcd_layer_t *layer = &cblk->layers[layno];
+            if (!layer->numpasses) {
+                continue;
+            }
+            if (c + layer->len > dest + length) {
+                return -999;
+            }
+
+            memcpy(c, layer->data, layer->len);
+            cblk->numpasses += layer->numpasses;
+            c += layer->len;
+            /* << INDEX */
+            if(cstr_info && cstr_info->index_write) {
+                opj_packet_info_t *info_PK = &cstr_info->tile[tileno].packet[cstr_info->packno];
+                info_PK->disto += layer->disto;
+                if (cstr_info->D_max < info_PK->disto) {
+                    cstr_info->D_max = info_PK->disto;
+                }
+            }
+            /* INDEX >> */
+        }
+    }
+
+    return (c - dest);
 }
 
-static opj_bool t2_init_seg(opj_tcd_cblk_dec_t* cblk, int index, int cblksty, int first) {
-	opj_tcd_seg_t* seg;
+static opj_bool t2_init_seg(opj_tcd_cblk_dec_t* cblk, int index, int cblksty, int first)
+{
+    opj_tcd_seg_t* seg;
     opj_tcd_seg_t* segs;
     segs = (opj_tcd_seg_t*) opj_realloc(cblk->segs, (index + 1) * sizeof(opj_tcd_seg_t));
 
-    if (segs == NULL)
-    {
+    if (segs == NULL) {
         return OPJ_FALSE;
     }
     cblk->segs = segs;
 
-	seg = &cblk->segs[index];
-	seg->data = NULL;
-	seg->dataindex = 0;
-	seg->numpasses = 0;
-	seg->len = 0;
-	if (cblksty & J2K_CCP_CBLKSTY_TERMALL) {
-		seg->maxpasses = 1;
-	}
-	else if (cblksty & J2K_CCP_CBLKSTY_LAZY) {
-		if (first) {
-			seg->maxpasses = 10;
-		} else {
-			seg->maxpasses = (((seg - 1)->maxpasses == 1) || ((seg - 1)->maxpasses == 10)) ? 2 : 1;
-		}
-	} else {
-		seg->maxpasses = 109;
-	}
+    seg = &cblk->segs[index];
+    seg->data = NULL;
+    seg->dataindex = 0;
+    seg->numpasses = 0;
+    seg->len = 0;
+    if (cblksty & J2K_CCP_CBLKSTY_TERMALL) {
+        seg->maxpasses = 1;
+    } else if (cblksty & J2K_CCP_CBLKSTY_LAZY) {
+        if (first) {
+            seg->maxpasses = 10;
+        } else {
+            seg->maxpasses = (((seg - 1)->maxpasses == 1) || ((seg - 1)->maxpasses == 10)) ? 2 : 1;
+        }
+    } else {
+        seg->maxpasses = 109;
+    }
 
     return OPJ_TRUE;
 }
 
-static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *tile, 
-														opj_tcp_t *tcp, opj_pi_iterator_t *pi, opj_packet_info_t *pack_info) {
-	int bandno, cblkno;
-	unsigned char *c = src;
-
-	opj_cp_t *cp = t2->cp;
-
-	int compno = pi->compno;	/* component value */
-	int resno  = pi->resno;		/* resolution level value */
-	int precno = pi->precno;	/* precinct value */
-	int layno  = pi->layno;		/* quality layer value */
-
-	opj_tcd_resolution_t* res = &tile->comps[compno].resolutions[resno];
-
-	unsigned char *hd = NULL;
-	int present;
-	
-	opj_bio_t *bio = NULL;	/* BIO component */
-	
-	if (layno == 0) {
-		for (bandno = 0; bandno < res->numbands; bandno++) {
-			opj_tcd_band_t *band = &res->bands[bandno];
-			opj_tcd_precinct_t *prc = &band->precincts[precno];
-			
-			if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
-			
-			tgt_reset(prc->incltree);
-			tgt_reset(prc->imsbtree);
-			for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-				opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-				cblk->numsegs = 0;
-			}
-		}
-	}
-	
-	/* SOP markers */
-	
-	if (tcp->csty & J2K_CP_CSTY_SOP) {
-		if ((*c) != 0xff || (*(c + 1) != 0x91)) {
-			opj_event_msg(t2->cinfo, EVT_WARNING, "Expected SOP marker\n");
-		} else {
-			c += 6;
-		}
-		
-		/** TODO : check the Nsop value */
-	}
-	
-	/* 
-	When the marker PPT/PPM is used the packet header are store in PPT/PPM marker
-	This part deal with this caracteristic
-	step 1: Read packet header in the saved structure
-	step 2: Return to codestream for decoding 
-	*/
-
-	bio = bio_create();
-	
-	if (cp->ppm == 1) {		/* PPM */
-		hd = cp->ppm_data;
-		bio_init_dec(bio, hd, cp->ppm_len);
-	} else if (tcp->ppt == 1) {	/* PPT */
-		hd = tcp->ppt_data;
-		bio_init_dec(bio, hd, tcp->ppt_len);
-	} else {			/* Normal Case */
-		hd = c;
-		bio_init_dec(bio, hd, src+len-hd);
-	}
-	
-	present = bio_read(bio, 1);
-	
-	if (!present) {
-		bio_inalign(bio);
-		hd += bio_numbytes(bio);
-		bio_destroy(bio);
-		
-		/* EPH markers */
-		
-		if (tcp->csty & J2K_CP_CSTY_EPH) {
-			if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
-				printf("Error : expected EPH marker\n");
-			} else {
-				hd += 2;
-			}
-		}
-
-		/* << INDEX */
-		/* End of packet header position. Currently only represents the distance to start of packet
-		// Will be updated later by incrementing with packet start value*/
-		if(pack_info) {
-			pack_info->end_ph_pos = (int)(c - src);
-		}
-		/* INDEX >> */
-		
-		if (cp->ppm == 1) {		/* PPM case */
-			cp->ppm_len += cp->ppm_data-hd;
-			cp->ppm_data = hd;
-			return (c - src);
-		}
-		if (tcp->ppt == 1) {	/* PPT case */
-			tcp->ppt_len+=tcp->ppt_data-hd;
-			tcp->ppt_data = hd;
-			return (c - src);
-		}
-		
-		return (hd - src);
-	}
-	
-	for (bandno = 0; bandno < res->numbands; bandno++) {
-		opj_tcd_band_t *band = &res->bands[bandno];
-		opj_tcd_precinct_t *prc = &band->precincts[precno];
-		
-		if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
-		
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			int included, increment, n, segno;
-			opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-			/* if cblk not yet included before --> inclusion tagtree */
-			if (!cblk->numsegs) {
-				included = tgt_decode(bio, prc->incltree, cblkno, layno + 1);
-				/* else one bit */
-			} else {
-				included = bio_read(bio, 1);
-			}
-			/* if cblk not included */
-			if (!included) {
-				cblk->numnewpasses = 0;
-				continue;
-			}
-			/* if cblk not yet included --> zero-bitplane tagtree */
-			if (!cblk->numsegs) {
-				int i, numimsbs;
-				for (i = 0; !tgt_decode(bio, prc->imsbtree, cblkno, i); i++) {
-					;
-				}
-				numimsbs = i - 1;
-				cblk->numbps = band->numbps - numimsbs;
-				cblk->numlenbits = 3;
-			}
-			/* number of coding passes */
-			cblk->numnewpasses = t2_getnumpasses(bio);
-			increment = t2_getcommacode(bio);
-			/* length indicator increment */
-			cblk->numlenbits += increment;
-			segno = 0;
-			if (!cblk->numsegs) {
-                if (!t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 1))
-                {
+static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *tile,
+                            opj_tcp_t *tcp, opj_pi_iterator_t *pi, opj_packet_info_t *pack_info)
+{
+    int bandno, cblkno;
+    unsigned char *c = src;
+
+    opj_cp_t *cp = t2->cp;
+
+    int compno = pi->compno;	/* component value */
+    int resno  = pi->resno;		/* resolution level value */
+    int precno = pi->precno;	/* precinct value */
+    int layno  = pi->layno;		/* quality layer value */
+
+    opj_tcd_resolution_t* res = &tile->comps[compno].resolutions[resno];
+
+    unsigned char *hd = NULL;
+    int present;
+
+    opj_bio_t *bio = NULL;	/* BIO component */
+
+    if (layno == 0) {
+        for (bandno = 0; bandno < res->numbands; bandno++) {
+            opj_tcd_band_t *band = &res->bands[bandno];
+            opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+            if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
+
+            tgt_reset(prc->incltree);
+            tgt_reset(prc->imsbtree);
+            for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
+                cblk->numsegs = 0;
+            }
+        }
+    }
+
+    /* SOP markers */
+
+    if (tcp->csty & J2K_CP_CSTY_SOP) {
+        if ((*c) != 0xff || (*(c + 1) != 0x91)) {
+            opj_event_msg(t2->cinfo, EVT_WARNING, "Expected SOP marker\n");
+        } else {
+            c += 6;
+        }
+
+        /** TODO : check the Nsop value */
+    }
+
+    /*
+    When the marker PPT/PPM is used the packet header are store in PPT/PPM marker
+    This part deal with this caracteristic
+    step 1: Read packet header in the saved structure
+    step 2: Return to codestream for decoding
+    */
+
+    bio = bio_create();
+
+    if (cp->ppm == 1) {		/* PPM */
+        hd = cp->ppm_data;
+        bio_init_dec(bio, hd, cp->ppm_len);
+    } else if (tcp->ppt == 1) {	/* PPT */
+        hd = tcp->ppt_data;
+        bio_init_dec(bio, hd, tcp->ppt_len);
+    } else {			/* Normal Case */
+        hd = c;
+        bio_init_dec(bio, hd, src+len-hd);
+    }
+
+    present = bio_read(bio, 1);
+
+    if (!present) {
+        bio_inalign(bio);
+        hd += bio_numbytes(bio);
+        bio_destroy(bio);
+
+        /* EPH markers */
+
+        if (tcp->csty & J2K_CP_CSTY_EPH) {
+            if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
+                printf("Error : expected EPH marker\n");
+            } else {
+                hd += 2;
+            }
+        }
+
+        /* << INDEX */
+        /* End of packet header position. Currently only represents the distance to start of packet
+        // Will be updated later by incrementing with packet start value*/
+        if(pack_info) {
+            pack_info->end_ph_pos = (int)(c - src);
+        }
+        /* INDEX >> */
+
+        if (cp->ppm == 1) {		/* PPM case */
+            cp->ppm_len += cp->ppm_data-hd;
+            cp->ppm_data = hd;
+            return (c - src);
+        }
+        if (tcp->ppt == 1) {	/* PPT case */
+            tcp->ppt_len+=tcp->ppt_data-hd;
+            tcp->ppt_data = hd;
+            return (c - src);
+        }
+
+        return (hd - src);
+    }
+
+    for (bandno = 0; bandno < res->numbands; bandno++) {
+        opj_tcd_band_t *band = &res->bands[bandno];
+        opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+        if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
+
+        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+            int included, increment, n, segno;
+            opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
+            /* if cblk not yet included before --> inclusion tagtree */
+            if (!cblk->numsegs) {
+                included = tgt_decode(bio, prc->incltree, cblkno, layno + 1);
+                /* else one bit */
+            } else {
+                included = bio_read(bio, 1);
+            }
+            /* if cblk not included */
+            if (!included) {
+                cblk->numnewpasses = 0;
+                continue;
+            }
+            /* if cblk not yet included --> zero-bitplane tagtree */
+            if (!cblk->numsegs) {
+                int i, numimsbs;
+                for (i = 0; !tgt_decode(bio, prc->imsbtree, cblkno, i); i++) {
+                    ;
+                }
+                numimsbs = i - 1;
+                cblk->numbps = band->numbps - numimsbs;
+                cblk->numlenbits = 3;
+            }
+            /* number of coding passes */
+            cblk->numnewpasses = t2_getnumpasses(bio);
+            increment = t2_getcommacode(bio);
+            /* length indicator increment */
+            cblk->numlenbits += increment;
+            segno = 0;
+            if (!cblk->numsegs) {
+                if (!t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 1)) {
                     opj_event_msg(t2->cinfo, EVT_ERROR, "Out of memory\n");
                     bio_destroy(bio);
                     return -999;
                 }
-			} else {
-				segno = cblk->numsegs - 1;
-				if (cblk->segs[segno].numpasses == cblk->segs[segno].maxpasses) {
-					++segno;
-                    if (!t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 0))
-                    {
+            } else {
+                segno = cblk->numsegs - 1;
+                if (cblk->segs[segno].numpasses == cblk->segs[segno].maxpasses) {
+                    ++segno;
+                    if (!t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 0)) {
                         opj_event_msg(t2->cinfo, EVT_ERROR, "Out of memory\n");
                         bio_destroy(bio);
                         return -999;
                     }
-				}
-			}
-			n = cblk->numnewpasses;
-			
-			do {
-				cblk->segs[segno].numnewpasses = int_min(cblk->segs[segno].maxpasses - cblk->segs[segno].numpasses, n);
-				cblk->segs[segno].newlen = bio_read(bio, cblk->numlenbits + int_floorlog2(cblk->segs[segno].numnewpasses));
-				n -= cblk->segs[segno].numnewpasses;
-				if (n > 0) {
-					++segno;
-                    if (!t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 0))
-                    {
+                }
+            }
+            n = cblk->numnewpasses;
+
+            do {
+                cblk->segs[segno].numnewpasses = int_min(cblk->segs[segno].maxpasses - cblk->segs[segno].numpasses, n);
+                cblk->segs[segno].newlen = bio_read(bio, cblk->numlenbits + int_floorlog2(cblk->segs[segno].numnewpasses));
+                n -= cblk->segs[segno].numnewpasses;
+                if (n > 0) {
+                    ++segno;
+                    if (!t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 0)) {
                         opj_event_msg(t2->cinfo, EVT_ERROR, "Out of memory\n");
                         bio_destroy(bio);
                         return -999;
                     }
-				}
-			} while (n > 0);
-		}
-	}
-	
-	if (bio_inalign(bio)) {
-		bio_destroy(bio);
-		return -999;
-	}
-	
-	hd += bio_numbytes(bio);
-	bio_destroy(bio);
-	
-	/* EPH markers */
-	if (tcp->csty & J2K_CP_CSTY_EPH) {
-		if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
-			opj_event_msg(t2->cinfo, EVT_ERROR, "Expected EPH marker\n");
-			return -999;
-		} else {
-			hd += 2;
-		}
-	}
-
-	/* << INDEX */
-	/* End of packet header position. Currently only represents the distance to start of packet
-	// Will be updated later by incrementing with packet start value*/
-	if(pack_info) {
-		pack_info->end_ph_pos = (int)(hd - src);
-	}
-	/* INDEX >> */
-	
-	if (cp->ppm==1) {
-		cp->ppm_len+=cp->ppm_data-hd;
-		cp->ppm_data = hd;
-	} else if (tcp->ppt == 1) {
-		tcp->ppt_len+=tcp->ppt_data-hd;
-		tcp->ppt_data = hd;
-	} else {
-		c=hd;
-	}
-	
-	for (bandno = 0; bandno < res->numbands; bandno++) {
-		opj_tcd_band_t *band = &res->bands[bandno];
-		opj_tcd_precinct_t *prc = &band->precincts[precno];
-		
-		if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
-		
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-			opj_tcd_seg_t *seg = NULL;
-			if (!cblk->numnewpasses)
-				continue;
-			if (!cblk->numsegs) {
-				seg = &cblk->segs[0];
-				cblk->numsegs++;
-				cblk->len = 0;
-			} else {
-				seg = &cblk->segs[cblk->numsegs - 1];
-				if (seg->numpasses == seg->maxpasses) {
-					seg++;
-					cblk->numsegs++;
-				}
-			}
-			
-			do {
-				if (c + seg->newlen > src + len) {
-					return -999;
-				}
+                }
+            } while (n > 0);
+        }
+    }
+
+    if (bio_inalign(bio)) {
+        bio_destroy(bio);
+        return -999;
+    }
+
+    hd += bio_numbytes(bio);
+    bio_destroy(bio);
+
+    /* EPH markers */
+    if (tcp->csty & J2K_CP_CSTY_EPH) {
+        if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
+            opj_event_msg(t2->cinfo, EVT_ERROR, "Expected EPH marker\n");
+            return -999;
+        } else {
+            hd += 2;
+        }
+    }
+
+    /* << INDEX */
+    /* End of packet header position. Currently only represents the distance to start of packet
+    // Will be updated later by incrementing with packet start value*/
+    if(pack_info) {
+        pack_info->end_ph_pos = (int)(hd - src);
+    }
+    /* INDEX >> */
+
+    if (cp->ppm==1) {
+        cp->ppm_len+=cp->ppm_data-hd;
+        cp->ppm_data = hd;
+    } else if (tcp->ppt == 1) {
+        tcp->ppt_len+=tcp->ppt_data-hd;
+        tcp->ppt_data = hd;
+    } else {
+        c=hd;
+    }
+
+    for (bandno = 0; bandno < res->numbands; bandno++) {
+        opj_tcd_band_t *band = &res->bands[bandno];
+        opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+        if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
+
+        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+            opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
+            opj_tcd_seg_t *seg = NULL;
+            if (!cblk->numnewpasses)
+                continue;
+            if (!cblk->numsegs) {
+                seg = &cblk->segs[0];
+                cblk->numsegs++;
+                cblk->len = 0;
+            } else {
+                seg = &cblk->segs[cblk->numsegs - 1];
+                if (seg->numpasses == seg->maxpasses) {
+                    seg++;
+                    cblk->numsegs++;
+                }
+            }
+
+            do {
+                if (c + seg->newlen > src + len) {
+                    return -999;
+                }
 
 #ifdef USE_JPWL
-			/* we need here a j2k handle to verify if making a check to
-			the validity of cblocks parameters is selected from user (-W) */
-
-				/* let's check that we are not exceeding */
-				if ((cblk->len + seg->newlen) > 8192) {
-					opj_event_msg(t2->cinfo, EVT_WARNING,
-						"JPWL: segment too long (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n",
-						seg->newlen, cblkno, precno, bandno, resno, compno);
-					if (!JPWL_ASSUME) {
-						opj_event_msg(t2->cinfo, EVT_ERROR, "JPWL: giving up\n");
-						return -999;
-					}
-					seg->newlen = 8192 - cblk->len;
-					opj_event_msg(t2->cinfo, EVT_WARNING, "      - truncating segment to %d\n", seg->newlen);
-					break;
-				};
+                /* we need here a j2k handle to verify if making a check to
+                the validity of cblocks parameters is selected from user (-W) */
+
+                /* let's check that we are not exceeding */
+                if ((cblk->len + seg->newlen) > 8192) {
+                    opj_event_msg(t2->cinfo, EVT_WARNING,
+                                  "JPWL: segment too long (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n",
+                                  seg->newlen, cblkno, precno, bandno, resno, compno);
+                    if (!JPWL_ASSUME) {
+                        opj_event_msg(t2->cinfo, EVT_ERROR, "JPWL: giving up\n");
+                        return -999;
+                    }
+                    seg->newlen = 8192 - cblk->len;
+                    opj_event_msg(t2->cinfo, EVT_WARNING, "      - truncating segment to %d\n", seg->newlen);
+                    break;
+                };
 
 #endif /* USE_JPWL */
-				
-				cblk->data = (unsigned char*) opj_realloc(cblk->data, (cblk->len + seg->newlen) * sizeof(unsigned char));
-				memcpy(cblk->data + cblk->len, c, seg->newlen);
-				if (seg->numpasses == 0) {
-					seg->data = &cblk->data;
-					seg->dataindex = cblk->len;
-				}
-				c += seg->newlen;
-				cblk->len += seg->newlen;
-				seg->len += seg->newlen;
-				seg->numpasses += seg->numnewpasses;
-				cblk->numnewpasses -= seg->numnewpasses;
-				if (cblk->numnewpasses > 0) {
-					seg++;
-					cblk->numsegs++;
-				}
-			} while (cblk->numnewpasses > 0);
-		}
-	}
-	
-	return (c - src);
+
+                cblk->data = (unsigned char*) opj_realloc(cblk->data, (cblk->len + seg->newlen) * sizeof(unsigned char));
+                memcpy(cblk->data + cblk->len, c, seg->newlen);
+                if (seg->numpasses == 0) {
+                    seg->data = &cblk->data;
+                    seg->dataindex = cblk->len;
+                }
+                c += seg->newlen;
+                cblk->len += seg->newlen;
+                seg->len += seg->newlen;
+                seg->numpasses += seg->numnewpasses;
+                cblk->numnewpasses -= seg->numnewpasses;
+                if (cblk->numnewpasses > 0) {
+                    seg++;
+                    cblk->numsegs++;
+                }
+            } while (cblk->numnewpasses > 0);
+        }
+    }
+
+    return (c - src);
 }
 
 /* ----------------------------------------------------------------------- */
 
-int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_codestream_info_t *cstr_info,int tpnum, int tppos,int pino, J2K_T2_MODE t2_mode, int cur_totnum_tp){
-	unsigned char *c = dest;
-	int e = 0;
-	int compno;
-	opj_pi_iterator_t *pi = NULL;
-	int poc;
-	opj_image_t *image = t2->image;
-	opj_cp_t *cp = t2->cp;
-	opj_tcp_t *tcp = &cp->tcps[tileno];
-	int pocno = cp->cinema == CINEMA4K_24? 2: 1;
-	int maxcomp = cp->max_comp_size > 0 ? image->numcomps : 1;
-	
-	pi = pi_initialise_encode(image, cp, tileno, t2_mode);
-	if(!pi) {
-		/* TODO: throw an error */
-		return -999;
-	}
-	
-	if(t2_mode == THRESH_CALC ){ /* Calculating threshold */
-		for(compno = 0; compno < maxcomp; compno++ ){
-			for(poc = 0; poc < pocno ; poc++){
-				int comp_len = 0;
-				int tpnum = compno;
-				if (pi_create_encode(pi, cp,tileno,poc,tpnum,tppos,t2_mode,cur_totnum_tp)) {
-					opj_event_msg(t2->cinfo, EVT_ERROR, "Error initializing Packet Iterator\n");
-					pi_destroy(pi, cp, tileno);
-					return -999;
-				}
-				while (pi_next(&pi[poc])) {
-					if (pi[poc].layno < maxlayers) {
-						e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[poc], c, dest + len - c, cstr_info, tileno);
-						comp_len = comp_len + e;
-						if (e == -999) {
-							break;
-						} else {
-							c += e;
-						}
-					}
-				}
-				if (e == -999) break;
-				if (cp->max_comp_size){
-					if (comp_len > cp->max_comp_size){
-						e = -999;
-						break;
-					}
-				}
-			}
-			if (e == -999)  break;
-		}
-	}else{  /* t2_mode == FINAL_PASS  */
-		pi_create_encode(pi, cp,tileno,pino,tpnum,tppos,t2_mode,cur_totnum_tp);
-		while (pi_next(&pi[pino])) {
-			if (pi[pino].layno < maxlayers) {
-				e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[pino], c, dest + len - c, cstr_info, tileno);
-				if (e == -999) {
-					break;
-				} else {
-					c += e;
-				}
-				/* INDEX >> */
-				if(cstr_info) {
-					if(cstr_info->index_write) {
-						opj_tile_info_t *info_TL = &cstr_info->tile[tileno];
-						opj_packet_info_t *info_PK = &info_TL->packet[cstr_info->packno];
-						if (!cstr_info->packno) {
-							info_PK->start_pos = info_TL->end_header + 1;
-						} else {
-							info_PK->start_pos = ((cp->tp_on | tcp->POC)&& info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[cstr_info->packno - 1].end_pos + 1;
-						}
-						info_PK->end_pos = info_PK->start_pos + e - 1;
-						info_PK->end_ph_pos += info_PK->start_pos - 1;	/* End of packet header which now only represents the distance 
+int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_codestream_info_t *cstr_info,int tpnum, int tppos,int pino, J2K_T2_MODE t2_mode, int cur_totnum_tp)
+{
+    unsigned char *c = dest;
+    int e = 0;
+    int compno;
+    opj_pi_iterator_t *pi = NULL;
+    int poc;
+    opj_image_t *image = t2->image;
+    opj_cp_t *cp = t2->cp;
+    opj_tcp_t *tcp = &cp->tcps[tileno];
+    int pocno = cp->cinema == CINEMA4K_24? 2: 1;
+    int maxcomp = cp->max_comp_size > 0 ? image->numcomps : 1;
+
+    pi = pi_initialise_encode(image, cp, tileno, t2_mode);
+    if(!pi) {
+        /* TODO: throw an error */
+        return -999;
+    }
+
+    if(t2_mode == THRESH_CALC ) { /* Calculating threshold */
+        for(compno = 0; compno < maxcomp; compno++ ) {
+            for(poc = 0; poc < pocno ; poc++) {
+                int comp_len = 0;
+                int tpnum = compno;
+                if (pi_create_encode(pi, cp,tileno,poc,tpnum,tppos,t2_mode,cur_totnum_tp)) {
+                    opj_event_msg(t2->cinfo, EVT_ERROR, "Error initializing Packet Iterator\n");
+                    pi_destroy(pi, cp, tileno);
+                    return -999;
+                }
+                while (pi_next(&pi[poc])) {
+                    if (pi[poc].layno < maxlayers) {
+                        e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[poc], c, dest + len - c, cstr_info, tileno);
+                        comp_len = comp_len + e;
+                        if (e == -999) {
+                            break;
+                        } else {
+                            c += e;
+                        }
+                    }
+                }
+                if (e == -999) break;
+                if (cp->max_comp_size) {
+                    if (comp_len > cp->max_comp_size) {
+                        e = -999;
+                        break;
+                    }
+                }
+            }
+            if (e == -999)  break;
+        }
+    } else { /* t2_mode == FINAL_PASS  */
+        pi_create_encode(pi, cp,tileno,pino,tpnum,tppos,t2_mode,cur_totnum_tp);
+        while (pi_next(&pi[pino])) {
+            if (pi[pino].layno < maxlayers) {
+                e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[pino], c, dest + len - c, cstr_info, tileno);
+                if (e == -999) {
+                    break;
+                } else {
+                    c += e;
+                }
+                /* INDEX >> */
+                if(cstr_info) {
+                    if(cstr_info->index_write) {
+                        opj_tile_info_t *info_TL = &cstr_info->tile[tileno];
+                        opj_packet_info_t *info_PK = &info_TL->packet[cstr_info->packno];
+                        if (!cstr_info->packno) {
+                            info_PK->start_pos = info_TL->end_header + 1;
+                        } else {
+                            info_PK->start_pos = ((cp->tp_on | tcp->POC)&& info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[cstr_info->packno - 1].end_pos + 1;
+                        }
+                        info_PK->end_pos = info_PK->start_pos + e - 1;
+                        info_PK->end_ph_pos += info_PK->start_pos - 1;	/* End of packet header which now only represents the distance
 																														// to start of packet is incremented by value of start of packet*/
-					}
-					
-					cstr_info->packno++;
-				}
-				/* << INDEX */
-				tile->packno++;
-			}
-		}
-	}
-	
-	pi_destroy(pi, cp, tileno);
-	
-	if (e == -999) {
-		return e;
-	}
-	
-  return (c - dest);
+                    }
+
+                    cstr_info->packno++;
+                }
+                /* << INDEX */
+                tile->packno++;
+            }
+        }
+    }
+
+    pi_destroy(pi, cp, tileno);
+
+    if (e == -999) {
+        return e;
+    }
+
+    return (c - dest);
 }
 
-int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj_tcd_tile_t *tile, opj_codestream_info_t *cstr_info) {
-	unsigned char *c = src;
-	opj_pi_iterator_t *pi;
-	int pino, e = 0;
-	int n = 0, curtp = 0;
-	int tp_start_packno;
-
-	opj_image_t *image = t2->image;
-	opj_cp_t *cp = t2->cp;
-	
-	/* create a packet iterator */
-	pi = pi_create_decode(image, cp, tileno);
-	if(!pi) {
-		/* TODO: throw an error */
-		return -999;
-	}
-
-	tp_start_packno = 0;
-	
-	for (pino = 0; pino <= cp->tcps[tileno].numpocs; pino++) {
-		while (pi_next(&pi[pino])) {
-			if ((cp->layer==0) || (cp->layer>=((pi[pino].layno)+1))) {
-				opj_packet_info_t *pack_info;
-				if (cstr_info)
-					pack_info = &cstr_info->tile[tileno].packet[cstr_info->packno];
-				else
-					pack_info = NULL;
-				e = t2_decode_packet(t2, c, src + len - c, tile, &cp->tcps[tileno], &pi[pino], pack_info);
-			} else {
-				e = 0;
-			}
-            if(e == -999)
-            {
+int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj_tcd_tile_t *tile, opj_codestream_info_t *cstr_info)
+{
+    unsigned char *c = src;
+    opj_pi_iterator_t *pi;
+    int pino, e = 0;
+    int n = 0, curtp = 0;
+    int tp_start_packno;
+
+    opj_image_t *image = t2->image;
+    opj_cp_t *cp = t2->cp;
+
+    /* create a packet iterator */
+    pi = pi_create_decode(image, cp, tileno);
+    if(!pi) {
+        /* TODO: throw an error */
+        return -999;
+    }
+
+    tp_start_packno = 0;
+
+    for (pino = 0; pino <= cp->tcps[tileno].numpocs; pino++) {
+        while (pi_next(&pi[pino])) {
+            if ((cp->layer==0) || (cp->layer>=((pi[pino].layno)+1))) {
+                opj_packet_info_t *pack_info;
+                if (cstr_info)
+                    pack_info = &cstr_info->tile[tileno].packet[cstr_info->packno];
+                else
+                    pack_info = NULL;
+                e = t2_decode_packet(t2, c, src + len - c, tile, &cp->tcps[tileno], &pi[pino], pack_info);
+            } else {
+                e = 0;
+            }
+            if(e == -999) {
                 pi_destroy(pi, cp, tileno);
                 return -999;
             }
-			/* progression in resolution */
-			image->comps[pi[pino].compno].resno_decoded =	
-				(e > 0) ? 
-				int_max(pi[pino].resno, image->comps[pi[pino].compno].resno_decoded) 
-				: image->comps[pi[pino].compno].resno_decoded;
-			n++;
-
-			/* INDEX >> */
-			if(cstr_info) {
-				opj_tile_info_t *info_TL = &cstr_info->tile[tileno];
-				opj_packet_info_t *info_PK = &info_TL->packet[cstr_info->packno];
-				if (!cstr_info->packno) {
-					info_PK->start_pos = info_TL->end_header + 1;
-				} else if (info_TL->packet[cstr_info->packno-1].end_pos >= (int)cstr_info->tile[tileno].tp[curtp].tp_end_pos){ /* New tile part*/
-					info_TL->tp[curtp].tp_numpacks = cstr_info->packno - tp_start_packno; /* Number of packets in previous tile-part*/
-          info_TL->tp[curtp].tp_start_pack = tp_start_packno;
-					tp_start_packno = cstr_info->packno;
-					curtp++;
-					info_PK->start_pos = cstr_info->tile[tileno].tp[curtp].tp_end_header+1;
-				} else {
-					info_PK->start_pos = (cp->tp_on && info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[cstr_info->packno - 1].end_pos + 1;
-				}
-				info_PK->end_pos = info_PK->start_pos + e - 1;
-				info_PK->end_ph_pos += info_PK->start_pos - 1;	/* End of packet header which now only represents the distance 
+            /* progression in resolution */
+            image->comps[pi[pino].compno].resno_decoded =
+                (e > 0) ?
+                int_max(pi[pino].resno, image->comps[pi[pino].compno].resno_decoded)
+                : image->comps[pi[pino].compno].resno_decoded;
+            n++;
+
+            /* INDEX >> */
+            if(cstr_info) {
+                opj_tile_info_t *info_TL = &cstr_info->tile[tileno];
+                opj_packet_info_t *info_PK = &info_TL->packet[cstr_info->packno];
+                if (!cstr_info->packno) {
+                    info_PK->start_pos = info_TL->end_header + 1;
+                } else if (info_TL->packet[cstr_info->packno-1].end_pos >= (int)cstr_info->tile[tileno].tp[curtp].tp_end_pos) { /* New tile part*/
+                    info_TL->tp[curtp].tp_numpacks = cstr_info->packno - tp_start_packno; /* Number of packets in previous tile-part*/
+                    info_TL->tp[curtp].tp_start_pack = tp_start_packno;
+                    tp_start_packno = cstr_info->packno;
+                    curtp++;
+                    info_PK->start_pos = cstr_info->tile[tileno].tp[curtp].tp_end_header+1;
+                } else {
+                    info_PK->start_pos = (cp->tp_on && info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[cstr_info->packno - 1].end_pos + 1;
+                }
+                info_PK->end_pos = info_PK->start_pos + e - 1;
+                info_PK->end_ph_pos += info_PK->start_pos - 1;	/* End of packet header which now only represents the distance
 																												// to start of packet is incremented by value of start of packet*/
-				cstr_info->packno++;
-			}
-			/* << INDEX */
-			
-			if (e == -999) {		/* ADD */
-				break;
-			} else {
-				c += e;
-			}			
-		}
-	}
-	/* INDEX >> */
-	if(cstr_info) {
-		cstr_info->tile[tileno].tp[curtp].tp_numpacks = cstr_info->packno - tp_start_packno; /* Number of packets in last tile-part*/
-    cstr_info->tile[tileno].tp[curtp].tp_start_pack = tp_start_packno;
-	}
-	/* << INDEX */
-
-	/* don't forget to release pi */
-	pi_destroy(pi, cp, tileno);
-	
-	if (e == -999) {
-		return e;
-	}
-	
-	return (c - src);
+                cstr_info->packno++;
+            }
+            /* << INDEX */
+
+            if (e == -999) {		/* ADD */
+                break;
+            } else {
+                c += e;
+            }
+        }
+    }
+    /* INDEX >> */
+    if(cstr_info) {
+        cstr_info->tile[tileno].tp[curtp].tp_numpacks = cstr_info->packno - tp_start_packno; /* Number of packets in last tile-part*/
+        cstr_info->tile[tileno].tp[curtp].tp_start_pack = tp_start_packno;
+    }
+    /* << INDEX */
+
+    /* don't forget to release pi */
+    pi_destroy(pi, cp, tileno);
+
+    if (e == -999) {
+        return e;
+    }
+
+    return (c - src);
 }
 
 /* ----------------------------------------------------------------------- */
 
-opj_t2_t* t2_create(opj_common_ptr cinfo, opj_image_t *image, opj_cp_t *cp) {
-	/* create the tcd structure */
-	opj_t2_t *t2 = (opj_t2_t*)opj_malloc(sizeof(opj_t2_t));
-	if(!t2) return NULL;
-	t2->cinfo = cinfo;
-	t2->image = image;
-	t2->cp = cp;
+opj_t2_t* t2_create(opj_common_ptr cinfo, opj_image_t *image, opj_cp_t *cp)
+{
+    /* create the tcd structure */
+    opj_t2_t *t2 = (opj_t2_t*)opj_malloc(sizeof(opj_t2_t));
+    if(!t2) return NULL;
+    t2->cinfo = cinfo;
+    t2->image = image;
+    t2->cp = cp;
 
-	return t2;
+    return t2;
 }
 
-void t2_destroy(opj_t2_t *t2) {
-	if(t2) {
-		opj_free(t2);
-	}
+void t2_destroy(opj_t2_t *t2)
+{
+    if(t2) {
+        opj_free(t2);
+    }
 }
 
 
diff --git a/src/lib/openmj2/t2.h b/src/lib/openmj2/t2.h
index 2bf5337f..ed185d76 100644
--- a/src/lib/openmj2/t2.h
+++ b/src/lib/openmj2/t2.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -49,13 +49,13 @@
 Tier-2 coding
 */
 typedef struct opj_t2 {
-	/** codec context */
-	opj_common_ptr cinfo;
+    /** codec context */
+    opj_common_ptr cinfo;
 
-	/** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
-	opj_image_t *image;
-	/** pointer to the image coding parameters */
-	opj_cp_t *cp;
+    /** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
+    opj_image_t *image;
+    /** pointer to the image coding parameters */
+    opj_cp_t *cp;
 } opj_t2_t;
 
 /** @name Exported functions */
@@ -70,10 +70,10 @@ Encode the packets of a tile to a destination buffer
 @param maxlayers maximum number of layers
 @param dest the destination buffer
 @param len the length of the destination buffer
-@param cstr_info Codestream information structure 
+@param cstr_info Codestream information structure
 @param tpnum Tile part number of the current tile
 @param tppos The position of the tile part flag in the progression order
-@param pino 
+@param pino
 @param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
 @param cur_totnum_tp The total number of tile parts in the current tile
 */
diff --git a/src/lib/openmj2/tcd.c b/src/lib/openmj2/tcd.c
index 7875737c..c69f4a0f 100644
--- a/src/lib/openmj2/tcd.c
+++ b/src/lib/openmj2/tcd.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2006-2007, Parvatha Elangovan
@@ -39,63 +39,64 @@
 #define _ISOC99_SOURCE /* lrintf is C99 */
 #include "opj_includes.h"
 
-void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img) {
-	int tileno, compno, resno, bandno, precno;/*, cblkno;*/
-
-	fprintf(fd, "image {\n");
-	fprintf(fd, "  tw=%d, th=%d x0=%d x1=%d y0=%d y1=%d\n", 
-		img->tw, img->th, tcd->image->x0, tcd->image->x1, tcd->image->y0, tcd->image->y1);
-
-	for (tileno = 0; tileno < img->th * img->tw; tileno++) {
-		opj_tcd_tile_t *tile = &tcd->tcd_image->tiles[tileno];
-		fprintf(fd, "  tile {\n");
-		fprintf(fd, "    x0=%d, y0=%d, x1=%d, y1=%d, numcomps=%d\n",
-			tile->x0, tile->y0, tile->x1, tile->y1, tile->numcomps);
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-			fprintf(fd, "    tilec {\n");
-			fprintf(fd,
-				"      x0=%d, y0=%d, x1=%d, y1=%d, numresolutions=%d\n",
-				tilec->x0, tilec->y0, tilec->x1, tilec->y1, tilec->numresolutions);
-			for (resno = 0; resno < tilec->numresolutions; resno++) {
-				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-				fprintf(fd, "\n   res {\n");
-				fprintf(fd,
-					"          x0=%d, y0=%d, x1=%d, y1=%d, pw=%d, ph=%d, numbands=%d\n",
-					res->x0, res->y0, res->x1, res->y1, res->pw, res->ph, res->numbands);
-				for (bandno = 0; bandno < res->numbands; bandno++) {
-					opj_tcd_band_t *band = &res->bands[bandno];
-					fprintf(fd, "        band {\n");
-					fprintf(fd,
-						"          x0=%d, y0=%d, x1=%d, y1=%d, stepsize=%f, numbps=%d\n",
-						band->x0, band->y0, band->x1, band->y1, band->stepsize, band->numbps);
-					for (precno = 0; precno < res->pw * res->ph; precno++) {
-						opj_tcd_precinct_t *prec = &band->precincts[precno];
-						fprintf(fd, "          prec {\n");
-						fprintf(fd,
-							"            x0=%d, y0=%d, x1=%d, y1=%d, cw=%d, ch=%d\n",
-							prec->x0, prec->y0, prec->x1, prec->y1, prec->cw, prec->ch);
-						/*
-						for (cblkno = 0; cblkno < prec->cw * prec->ch; cblkno++) {
-							opj_tcd_cblk_t *cblk = &prec->cblks[cblkno];
-							fprintf(fd, "            cblk {\n");
-							fprintf(fd,
-								"              x0=%d, y0=%d, x1=%d, y1=%d\n",
-								cblk->x0, cblk->y0, cblk->x1, cblk->y1);
-							fprintf(fd, "            }\n");
-						}
-						*/
-						fprintf(fd, "          }\n");
-					}
-					fprintf(fd, "        }\n");
-				}
-				fprintf(fd, "      }\n");
-			}
-			fprintf(fd, "    }\n");
-		}
-		fprintf(fd, "  }\n");
-	}
-	fprintf(fd, "}\n");
+void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img)
+{
+    int tileno, compno, resno, bandno, precno;/*, cblkno;*/
+
+    fprintf(fd, "image {\n");
+    fprintf(fd, "  tw=%d, th=%d x0=%d x1=%d y0=%d y1=%d\n",
+            img->tw, img->th, tcd->image->x0, tcd->image->x1, tcd->image->y0, tcd->image->y1);
+
+    for (tileno = 0; tileno < img->th * img->tw; tileno++) {
+        opj_tcd_tile_t *tile = &tcd->tcd_image->tiles[tileno];
+        fprintf(fd, "  tile {\n");
+        fprintf(fd, "    x0=%d, y0=%d, x1=%d, y1=%d, numcomps=%d\n",
+                tile->x0, tile->y0, tile->x1, tile->y1, tile->numcomps);
+        for (compno = 0; compno < tile->numcomps; compno++) {
+            opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+            fprintf(fd, "    tilec {\n");
+            fprintf(fd,
+                    "      x0=%d, y0=%d, x1=%d, y1=%d, numresolutions=%d\n",
+                    tilec->x0, tilec->y0, tilec->x1, tilec->y1, tilec->numresolutions);
+            for (resno = 0; resno < tilec->numresolutions; resno++) {
+                opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+                fprintf(fd, "\n   res {\n");
+                fprintf(fd,
+                        "          x0=%d, y0=%d, x1=%d, y1=%d, pw=%d, ph=%d, numbands=%d\n",
+                        res->x0, res->y0, res->x1, res->y1, res->pw, res->ph, res->numbands);
+                for (bandno = 0; bandno < res->numbands; bandno++) {
+                    opj_tcd_band_t *band = &res->bands[bandno];
+                    fprintf(fd, "        band {\n");
+                    fprintf(fd,
+                            "          x0=%d, y0=%d, x1=%d, y1=%d, stepsize=%f, numbps=%d\n",
+                            band->x0, band->y0, band->x1, band->y1, band->stepsize, band->numbps);
+                    for (precno = 0; precno < res->pw * res->ph; precno++) {
+                        opj_tcd_precinct_t *prec = &band->precincts[precno];
+                        fprintf(fd, "          prec {\n");
+                        fprintf(fd,
+                                "            x0=%d, y0=%d, x1=%d, y1=%d, cw=%d, ch=%d\n",
+                                prec->x0, prec->y0, prec->x1, prec->y1, prec->cw, prec->ch);
+                        /*
+                        for (cblkno = 0; cblkno < prec->cw * prec->ch; cblkno++) {
+                        	opj_tcd_cblk_t *cblk = &prec->cblks[cblkno];
+                        	fprintf(fd, "            cblk {\n");
+                        	fprintf(fd,
+                        		"              x0=%d, y0=%d, x1=%d, y1=%d\n",
+                        		cblk->x0, cblk->y0, cblk->x1, cblk->y1);
+                        	fprintf(fd, "            }\n");
+                        }
+                        */
+                        fprintf(fd, "          }\n");
+                    }
+                    fprintf(fd, "        }\n");
+                }
+                fprintf(fd, "      }\n");
+            }
+            fprintf(fd, "    }\n");
+        }
+        fprintf(fd, "  }\n");
+    }
+    fprintf(fd, "}\n");
 }
 
 /* ----------------------------------------------------------------------- */
@@ -103,1447 +104,1455 @@ void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img) {
 /**
 Create a new TCD handle
 */
-opj_tcd_t* tcd_create(opj_common_ptr cinfo) {
-	/* create the tcd structure */
-	opj_tcd_t *tcd = (opj_tcd_t*)opj_malloc(sizeof(opj_tcd_t));
-	if(!tcd) return NULL;
-	tcd->cinfo = cinfo;
-	tcd->tcd_image = (opj_tcd_image_t*)opj_malloc(sizeof(opj_tcd_image_t));
-	if(!tcd->tcd_image) {
-		opj_free(tcd);
-		return NULL;
-	}
-
-	return tcd;
+opj_tcd_t* tcd_create(opj_common_ptr cinfo)
+{
+    /* create the tcd structure */
+    opj_tcd_t *tcd = (opj_tcd_t*)opj_malloc(sizeof(opj_tcd_t));
+    if(!tcd) return NULL;
+    tcd->cinfo = cinfo;
+    tcd->tcd_image = (opj_tcd_image_t*)opj_malloc(sizeof(opj_tcd_image_t));
+    if(!tcd->tcd_image) {
+        opj_free(tcd);
+        return NULL;
+    }
+
+    return tcd;
 }
 
 /**
 Destroy a previously created TCD handle
 */
-void tcd_destroy(opj_tcd_t *tcd) {
-	if(tcd) {
-		opj_free(tcd->tcd_image);
-		opj_free(tcd);
-	}
+void tcd_destroy(opj_tcd_t *tcd)
+{
+    if(tcd) {
+        opj_free(tcd->tcd_image);
+        opj_free(tcd);
+    }
 }
 
 /* ----------------------------------------------------------------------- */
 
-void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno) {
-	int tileno, compno, resno, bandno, precno, cblkno;
-
-	tcd->image = image;
-	tcd->cp = cp;
-	tcd->tcd_image->tw = cp->tw;
-	tcd->tcd_image->th = cp->th;
-	tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(sizeof(opj_tcd_tile_t));
-	
-	for (tileno = 0; tileno < 1; tileno++) {
-		opj_tcp_t *tcp = &cp->tcps[curtileno];
-		int j;
-
-		/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-		int p = curtileno % cp->tw;	/* si numerotation matricielle .. */
-		int q = curtileno / cp->tw;	/* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
-
-		/* opj_tcd_tile_t *tile=&tcd->tcd_image->tiles[tileno]; */
-		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-
-		/* 4 borders of the tile rescale on the image if necessary */
-		tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-		tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-		tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-		tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-		tile->numcomps = image->numcomps;
-		/* tile->PPT=image->PPT;  */
-
-		/* Modification of the RATE >> */
-		for (j = 0; j < tcp->numlayers; j++) {
-			tcp->rates[j] = tcp->rates[j] ? 
-				cp->tp_on ? 
-					(((float) (tile->numcomps 
-					* (tile->x1 - tile->x0) 
-					* (tile->y1 - tile->y0)
-					* image->comps[0].prec))
-					/(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
-					:
-				((float) (tile->numcomps 
-					* (tile->x1 - tile->x0) 
-					* (tile->y1 - tile->y0) 
-					* image->comps[0].prec))/ 
-					(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
-					: 0;
-
-			if (tcp->rates[j]) {
-				if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
-					tcp->rates[j] = tcp->rates[j - 1] + 20;
-				} else {
-					if (!j && tcp->rates[j] < 30)
-						tcp->rates[j] = 30;
-				}
-				
-				if(j == (tcp->numlayers-1)){
-					tcp->rates[j] = tcp->rates[j]- 2;
-				}
-			}
-		}
-		/* << Modification of the RATE */
-		
-		tile->comps = (opj_tcd_tilecomp_t *) opj_malloc(image->numcomps * sizeof(opj_tcd_tilecomp_t));
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tccp_t *tccp = &tcp->tccps[compno];
-
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-			/* border of each tile component (global) */
-			tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-			tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-			tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-			tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-			
-			tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
-			tilec->numresolutions = tccp->numresolutions;
-
-			tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
-			
-			for (resno = 0; resno < tilec->numresolutions; resno++) {
-				int pdx, pdy;
-				int levelno = tilec->numresolutions - 1 - resno;
-				int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-				int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-				int cbgwidthexpn, cbgheightexpn;
-				int cblkwidthexpn, cblkheightexpn;
-
-				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-				
-				/* border for each resolution level (global) */
-				res->x0 = int_ceildivpow2(tilec->x0, levelno);
-				res->y0 = int_ceildivpow2(tilec->y0, levelno);
-				res->x1 = int_ceildivpow2(tilec->x1, levelno);
-				res->y1 = int_ceildivpow2(tilec->y1, levelno);
-				
-				res->numbands = resno == 0 ? 1 : 3;
-				/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					pdx = tccp->prcw[resno];
-					pdy = tccp->prch[resno];
-				} else {
-					pdx = 15;
-					pdy = 15;
-				}
-				/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-				tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-				tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-				
-				brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-				brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-				
-				res->pw = (brprcxend - tlprcxstart) >> pdx;
-				res->ph = (brprcyend - tlprcystart) >> pdy;
-				
-				if (resno == 0) {
-					tlcbgxstart = tlprcxstart;
-					tlcbgystart = tlprcystart;
-					brcbgxend = brprcxend;
-					brcbgyend = brprcyend;
-					cbgwidthexpn = pdx;
-					cbgheightexpn = pdy;
-				} else {
-					tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-					tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-					brcbgxend = int_ceildivpow2(brprcxend, 1);
-					brcbgyend = int_ceildivpow2(brprcyend, 1);
-					cbgwidthexpn = pdx - 1;
-					cbgheightexpn = pdy - 1;
-				}
-				
-				cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-				cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-				
-				for (bandno = 0; bandno < res->numbands; bandno++) {
-					int x0b, y0b, i;
-					int gain, numbps;
-					opj_stepsize_t *ss = NULL;
-
-					opj_tcd_band_t *band = &res->bands[bandno];
-
-					band->bandno = resno == 0 ? 0 : bandno + 1;
-					x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-					y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-					
-					if (band->bandno == 0) {
-						/* band border (global) */
-						band->x0 = int_ceildivpow2(tilec->x0, levelno);
-						band->y0 = int_ceildivpow2(tilec->y0, levelno);
-						band->x1 = int_ceildivpow2(tilec->x1, levelno);
-						band->y1 = int_ceildivpow2(tilec->y1, levelno);
-					} else {
-						/* band border (global) */
-						band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-						band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-						band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-						band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-					}
-					
-					ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-					gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);					
-					numbps = image->comps[compno].prec + gain;
-					
-					band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
-					band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
-					
-					band->precincts = (opj_tcd_precinct_t *) opj_malloc(3 * res->pw * res->ph * sizeof(opj_tcd_precinct_t));
-					
-					for (i = 0; i < res->pw * res->ph * 3; i++) {
-						band->precincts[i].imsbtree = NULL;
-						band->precincts[i].incltree = NULL;
-						band->precincts[i].cblks.enc = NULL;
-					}
-					
-					for (precno = 0; precno < res->pw * res->ph; precno++) {
-						int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-
-						int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-						int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-						int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-						int cbgyend = cbgystart + (1 << cbgheightexpn);
-
-						opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-						/* precinct size (global) */
-						prc->x0 = int_max(cbgxstart, band->x0);
-						prc->y0 = int_max(cbgystart, band->y0);
-						prc->x1 = int_min(cbgxend, band->x1);
-						prc->y1 = int_min(cbgyend, band->y1);
-
-						tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-						tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-						brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-						brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-						prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-						prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-						prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc((prc->cw * prc->ch), sizeof(opj_tcd_cblk_enc_t));
-						prc->incltree = tgt_create(prc->cw, prc->ch);
-						prc->imsbtree = tgt_create(prc->cw, prc->ch);
-						
-						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-							int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-							int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-							int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-							int cblkyend = cblkystart + (1 << cblkheightexpn);
-							
-							opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-
-							/* code-block size (global) */
-							cblk->x0 = int_max(cblkxstart, prc->x0);
-							cblk->y0 = int_max(cblkystart, prc->y0);
-							cblk->x1 = int_min(cblkxend, prc->x1);
-							cblk->y1 = int_min(cblkyend, prc->y1);
-							cblk->data = (unsigned char*) opj_calloc(9728+2, sizeof(unsigned char));
-							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
-							cblk->data[0] = 0;
-							cblk->data[1] = 0;
-							cblk->data += 2;
-							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
-							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
+void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno)
+{
+    int tileno, compno, resno, bandno, precno, cblkno;
+
+    tcd->image = image;
+    tcd->cp = cp;
+    tcd->tcd_image->tw = cp->tw;
+    tcd->tcd_image->th = cp->th;
+    tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(sizeof(opj_tcd_tile_t));
+
+    for (tileno = 0; tileno < 1; tileno++) {
+        opj_tcp_t *tcp = &cp->tcps[curtileno];
+        int j;
+
+        /* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
+        int p = curtileno % cp->tw;	/* si numerotation matricielle .. */
+        int q = curtileno / cp->tw;	/* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
+
+        /* opj_tcd_tile_t *tile=&tcd->tcd_image->tiles[tileno]; */
+        opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
+
+        /* 4 borders of the tile rescale on the image if necessary */
+        tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+        tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+        tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+        tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+        tile->numcomps = image->numcomps;
+        /* tile->PPT=image->PPT;  */
+
+        /* Modification of the RATE >> */
+        for (j = 0; j < tcp->numlayers; j++) {
+            tcp->rates[j] = tcp->rates[j] ?
+                            cp->tp_on ?
+                            (((float) (tile->numcomps
+                                       * (tile->x1 - tile->x0)
+                                       * (tile->y1 - tile->y0)
+                                       * image->comps[0].prec))
+                             /(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
+                            :
+                            ((float) (tile->numcomps
+                                      * (tile->x1 - tile->x0)
+                                      * (tile->y1 - tile->y0)
+                                      * image->comps[0].prec))/
+                            (tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
+                            : 0;
+
+            if (tcp->rates[j]) {
+                if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
+                    tcp->rates[j] = tcp->rates[j - 1] + 20;
+                } else {
+                    if (!j && tcp->rates[j] < 30)
+                        tcp->rates[j] = 30;
+                }
+
+                if(j == (tcp->numlayers-1)) {
+                    tcp->rates[j] = tcp->rates[j]- 2;
+                }
+            }
+        }
+        /* << Modification of the RATE */
+
+        tile->comps = (opj_tcd_tilecomp_t *) opj_malloc(image->numcomps * sizeof(opj_tcd_tilecomp_t));
+        for (compno = 0; compno < tile->numcomps; compno++) {
+            opj_tccp_t *tccp = &tcp->tccps[compno];
+
+            opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+
+            /* border of each tile component (global) */
+            tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
+            tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
+            tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
+            tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
+
+            tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
+            tilec->numresolutions = tccp->numresolutions;
+
+            tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
+
+            for (resno = 0; resno < tilec->numresolutions; resno++) {
+                int pdx, pdy;
+                int levelno = tilec->numresolutions - 1 - resno;
+                int tlprcxstart, tlprcystart, brprcxend, brprcyend;
+                int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
+                int cbgwidthexpn, cbgheightexpn;
+                int cblkwidthexpn, cblkheightexpn;
+
+                opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+                /* border for each resolution level (global) */
+                res->x0 = int_ceildivpow2(tilec->x0, levelno);
+                res->y0 = int_ceildivpow2(tilec->y0, levelno);
+                res->x1 = int_ceildivpow2(tilec->x1, levelno);
+                res->y1 = int_ceildivpow2(tilec->y1, levelno);
+
+                res->numbands = resno == 0 ? 1 : 3;
+                /* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
+                if (tccp->csty & J2K_CCP_CSTY_PRT) {
+                    pdx = tccp->prcw[resno];
+                    pdy = tccp->prch[resno];
+                } else {
+                    pdx = 15;
+                    pdy = 15;
+                }
+                /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+                tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
+                tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
+
+                brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
+                brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
+
+                res->pw = (brprcxend - tlprcxstart) >> pdx;
+                res->ph = (brprcyend - tlprcystart) >> pdy;
+
+                if (resno == 0) {
+                    tlcbgxstart = tlprcxstart;
+                    tlcbgystart = tlprcystart;
+                    brcbgxend = brprcxend;
+                    brcbgyend = brprcyend;
+                    cbgwidthexpn = pdx;
+                    cbgheightexpn = pdy;
+                } else {
+                    tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
+                    tlcbgystart = int_ceildivpow2(tlprcystart, 1);
+                    brcbgxend = int_ceildivpow2(brprcxend, 1);
+                    brcbgyend = int_ceildivpow2(brprcyend, 1);
+                    cbgwidthexpn = pdx - 1;
+                    cbgheightexpn = pdy - 1;
+                }
+
+                cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
+                cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
+
+                for (bandno = 0; bandno < res->numbands; bandno++) {
+                    int x0b, y0b, i;
+                    int gain, numbps;
+                    opj_stepsize_t *ss = NULL;
+
+                    opj_tcd_band_t *band = &res->bands[bandno];
+
+                    band->bandno = resno == 0 ? 0 : bandno + 1;
+                    x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
+                    y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
+
+                    if (band->bandno == 0) {
+                        /* band border (global) */
+                        band->x0 = int_ceildivpow2(tilec->x0, levelno);
+                        band->y0 = int_ceildivpow2(tilec->y0, levelno);
+                        band->x1 = int_ceildivpow2(tilec->x1, levelno);
+                        band->y1 = int_ceildivpow2(tilec->y1, levelno);
+                    } else {
+                        /* band border (global) */
+                        band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
+                        band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
+                        band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
+                        band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
+                    }
+
+                    ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
+                    gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
+                    numbps = image->comps[compno].prec + gain;
+
+                    band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
+                    band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
+
+                    band->precincts = (opj_tcd_precinct_t *) opj_malloc(3 * res->pw * res->ph * sizeof(opj_tcd_precinct_t));
+
+                    for (i = 0; i < res->pw * res->ph * 3; i++) {
+                        band->precincts[i].imsbtree = NULL;
+                        band->precincts[i].incltree = NULL;
+                        band->precincts[i].cblks.enc = NULL;
+                    }
+
+                    for (precno = 0; precno < res->pw * res->ph; precno++) {
+                        int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
+
+                        int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
+                        int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
+                        int cbgxend = cbgxstart + (1 << cbgwidthexpn);
+                        int cbgyend = cbgystart + (1 << cbgheightexpn);
+
+                        opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+                        /* precinct size (global) */
+                        prc->x0 = int_max(cbgxstart, band->x0);
+                        prc->y0 = int_max(cbgystart, band->y0);
+                        prc->x1 = int_min(cbgxend, band->x1);
+                        prc->y1 = int_min(cbgyend, band->y1);
+
+                        tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
+                        tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
+                        brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
+                        brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
+                        prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
+                        prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
+
+                        prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc((prc->cw * prc->ch), sizeof(opj_tcd_cblk_enc_t));
+                        prc->incltree = tgt_create(prc->cw, prc->ch);
+                        prc->imsbtree = tgt_create(prc->cw, prc->ch);
+
+                        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                            int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
+                            int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
+                            int cblkxend = cblkxstart + (1 << cblkwidthexpn);
+                            int cblkyend = cblkystart + (1 << cblkheightexpn);
+
+                            opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+
+                            /* code-block size (global) */
+                            cblk->x0 = int_max(cblkxstart, prc->x0);
+                            cblk->y0 = int_max(cblkystart, prc->y0);
+                            cblk->x1 = int_min(cblkxend, prc->x1);
+                            cblk->y1 = int_min(cblkyend, prc->y1);
+                            cblk->data = (unsigned char*) opj_calloc(9728+2, sizeof(unsigned char));
+                            /* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
+                            cblk->data[0] = 0;
+                            cblk->data[1] = 0;
+                            cblk->data += 2;
+                            cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
+                            cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /* tcd_dump(stdout, tcd, &tcd->tcd_image); */
 }
 
-void tcd_free_encode(opj_tcd_t *tcd) {
-	int tileno, compno, resno, bandno, precno, cblkno;
-
-	for (tileno = 0; tileno < 1; tileno++) {
-		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-			for (resno = 0; resno < tilec->numresolutions; resno++) {
-				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-				for (bandno = 0; bandno < res->numbands; bandno++) {
-					opj_tcd_band_t *band = &res->bands[bandno];
-
-					for (precno = 0; precno < res->pw * res->ph; precno++) {
-						opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-						if (prc->incltree != NULL) {
-							tgt_destroy(prc->incltree);
-							prc->incltree = NULL;
-						}
-						if (prc->imsbtree != NULL) {
-							tgt_destroy(prc->imsbtree);	
-							prc->imsbtree = NULL;
-						}
-						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-							opj_free(prc->cblks.enc[cblkno].data - 2);
-							opj_free(prc->cblks.enc[cblkno].layers);
-							opj_free(prc->cblks.enc[cblkno].passes);
-						}
-						opj_free(prc->cblks.enc);
-					} /* for (precno */
-					opj_free(band->precincts);
-					band->precincts = NULL;
-				} /* for (bandno */
-			} /* for (resno */
-			opj_free(tilec->resolutions);
-			tilec->resolutions = NULL;
-		} /* for (compno */
-		opj_free(tile->comps);
-		tile->comps = NULL;
-	} /* for (tileno */
-	opj_free(tcd->tcd_image->tiles);
-	tcd->tcd_image->tiles = NULL;
+void tcd_free_encode(opj_tcd_t *tcd)
+{
+    int tileno, compno, resno, bandno, precno, cblkno;
+
+    for (tileno = 0; tileno < 1; tileno++) {
+        opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
+
+        for (compno = 0; compno < tile->numcomps; compno++) {
+            opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+
+            for (resno = 0; resno < tilec->numresolutions; resno++) {
+                opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+                for (bandno = 0; bandno < res->numbands; bandno++) {
+                    opj_tcd_band_t *band = &res->bands[bandno];
+
+                    for (precno = 0; precno < res->pw * res->ph; precno++) {
+                        opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+                        if (prc->incltree != NULL) {
+                            tgt_destroy(prc->incltree);
+                            prc->incltree = NULL;
+                        }
+                        if (prc->imsbtree != NULL) {
+                            tgt_destroy(prc->imsbtree);
+                            prc->imsbtree = NULL;
+                        }
+                        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                            opj_free(prc->cblks.enc[cblkno].data - 2);
+                            opj_free(prc->cblks.enc[cblkno].layers);
+                            opj_free(prc->cblks.enc[cblkno].passes);
+                        }
+                        opj_free(prc->cblks.enc);
+                    } /* for (precno */
+                    opj_free(band->precincts);
+                    band->precincts = NULL;
+                } /* for (bandno */
+            } /* for (resno */
+            opj_free(tilec->resolutions);
+            tilec->resolutions = NULL;
+        } /* for (compno */
+        opj_free(tile->comps);
+        tile->comps = NULL;
+    } /* for (tileno */
+    opj_free(tcd->tcd_image->tiles);
+    tcd->tcd_image->tiles = NULL;
 }
 
-void tcd_init_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno) {
-	int tileno, compno, resno, bandno, precno, cblkno;
-
-	for (tileno = 0; tileno < 1; tileno++) {
-		opj_tcp_t *tcp = &cp->tcps[curtileno];
-		int j;
-		/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-		int p = curtileno % cp->tw;
-		int q = curtileno / cp->tw;
-
-		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-		
-		/* 4 borders of the tile rescale on the image if necessary */
-		tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-		tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-		tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-		tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-		
-		tile->numcomps = image->numcomps;
-		/* tile->PPT=image->PPT; */
-
-		/* Modification of the RATE >> */
-		for (j = 0; j < tcp->numlayers; j++) {
-			tcp->rates[j] = tcp->rates[j] ? 
-				cp->tp_on ? 
-					(((float) (tile->numcomps 
-					* (tile->x1 - tile->x0) 
-					* (tile->y1 - tile->y0)
-					* image->comps[0].prec))
-					/(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
-					:
-				((float) (tile->numcomps 
-					* (tile->x1 - tile->x0) 
-					* (tile->y1 - tile->y0) 
-					* image->comps[0].prec))/ 
-					(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
-					: 0;
-
-			if (tcp->rates[j]) {
-				if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
-					tcp->rates[j] = tcp->rates[j - 1] + 20;
-				} else {
-					if (!j && tcp->rates[j] < 30)
-						tcp->rates[j] = 30;
-				}
-			}
-		}
-		/* << Modification of the RATE */
-
-		/* tile->comps=(opj_tcd_tilecomp_t*)opj_realloc(tile->comps,image->numcomps*sizeof(opj_tcd_tilecomp_t)); */
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tccp_t *tccp = &tcp->tccps[compno];
-			
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-			/* border of each tile component (global) */
-			tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-			tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-			tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-			tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-			
-			tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
-			tilec->numresolutions = tccp->numresolutions;
-			/* tilec->resolutions=(opj_tcd_resolution_t*)opj_realloc(tilec->resolutions,tilec->numresolutions*sizeof(opj_tcd_resolution_t)); */
-			for (resno = 0; resno < tilec->numresolutions; resno++) {
-				int pdx, pdy;
-
-				int levelno = tilec->numresolutions - 1 - resno;
-				int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-				int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-				int cbgwidthexpn, cbgheightexpn;
-				int cblkwidthexpn, cblkheightexpn;
-				
-				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-				/* border for each resolution level (global) */
-				res->x0 = int_ceildivpow2(tilec->x0, levelno);
-				res->y0 = int_ceildivpow2(tilec->y0, levelno);
-				res->x1 = int_ceildivpow2(tilec->x1, levelno);
-				res->y1 = int_ceildivpow2(tilec->y1, levelno);	
-				res->numbands = resno == 0 ? 1 : 3;
-
-				/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					pdx = tccp->prcw[resno];
-					pdy = tccp->prch[resno];
-				} else {
-					pdx = 15;
-					pdy = 15;
-				}
-				/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-				tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-				tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-				brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-				brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-				
-				res->pw = (brprcxend - tlprcxstart) >> pdx;
-				res->ph = (brprcyend - tlprcystart) >> pdy;
-				
-				if (resno == 0) {
-					tlcbgxstart = tlprcxstart;
-					tlcbgystart = tlprcystart;
-					brcbgxend = brprcxend;
-					brcbgyend = brprcyend;
-					cbgwidthexpn = pdx;
-					cbgheightexpn = pdy;
-				} else {
-					tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-					tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-					brcbgxend = int_ceildivpow2(brprcxend, 1);
-					brcbgyend = int_ceildivpow2(brprcyend, 1);
-					cbgwidthexpn = pdx - 1;
-					cbgheightexpn = pdy - 1;
-				}
-				
-				cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-				cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-				
-				for (bandno = 0; bandno < res->numbands; bandno++) {
-					int x0b, y0b;
-					int gain, numbps;
-					opj_stepsize_t *ss = NULL;
-
-					opj_tcd_band_t *band = &res->bands[bandno];
-
-					band->bandno = resno == 0 ? 0 : bandno + 1;
-					x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-					y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-					
-					if (band->bandno == 0) {
-						/* band border */
-						band->x0 = int_ceildivpow2(tilec->x0, levelno);
-						band->y0 = int_ceildivpow2(tilec->y0, levelno);
-						band->x1 = int_ceildivpow2(tilec->x1, levelno);
-						band->y1 = int_ceildivpow2(tilec->y1, levelno);
-					} else {
-						band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-						band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-						band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-						band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-					}
-					
-					ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-					gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
-					numbps = image->comps[compno].prec + gain;
-					band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
-					band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
-					
-					for (precno = 0; precno < res->pw * res->ph; precno++) {
-						int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-
-						int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-						int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-						int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-						int cbgyend = cbgystart + (1 << cbgheightexpn);
-						
-						opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-						/* precinct size (global) */
-						prc->x0 = int_max(cbgxstart, band->x0);
-						prc->y0 = int_max(cbgystart, band->y0);
-						prc->x1 = int_min(cbgxend, band->x1);
-						prc->y1 = int_min(cbgyend, band->y1);
-
-						tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-						tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-						brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-						brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-						prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-						prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-						opj_free(prc->cblks.enc);
-						prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc(prc->cw * prc->ch, sizeof(opj_tcd_cblk_enc_t));
-
-						if (prc->incltree != NULL) {
-							tgt_destroy(prc->incltree);
-						}
-						if (prc->imsbtree != NULL) {
-							tgt_destroy(prc->imsbtree);
-						}
-						
-						prc->incltree = tgt_create(prc->cw, prc->ch);
-						prc->imsbtree = tgt_create(prc->cw, prc->ch);
-
-						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-							int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-							int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-							int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-							int cblkyend = cblkystart + (1 << cblkheightexpn);
-
-							opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-
-							/* code-block size (global) */
-							cblk->x0 = int_max(cblkxstart, prc->x0);
-							cblk->y0 = int_max(cblkystart, prc->y0);
-							cblk->x1 = int_min(cblkxend, prc->x1);
-							cblk->y1 = int_min(cblkyend, prc->y1);
-							cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
-							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
-							cblk->data[0] = 0;
-							cblk->data[1] = 0;
-							cblk->data += 2;
-							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
-							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
-						}
-					} /* precno */
-				} /* bandno */
-			} /* resno */
-		} /* compno */
-	} /* tileno */
-
-	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
+void tcd_init_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno)
+{
+    int tileno, compno, resno, bandno, precno, cblkno;
+
+    for (tileno = 0; tileno < 1; tileno++) {
+        opj_tcp_t *tcp = &cp->tcps[curtileno];
+        int j;
+        /* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
+        int p = curtileno % cp->tw;
+        int q = curtileno / cp->tw;
+
+        opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
+
+        /* 4 borders of the tile rescale on the image if necessary */
+        tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+        tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+        tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+        tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+
+        tile->numcomps = image->numcomps;
+        /* tile->PPT=image->PPT; */
+
+        /* Modification of the RATE >> */
+        for (j = 0; j < tcp->numlayers; j++) {
+            tcp->rates[j] = tcp->rates[j] ?
+                            cp->tp_on ?
+                            (((float) (tile->numcomps
+                                       * (tile->x1 - tile->x0)
+                                       * (tile->y1 - tile->y0)
+                                       * image->comps[0].prec))
+                             /(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
+                            :
+                            ((float) (tile->numcomps
+                                      * (tile->x1 - tile->x0)
+                                      * (tile->y1 - tile->y0)
+                                      * image->comps[0].prec))/
+                            (tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
+                            : 0;
+
+            if (tcp->rates[j]) {
+                if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
+                    tcp->rates[j] = tcp->rates[j - 1] + 20;
+                } else {
+                    if (!j && tcp->rates[j] < 30)
+                        tcp->rates[j] = 30;
+                }
+            }
+        }
+        /* << Modification of the RATE */
+
+        /* tile->comps=(opj_tcd_tilecomp_t*)opj_realloc(tile->comps,image->numcomps*sizeof(opj_tcd_tilecomp_t)); */
+        for (compno = 0; compno < tile->numcomps; compno++) {
+            opj_tccp_t *tccp = &tcp->tccps[compno];
+
+            opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+
+            /* border of each tile component (global) */
+            tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
+            tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
+            tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
+            tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
+
+            tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
+            tilec->numresolutions = tccp->numresolutions;
+            /* tilec->resolutions=(opj_tcd_resolution_t*)opj_realloc(tilec->resolutions,tilec->numresolutions*sizeof(opj_tcd_resolution_t)); */
+            for (resno = 0; resno < tilec->numresolutions; resno++) {
+                int pdx, pdy;
+
+                int levelno = tilec->numresolutions - 1 - resno;
+                int tlprcxstart, tlprcystart, brprcxend, brprcyend;
+                int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
+                int cbgwidthexpn, cbgheightexpn;
+                int cblkwidthexpn, cblkheightexpn;
+
+                opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+                /* border for each resolution level (global) */
+                res->x0 = int_ceildivpow2(tilec->x0, levelno);
+                res->y0 = int_ceildivpow2(tilec->y0, levelno);
+                res->x1 = int_ceildivpow2(tilec->x1, levelno);
+                res->y1 = int_ceildivpow2(tilec->y1, levelno);
+                res->numbands = resno == 0 ? 1 : 3;
+
+                /* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
+                if (tccp->csty & J2K_CCP_CSTY_PRT) {
+                    pdx = tccp->prcw[resno];
+                    pdy = tccp->prch[resno];
+                } else {
+                    pdx = 15;
+                    pdy = 15;
+                }
+                /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+                tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
+                tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
+                brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
+                brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
+
+                res->pw = (brprcxend - tlprcxstart) >> pdx;
+                res->ph = (brprcyend - tlprcystart) >> pdy;
+
+                if (resno == 0) {
+                    tlcbgxstart = tlprcxstart;
+                    tlcbgystart = tlprcystart;
+                    brcbgxend = brprcxend;
+                    brcbgyend = brprcyend;
+                    cbgwidthexpn = pdx;
+                    cbgheightexpn = pdy;
+                } else {
+                    tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
+                    tlcbgystart = int_ceildivpow2(tlprcystart, 1);
+                    brcbgxend = int_ceildivpow2(brprcxend, 1);
+                    brcbgyend = int_ceildivpow2(brprcyend, 1);
+                    cbgwidthexpn = pdx - 1;
+                    cbgheightexpn = pdy - 1;
+                }
+
+                cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
+                cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
+
+                for (bandno = 0; bandno < res->numbands; bandno++) {
+                    int x0b, y0b;
+                    int gain, numbps;
+                    opj_stepsize_t *ss = NULL;
+
+                    opj_tcd_band_t *band = &res->bands[bandno];
+
+                    band->bandno = resno == 0 ? 0 : bandno + 1;
+                    x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
+                    y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
+
+                    if (band->bandno == 0) {
+                        /* band border */
+                        band->x0 = int_ceildivpow2(tilec->x0, levelno);
+                        band->y0 = int_ceildivpow2(tilec->y0, levelno);
+                        band->x1 = int_ceildivpow2(tilec->x1, levelno);
+                        band->y1 = int_ceildivpow2(tilec->y1, levelno);
+                    } else {
+                        band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
+                        band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
+                        band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
+                        band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
+                    }
+
+                    ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
+                    gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
+                    numbps = image->comps[compno].prec + gain;
+                    band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
+                    band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
+
+                    for (precno = 0; precno < res->pw * res->ph; precno++) {
+                        int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
+
+                        int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
+                        int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
+                        int cbgxend = cbgxstart + (1 << cbgwidthexpn);
+                        int cbgyend = cbgystart + (1 << cbgheightexpn);
+
+                        opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+                        /* precinct size (global) */
+                        prc->x0 = int_max(cbgxstart, band->x0);
+                        prc->y0 = int_max(cbgystart, band->y0);
+                        prc->x1 = int_min(cbgxend, band->x1);
+                        prc->y1 = int_min(cbgyend, band->y1);
+
+                        tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
+                        tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
+                        brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
+                        brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
+                        prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
+                        prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
+
+                        opj_free(prc->cblks.enc);
+                        prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc(prc->cw * prc->ch, sizeof(opj_tcd_cblk_enc_t));
+
+                        if (prc->incltree != NULL) {
+                            tgt_destroy(prc->incltree);
+                        }
+                        if (prc->imsbtree != NULL) {
+                            tgt_destroy(prc->imsbtree);
+                        }
+
+                        prc->incltree = tgt_create(prc->cw, prc->ch);
+                        prc->imsbtree = tgt_create(prc->cw, prc->ch);
+
+                        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                            int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
+                            int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
+                            int cblkxend = cblkxstart + (1 << cblkwidthexpn);
+                            int cblkyend = cblkystart + (1 << cblkheightexpn);
+
+                            opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+
+                            /* code-block size (global) */
+                            cblk->x0 = int_max(cblkxstart, prc->x0);
+                            cblk->y0 = int_max(cblkystart, prc->y0);
+                            cblk->x1 = int_min(cblkxend, prc->x1);
+                            cblk->y1 = int_min(cblkyend, prc->y1);
+                            cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
+                            /* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
+                            cblk->data[0] = 0;
+                            cblk->data[1] = 0;
+                            cblk->data += 2;
+                            cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
+                            cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
+                        }
+                    } /* precno */
+                } /* bandno */
+            } /* resno */
+        } /* compno */
+    } /* tileno */
+
+    /* tcd_dump(stdout, tcd, &tcd->tcd_image); */
 }
 
-void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp) {
-	int i, j, tileno, p, q;
-	unsigned int x0 = 0, y0 = 0, x1 = 0, y1 = 0, w, h;
+void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp)
+{
+    int i, j, tileno, p, q;
+    unsigned int x0 = 0, y0 = 0, x1 = 0, y1 = 0, w, h;
 
-	tcd->image = image;
-	tcd->tcd_image->tw = cp->tw;
-	tcd->tcd_image->th = cp->th;
+    tcd->image = image;
+    tcd->tcd_image->tw = cp->tw;
+    tcd->tcd_image->th = cp->th;
     tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_calloc(cp->tw * cp->th, sizeof(opj_tcd_tile_t));
 
-	/* 
-	Allocate place to store the decoded data = final image
-	Place limited by the tile really present in the codestream 
-	*/
-
-	for (j = 0; j < cp->tileno_size; j++) {
-		opj_tcd_tile_t *tile;
-		
-		tileno = cp->tileno[j];		
-		tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);		
-		tile->numcomps = image->numcomps;
-		tile->comps = (opj_tcd_tilecomp_t*) opj_calloc(image->numcomps, sizeof(opj_tcd_tilecomp_t));
-	}
-
-	for (i = 0; i < image->numcomps; i++) {
-		for (j = 0; j < cp->tileno_size; j++) {
-			opj_tcd_tile_t *tile;
-			opj_tcd_tilecomp_t *tilec;
-			
-			/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-			
-			tileno = cp->tileno[j];
-			
-			tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
-			tilec = &tile->comps[i];
-			
-			p = tileno % cp->tw;	/* si numerotation matricielle .. */
-			q = tileno / cp->tw;	/* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
-			
-			/* 4 borders of the tile rescale on the image if necessary */
-			tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-			tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-			tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-			tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-
-			tilec->x0 = int_ceildiv(tile->x0, image->comps[i].dx);
-			tilec->y0 = int_ceildiv(tile->y0, image->comps[i].dy);
-			tilec->x1 = int_ceildiv(tile->x1, image->comps[i].dx);
-			tilec->y1 = int_ceildiv(tile->y1, image->comps[i].dy);
-
-			x0 = j == 0 ? tilec->x0 : int_min(x0, (unsigned int) tilec->x0);
-			y0 = j == 0 ? tilec->y0 : int_min(y0,	(unsigned int) tilec->y0);
-			x1 = j == 0 ? tilec->x1 : int_max(x1,	(unsigned int) tilec->x1);
-			y1 = j == 0 ? tilec->y1 : int_max(y1,	(unsigned int) tilec->y1);
-		}
-
-		w = int_ceildivpow2(x1 - x0, image->comps[i].factor);
-		h = int_ceildivpow2(y1 - y0, image->comps[i].factor);
-
-		image->comps[i].w = w;
-		image->comps[i].h = h;
-		image->comps[i].x0 = x0;
-		image->comps[i].y0 = y0;
-	}
+    /*
+    Allocate place to store the decoded data = final image
+    Place limited by the tile really present in the codestream
+    */
+
+    for (j = 0; j < cp->tileno_size; j++) {
+        opj_tcd_tile_t *tile;
+
+        tileno = cp->tileno[j];
+        tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
+        tile->numcomps = image->numcomps;
+        tile->comps = (opj_tcd_tilecomp_t*) opj_calloc(image->numcomps, sizeof(opj_tcd_tilecomp_t));
+    }
+
+    for (i = 0; i < image->numcomps; i++) {
+        for (j = 0; j < cp->tileno_size; j++) {
+            opj_tcd_tile_t *tile;
+            opj_tcd_tilecomp_t *tilec;
+
+            /* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
+
+            tileno = cp->tileno[j];
+
+            tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
+            tilec = &tile->comps[i];
+
+            p = tileno % cp->tw;	/* si numerotation matricielle .. */
+            q = tileno / cp->tw;	/* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
+
+            /* 4 borders of the tile rescale on the image if necessary */
+            tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+            tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+            tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+            tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+
+            tilec->x0 = int_ceildiv(tile->x0, image->comps[i].dx);
+            tilec->y0 = int_ceildiv(tile->y0, image->comps[i].dy);
+            tilec->x1 = int_ceildiv(tile->x1, image->comps[i].dx);
+            tilec->y1 = int_ceildiv(tile->y1, image->comps[i].dy);
+
+            x0 = j == 0 ? tilec->x0 : int_min(x0, (unsigned int) tilec->x0);
+            y0 = j == 0 ? tilec->y0 : int_min(y0,	(unsigned int) tilec->y0);
+            x1 = j == 0 ? tilec->x1 : int_max(x1,	(unsigned int) tilec->x1);
+            y1 = j == 0 ? tilec->y1 : int_max(y1,	(unsigned int) tilec->y1);
+        }
+
+        w = int_ceildivpow2(x1 - x0, image->comps[i].factor);
+        h = int_ceildivpow2(y1 - y0, image->comps[i].factor);
+
+        image->comps[i].w = w;
+        image->comps[i].h = h;
+        image->comps[i].x0 = x0;
+        image->comps[i].y0 = y0;
+    }
 }
 
-void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int tileno, opj_codestream_info_t *cstr_info) {
-	int compno, resno, bandno, precno, cblkno;
-	opj_tcp_t *tcp;
-	opj_tcd_tile_t *tile;
-
-	OPJ_ARG_NOT_USED(cstr_info);
-
-	tcd->cp = cp;
-	
-	tcp = &(cp->tcps[cp->tileno[tileno]]);
-	tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
-	
-	tileno = cp->tileno[tileno];
-	
-	for (compno = 0; compno < tile->numcomps; compno++) {
-		opj_tccp_t *tccp = &tcp->tccps[compno];
-		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-		
-		if (tccp->numresolutions <= 0)
-		{
-			cp->tileno[tileno] = -1;
-			return;
-		}
-
-		/* border of each tile component (global) */
-		tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-		tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-		tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-		tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-
-		tilec->numresolutions = tccp->numresolutions;
-		tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
-		
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			int pdx, pdy;
-			int levelno = tilec->numresolutions - 1 - resno;
-			int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-			int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-			int cbgwidthexpn, cbgheightexpn;
-			int cblkwidthexpn, cblkheightexpn;
-			
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-			
-			/* border for each resolution level (global) */
-			res->x0 = int_ceildivpow2(tilec->x0, levelno);
-			res->y0 = int_ceildivpow2(tilec->y0, levelno);
-			res->x1 = int_ceildivpow2(tilec->x1, levelno);
-			res->y1 = int_ceildivpow2(tilec->y1, levelno);
-			res->numbands = resno == 0 ? 1 : 3;
-			
-			/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-			if (tccp->csty & J2K_CCP_CSTY_PRT) {
-				pdx = tccp->prcw[resno];
-				pdy = tccp->prch[resno];
-			} else {
-				pdx = 15;
-				pdy = 15;
-			}			
-			
-			/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-			tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-			tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-			brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-			brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-			
-			res->pw = (res->x0 == res->x1) ? 0 : ((brprcxend - tlprcxstart) >> pdx);
-			res->ph = (res->y0 == res->y1) ? 0 : ((brprcyend - tlprcystart) >> pdy);
-			
-			if (resno == 0) {
-				tlcbgxstart = tlprcxstart;
-				tlcbgystart = tlprcystart;
-				brcbgxend = brprcxend;
-				brcbgyend = brprcyend;
-				cbgwidthexpn = pdx;
-				cbgheightexpn = pdy;
-			} else {
-				tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-				tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-				brcbgxend = int_ceildivpow2(brprcxend, 1);
-				brcbgyend = int_ceildivpow2(brprcyend, 1);
-				cbgwidthexpn = pdx - 1;
-				cbgheightexpn = pdy - 1;
-			}
-			
-			cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-			cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-			
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				int x0b, y0b;
-				int gain, numbps;
-				opj_stepsize_t *ss = NULL;
-				
-				opj_tcd_band_t *band = &res->bands[bandno];
-				band->bandno = resno == 0 ? 0 : bandno + 1;
-				x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-				y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-				
-				if (band->bandno == 0) {
-					/* band border (global) */
-					band->x0 = int_ceildivpow2(tilec->x0, levelno);
-					band->y0 = int_ceildivpow2(tilec->y0, levelno);
-					band->x1 = int_ceildivpow2(tilec->x1, levelno);
-					band->y1 = int_ceildivpow2(tilec->y1, levelno);
-				} else {
-					/* band border (global) */
-					band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-					band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-					band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-					band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-				}
-				
-				ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-				gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
-				numbps = image->comps[compno].prec + gain;
-				band->stepsize = (float)(((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn)) * 0.5);
-				band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
-				
-				band->precincts = (opj_tcd_precinct_t *) opj_malloc(res->pw * res->ph * sizeof(opj_tcd_precinct_t));
-				
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
-					int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-					int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-					int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-					int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-					int cbgyend = cbgystart + (1 << cbgheightexpn);
-					
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-					/* precinct size (global) */
-					prc->x0 = int_max(cbgxstart, band->x0);
-					prc->y0 = int_max(cbgystart, band->y0);
-					prc->x1 = int_min(cbgxend, band->x1);
-					prc->y1 = int_min(cbgyend, band->y1);
-					
-					tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-					tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-					brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-					brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-					prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-					prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-					prc->cblks.dec = (opj_tcd_cblk_dec_t*) opj_malloc(prc->cw * prc->ch * sizeof(opj_tcd_cblk_dec_t));
-
-					prc->incltree = tgt_create(prc->cw, prc->ch);
-					prc->imsbtree = tgt_create(prc->cw, prc->ch);
-					
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-						int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-						int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-						int cblkyend = cblkystart + (1 << cblkheightexpn);					
-
-						opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-						cblk->data = NULL;
-						cblk->segs = NULL;
-						/* code-block size (global) */
-						cblk->x0 = int_max(cblkxstart, prc->x0);
-						cblk->y0 = int_max(cblkystart, prc->y0);
-						cblk->x1 = int_min(cblkxend, prc->x1);
-						cblk->y1 = int_min(cblkyend, prc->y1);
-						cblk->numsegs = 0;
-					}
-				} /* precno */
-			} /* bandno */
-		} /* resno */
-	} /* compno */
-	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
+void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int tileno, opj_codestream_info_t *cstr_info)
+{
+    int compno, resno, bandno, precno, cblkno;
+    opj_tcp_t *tcp;
+    opj_tcd_tile_t *tile;
+
+    OPJ_ARG_NOT_USED(cstr_info);
+
+    tcd->cp = cp;
+
+    tcp = &(cp->tcps[cp->tileno[tileno]]);
+    tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
+
+    tileno = cp->tileno[tileno];
+
+    for (compno = 0; compno < tile->numcomps; compno++) {
+        opj_tccp_t *tccp = &tcp->tccps[compno];
+        opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+
+        if (tccp->numresolutions <= 0) {
+            cp->tileno[tileno] = -1;
+            return;
+        }
+
+        /* border of each tile component (global) */
+        tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
+        tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
+        tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
+        tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
+
+        tilec->numresolutions = tccp->numresolutions;
+        tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
+
+        for (resno = 0; resno < tilec->numresolutions; resno++) {
+            int pdx, pdy;
+            int levelno = tilec->numresolutions - 1 - resno;
+            int tlprcxstart, tlprcystart, brprcxend, brprcyend;
+            int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
+            int cbgwidthexpn, cbgheightexpn;
+            int cblkwidthexpn, cblkheightexpn;
+
+            opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+            /* border for each resolution level (global) */
+            res->x0 = int_ceildivpow2(tilec->x0, levelno);
+            res->y0 = int_ceildivpow2(tilec->y0, levelno);
+            res->x1 = int_ceildivpow2(tilec->x1, levelno);
+            res->y1 = int_ceildivpow2(tilec->y1, levelno);
+            res->numbands = resno == 0 ? 1 : 3;
+
+            /* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
+            if (tccp->csty & J2K_CCP_CSTY_PRT) {
+                pdx = tccp->prcw[resno];
+                pdy = tccp->prch[resno];
+            } else {
+                pdx = 15;
+                pdy = 15;
+            }
+
+            /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+            tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
+            tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
+            brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
+            brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
+
+            res->pw = (res->x0 == res->x1) ? 0 : ((brprcxend - tlprcxstart) >> pdx);
+            res->ph = (res->y0 == res->y1) ? 0 : ((brprcyend - tlprcystart) >> pdy);
+
+            if (resno == 0) {
+                tlcbgxstart = tlprcxstart;
+                tlcbgystart = tlprcystart;
+                brcbgxend = brprcxend;
+                brcbgyend = brprcyend;
+                cbgwidthexpn = pdx;
+                cbgheightexpn = pdy;
+            } else {
+                tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
+                tlcbgystart = int_ceildivpow2(tlprcystart, 1);
+                brcbgxend = int_ceildivpow2(brprcxend, 1);
+                brcbgyend = int_ceildivpow2(brprcyend, 1);
+                cbgwidthexpn = pdx - 1;
+                cbgheightexpn = pdy - 1;
+            }
+
+            cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
+            cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
+
+            for (bandno = 0; bandno < res->numbands; bandno++) {
+                int x0b, y0b;
+                int gain, numbps;
+                opj_stepsize_t *ss = NULL;
+
+                opj_tcd_band_t *band = &res->bands[bandno];
+                band->bandno = resno == 0 ? 0 : bandno + 1;
+                x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
+                y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
+
+                if (band->bandno == 0) {
+                    /* band border (global) */
+                    band->x0 = int_ceildivpow2(tilec->x0, levelno);
+                    band->y0 = int_ceildivpow2(tilec->y0, levelno);
+                    band->x1 = int_ceildivpow2(tilec->x1, levelno);
+                    band->y1 = int_ceildivpow2(tilec->y1, levelno);
+                } else {
+                    /* band border (global) */
+                    band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
+                    band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
+                    band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
+                    band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
+                }
+
+                ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
+                gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
+                numbps = image->comps[compno].prec + gain;
+                band->stepsize = (float)(((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn)) * 0.5);
+                band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
+
+                band->precincts = (opj_tcd_precinct_t *) opj_malloc(res->pw * res->ph * sizeof(opj_tcd_precinct_t));
+
+                for (precno = 0; precno < res->pw * res->ph; precno++) {
+                    int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
+                    int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
+                    int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
+                    int cbgxend = cbgxstart + (1 << cbgwidthexpn);
+                    int cbgyend = cbgystart + (1 << cbgheightexpn);
+
+                    opj_tcd_precinct_t *prc = &band->precincts[precno];
+                    /* precinct size (global) */
+                    prc->x0 = int_max(cbgxstart, band->x0);
+                    prc->y0 = int_max(cbgystart, band->y0);
+                    prc->x1 = int_min(cbgxend, band->x1);
+                    prc->y1 = int_min(cbgyend, band->y1);
+
+                    tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
+                    tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
+                    brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
+                    brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
+                    prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
+                    prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
+
+                    prc->cblks.dec = (opj_tcd_cblk_dec_t*) opj_malloc(prc->cw * prc->ch * sizeof(opj_tcd_cblk_dec_t));
+
+                    prc->incltree = tgt_create(prc->cw, prc->ch);
+                    prc->imsbtree = tgt_create(prc->cw, prc->ch);
+
+                    for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                        int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
+                        int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
+                        int cblkxend = cblkxstart + (1 << cblkwidthexpn);
+                        int cblkyend = cblkystart + (1 << cblkheightexpn);
+
+                        opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
+                        cblk->data = NULL;
+                        cblk->segs = NULL;
+                        /* code-block size (global) */
+                        cblk->x0 = int_max(cblkxstart, prc->x0);
+                        cblk->y0 = int_max(cblkystart, prc->y0);
+                        cblk->x1 = int_min(cblkxend, prc->x1);
+                        cblk->y1 = int_min(cblkyend, prc->y1);
+                        cblk->numsegs = 0;
+                    }
+                } /* precno */
+            } /* bandno */
+        } /* resno */
+    } /* compno */
+    /* tcd_dump(stdout, tcd, &tcd->tcd_image); */
 }
 
-void tcd_makelayer_fixed(opj_tcd_t *tcd, int layno, int final) {
-	int compno, resno, bandno, precno, cblkno;
-	int value;			/*, matrice[tcd_tcp->numlayers][tcd_tile->comps[0].numresolutions][3]; */
-	int matrice[10][10][3];
-	int i, j, k;
-
-	opj_cp_t *cp = tcd->cp;
-	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-	opj_tcp_t *tcd_tcp = tcd->tcp;
-
-	/*matrice=(int*)opj_malloc(tcd_tcp->numlayers*tcd_tile->comps[0].numresolutions*3*sizeof(int)); */
-	
-	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-		for (i = 0; i < tcd_tcp->numlayers; i++) {
-			for (j = 0; j < tilec->numresolutions; j++) {
-				for (k = 0; k < 3; k++) {
-					matrice[i][j][k] =
-						(int) (cp->matrice[i * tilec->numresolutions * 3 + j * 3 + k] 
-						* (float) (tcd->image->comps[compno].prec / 16.0));
-				}
-			}
-		}
-        
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				opj_tcd_band_t *band = &res->bands[bandno];
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-						opj_tcd_layer_t *layer = &cblk->layers[layno];
-						int n;
-						int imsb = tcd->image->comps[compno].prec - cblk->numbps;	/* number of bit-plan equal to zero */
-						/* Correction of the matrix of coefficient to include the IMSB information */
-						if (layno == 0) {
-							value = matrice[layno][resno][bandno];
-							if (imsb >= value) {
-								value = 0;
-							} else {
-								value -= imsb;
-							}
-						} else {
-							value =	matrice[layno][resno][bandno] -	matrice[layno - 1][resno][bandno];
-							if (imsb >= matrice[layno - 1][resno][bandno]) {
-								value -= (imsb - matrice[layno - 1][resno][bandno]);
-								if (value < 0) {
-									value = 0;
-								}
-							}
-						}
-						
-						if (layno == 0) {
-							cblk->numpassesinlayers = 0;
-						}
-						
-						n = cblk->numpassesinlayers;
-						if (cblk->numpassesinlayers == 0) {
-							if (value != 0) {
-								n = 3 * value - 2 + cblk->numpassesinlayers;
-							} else {
-								n = cblk->numpassesinlayers;
-							}
-						} else {
-							n = 3 * value + cblk->numpassesinlayers;
-						}
-						
-						layer->numpasses = n - cblk->numpassesinlayers;
-						
-						if (!layer->numpasses)
-							continue;
-						
-						if (cblk->numpassesinlayers == 0) {
-							layer->len = cblk->passes[n - 1].rate;
-							layer->data = cblk->data;
-						} else {
-							layer->len = cblk->passes[n - 1].rate - cblk->passes[cblk->numpassesinlayers - 1].rate;
-							layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
-						}
-						if (final)
-							cblk->numpassesinlayers = n;
-					}
-				}
-			}
-		}
-	}
+void tcd_makelayer_fixed(opj_tcd_t *tcd, int layno, int final)
+{
+    int compno, resno, bandno, precno, cblkno;
+    int value;			/*, matrice[tcd_tcp->numlayers][tcd_tile->comps[0].numresolutions][3]; */
+    int matrice[10][10][3];
+    int i, j, k;
+
+    opj_cp_t *cp = tcd->cp;
+    opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
+    opj_tcp_t *tcd_tcp = tcd->tcp;
+
+    /*matrice=(int*)opj_malloc(tcd_tcp->numlayers*tcd_tile->comps[0].numresolutions*3*sizeof(int)); */
+
+    for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+        opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
+        for (i = 0; i < tcd_tcp->numlayers; i++) {
+            for (j = 0; j < tilec->numresolutions; j++) {
+                for (k = 0; k < 3; k++) {
+                    matrice[i][j][k] =
+                        (int) (cp->matrice[i * tilec->numresolutions * 3 + j * 3 + k]
+                               * (float) (tcd->image->comps[compno].prec / 16.0));
+                }
+            }
+        }
+
+        for (resno = 0; resno < tilec->numresolutions; resno++) {
+            opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+            for (bandno = 0; bandno < res->numbands; bandno++) {
+                opj_tcd_band_t *band = &res->bands[bandno];
+                for (precno = 0; precno < res->pw * res->ph; precno++) {
+                    opj_tcd_precinct_t *prc = &band->precincts[precno];
+                    for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                        opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
+                        opj_tcd_layer_t *layer = &cblk->layers[layno];
+                        int n;
+                        int imsb = tcd->image->comps[compno].prec - cblk->numbps;	/* number of bit-plan equal to zero */
+                        /* Correction of the matrix of coefficient to include the IMSB information */
+                        if (layno == 0) {
+                            value = matrice[layno][resno][bandno];
+                            if (imsb >= value) {
+                                value = 0;
+                            } else {
+                                value -= imsb;
+                            }
+                        } else {
+                            value =	matrice[layno][resno][bandno] -	matrice[layno - 1][resno][bandno];
+                            if (imsb >= matrice[layno - 1][resno][bandno]) {
+                                value -= (imsb - matrice[layno - 1][resno][bandno]);
+                                if (value < 0) {
+                                    value = 0;
+                                }
+                            }
+                        }
+
+                        if (layno == 0) {
+                            cblk->numpassesinlayers = 0;
+                        }
+
+                        n = cblk->numpassesinlayers;
+                        if (cblk->numpassesinlayers == 0) {
+                            if (value != 0) {
+                                n = 3 * value - 2 + cblk->numpassesinlayers;
+                            } else {
+                                n = cblk->numpassesinlayers;
+                            }
+                        } else {
+                            n = 3 * value + cblk->numpassesinlayers;
+                        }
+
+                        layer->numpasses = n - cblk->numpassesinlayers;
+
+                        if (!layer->numpasses)
+                            continue;
+
+                        if (cblk->numpassesinlayers == 0) {
+                            layer->len = cblk->passes[n - 1].rate;
+                            layer->data = cblk->data;
+                        } else {
+                            layer->len = cblk->passes[n - 1].rate - cblk->passes[cblk->numpassesinlayers - 1].rate;
+                            layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
+                        }
+                        if (final)
+                            cblk->numpassesinlayers = n;
+                    }
+                }
+            }
+        }
+    }
 }
 
-void tcd_rateallocate_fixed(opj_tcd_t *tcd) {
-	int layno;
-	for (layno = 0; layno < tcd->tcp->numlayers; layno++) {
-		tcd_makelayer_fixed(tcd, layno, 1);
-	}
+void tcd_rateallocate_fixed(opj_tcd_t *tcd)
+{
+    int layno;
+    for (layno = 0; layno < tcd->tcp->numlayers; layno++) {
+        tcd_makelayer_fixed(tcd, layno, 1);
+    }
 }
 
-void tcd_makelayer(opj_tcd_t *tcd, int layno, double thresh, int final) {
-	int compno, resno, bandno, precno, cblkno, passno;
-	
-	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-
-	tcd_tile->distolayer[layno] = 0;	/* fixed_quality */
-	
-	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				opj_tcd_band_t *band = &res->bands[bandno];
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-						opj_tcd_layer_t *layer = &cblk->layers[layno];
-						
-						int n;
-						if (layno == 0) {
-							cblk->numpassesinlayers = 0;
-						}
-						n = cblk->numpassesinlayers;
-						for (passno = cblk->numpassesinlayers; passno < cblk->totalpasses; passno++) {
-							int dr;
-							double dd;
-							opj_tcd_pass_t *pass = &cblk->passes[passno];
-							if (n == 0) {
-								dr = pass->rate;
-								dd = pass->distortiondec;
-							} else {
-								dr = pass->rate - cblk->passes[n - 1].rate;
-								dd = pass->distortiondec - cblk->passes[n - 1].distortiondec;
-							}
-							if (!dr) {
-								if (dd != 0)
-									n = passno + 1;
-								continue;
-							}
-							if (dd / dr >= thresh)
-								n = passno + 1;
-						}
-						layer->numpasses = n - cblk->numpassesinlayers;
-						
-						if (!layer->numpasses) {
-							layer->disto = 0;
-							continue;
-						}
-						if (cblk->numpassesinlayers == 0) {
-							layer->len = cblk->passes[n - 1].rate;
-							layer->data = cblk->data;
-							layer->disto = cblk->passes[n - 1].distortiondec;
-						} else {
-							layer->len = cblk->passes[n - 1].rate -	cblk->passes[cblk->numpassesinlayers - 1].rate;
-							layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
-							layer->disto = cblk->passes[n - 1].distortiondec - cblk->passes[cblk->numpassesinlayers - 1].distortiondec;
-						}
-						
-						tcd_tile->distolayer[layno] += layer->disto;	/* fixed_quality */
-						
-						if (final)
-							cblk->numpassesinlayers = n;
-					}
-				}
-			}
-		}
-	}
+void tcd_makelayer(opj_tcd_t *tcd, int layno, double thresh, int final)
+{
+    int compno, resno, bandno, precno, cblkno, passno;
+
+    opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
+
+    tcd_tile->distolayer[layno] = 0;	/* fixed_quality */
+
+    for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+        opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
+        for (resno = 0; resno < tilec->numresolutions; resno++) {
+            opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+            for (bandno = 0; bandno < res->numbands; bandno++) {
+                opj_tcd_band_t *band = &res->bands[bandno];
+                for (precno = 0; precno < res->pw * res->ph; precno++) {
+                    opj_tcd_precinct_t *prc = &band->precincts[precno];
+                    for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                        opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
+                        opj_tcd_layer_t *layer = &cblk->layers[layno];
+
+                        int n;
+                        if (layno == 0) {
+                            cblk->numpassesinlayers = 0;
+                        }
+                        n = cblk->numpassesinlayers;
+                        for (passno = cblk->numpassesinlayers; passno < cblk->totalpasses; passno++) {
+                            int dr;
+                            double dd;
+                            opj_tcd_pass_t *pass = &cblk->passes[passno];
+                            if (n == 0) {
+                                dr = pass->rate;
+                                dd = pass->distortiondec;
+                            } else {
+                                dr = pass->rate - cblk->passes[n - 1].rate;
+                                dd = pass->distortiondec - cblk->passes[n - 1].distortiondec;
+                            }
+                            if (!dr) {
+                                if (dd != 0)
+                                    n = passno + 1;
+                                continue;
+                            }
+                            if (dd / dr >= thresh)
+                                n = passno + 1;
+                        }
+                        layer->numpasses = n - cblk->numpassesinlayers;
+
+                        if (!layer->numpasses) {
+                            layer->disto = 0;
+                            continue;
+                        }
+                        if (cblk->numpassesinlayers == 0) {
+                            layer->len = cblk->passes[n - 1].rate;
+                            layer->data = cblk->data;
+                            layer->disto = cblk->passes[n - 1].distortiondec;
+                        } else {
+                            layer->len = cblk->passes[n - 1].rate -	cblk->passes[cblk->numpassesinlayers - 1].rate;
+                            layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
+                            layer->disto = cblk->passes[n - 1].distortiondec - cblk->passes[cblk->numpassesinlayers - 1].distortiondec;
+                        }
+
+                        tcd_tile->distolayer[layno] += layer->disto;	/* fixed_quality */
+
+                        if (final)
+                            cblk->numpassesinlayers = n;
+                    }
+                }
+            }
+        }
+    }
 }
 
-opj_bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_codestream_info_t *cstr_info) {
-	int compno, resno, bandno, precno, cblkno, passno, layno;
-	double min, max;
-	double cumdisto[100];	/* fixed_quality */
-	const double K = 1;		/* 1.1; fixed_quality */
-	double maxSE = 0;
-
-	opj_cp_t *cp = tcd->cp;
-	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-	opj_tcp_t *tcd_tcp = tcd->tcp;
-
-	min = DBL_MAX;
-	max = 0;
-	
-	tcd_tile->numpix = 0;		/* fixed_quality */
-	
-	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-		tilec->numpix = 0;
-
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				opj_tcd_band_t *band = &res->bands[bandno];
-
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-
-						for (passno = 0; passno < cblk->totalpasses; passno++) {
-							opj_tcd_pass_t *pass = &cblk->passes[passno];
-							int dr;
-							double dd, rdslope;
-							if (passno == 0) {
-								dr = pass->rate;
-								dd = pass->distortiondec;
-							} else {
-								dr = pass->rate - cblk->passes[passno - 1].rate;
-								dd = pass->distortiondec - cblk->passes[passno - 1].distortiondec;
-							}
-							if (dr == 0) {
-								continue;
-							}
-							rdslope = dd / dr;
-							if (rdslope < min) {
-								min = rdslope;
-							}
-							if (rdslope > max) {
-								max = rdslope;
-							}
-						} /* passno */
-						
-						/* fixed_quality */
-						tcd_tile->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
-						tilec->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
-					} /* cbklno */
-				} /* precno */
-			} /* bandno */
-		} /* resno */
-		
-		maxSE += (((double)(1 << tcd->image->comps[compno].prec) - 1.0) 
-			* ((double)(1 << tcd->image->comps[compno].prec) -1.0)) 
-			* ((double)(tilec->numpix));
-	} /* compno */
-	
-	/* index file */
-	if(cstr_info) {
-		opj_tile_info_t *tile_info = &cstr_info->tile[tcd->tcd_tileno];
-		tile_info->numpix = tcd_tile->numpix;
-		tile_info->distotile = tcd_tile->distotile;
-		tile_info->thresh = (double *) opj_malloc(tcd_tcp->numlayers * sizeof(double));
-	}
-	
-	for (layno = 0; layno < tcd_tcp->numlayers; layno++) {
-		double lo = min;
-		double hi = max;
-		int success = 0;
-		int maxlen = tcd_tcp->rates[layno] ? int_min(((int) ceil(tcd_tcp->rates[layno])), len) : len;
-		double goodthresh = 0;
-		double stable_thresh = 0;
-		int i;
-		double distotarget;		/* fixed_quality */
-		
-		/* fixed_quality */
-		distotarget = tcd_tile->distotile - ((K * maxSE) / pow((float)10, tcd_tcp->distoratio[layno] / 10));
-        
-		/* Don't try to find an optimal threshold but rather take everything not included yet, if
-		  -r xx,yy,zz,0   (disto_alloc == 1 and rates == 0)
-		  -q xx,yy,zz,0	  (fixed_quality == 1 and distoratio == 0)
-		  ==> possible to have some lossy layers and the last layer for sure lossless */
-		if ( ((cp->disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) {
-			opj_t2_t *t2 = t2_create(tcd->cinfo, tcd->image, cp);
-			double thresh = 0;
-
-			for (i = 0; i < 128; i++) {
-				int l = 0;
-				double distoachieved = 0;	/* fixed_quality */
-				thresh = (lo + hi) / 2;
-				
-				tcd_makelayer(tcd, layno, thresh, 0);
-				
-				if (cp->fixed_quality) {	/* fixed_quality */
-					if(cp->cinema){
-						l = t2_encode_packets(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
-						if (l == -999) {
-							lo = thresh;
-							continue;
-						}else{
-           		distoachieved =	layno == 0 ? 
-							tcd_tile->distolayer[0]	: cumdisto[layno - 1] + tcd_tile->distolayer[layno];
-							if (distoachieved < distotarget) {
-								hi=thresh; 
-								stable_thresh = thresh;
-								continue;
-							}else{
-								lo=thresh;
-							}
-						}
-					}else{
-						distoachieved =	(layno == 0) ? 
-							tcd_tile->distolayer[0]	: (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
-						if (distoachieved < distotarget) {
-							hi = thresh;
-							stable_thresh = thresh;
-							continue;
-						}
-						lo = thresh;
-					}
-				} else {
-					l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
-					/* TODO: what to do with l ??? seek / tell ??? */
-					/* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */
-					if (l == -999) {
-						lo = thresh;
-						continue;
-					}
-					hi = thresh;
-					stable_thresh = thresh;
-				}
-			}
-			success = 1;
-			goodthresh = stable_thresh == 0? thresh : stable_thresh;
-			t2_destroy(t2);
-		} else {
-			success = 1;
-			goodthresh = min;
-		}
-		
-		if (!success) {
-			return OPJ_FALSE;
-		}
-		
-		if(cstr_info) {	/* Threshold for Marcela Index */
-			cstr_info->tile[tcd->tcd_tileno].thresh[layno] = goodthresh;
-		}
-		tcd_makelayer(tcd, layno, goodthresh, 1);
-        
-		/* fixed_quality */
-		cumdisto[layno] = (layno == 0) ? tcd_tile->distolayer[0] : (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);	
-	}
-
-	return OPJ_TRUE;
+opj_bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_codestream_info_t *cstr_info)
+{
+    int compno, resno, bandno, precno, cblkno, passno, layno;
+    double min, max;
+    double cumdisto[100];	/* fixed_quality */
+    const double K = 1;		/* 1.1; fixed_quality */
+    double maxSE = 0;
+
+    opj_cp_t *cp = tcd->cp;
+    opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
+    opj_tcp_t *tcd_tcp = tcd->tcp;
+
+    min = DBL_MAX;
+    max = 0;
+
+    tcd_tile->numpix = 0;		/* fixed_quality */
+
+    for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+        opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
+        tilec->numpix = 0;
+
+        for (resno = 0; resno < tilec->numresolutions; resno++) {
+            opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+            for (bandno = 0; bandno < res->numbands; bandno++) {
+                opj_tcd_band_t *band = &res->bands[bandno];
+
+                for (precno = 0; precno < res->pw * res->ph; precno++) {
+                    opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+                    for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+                        opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
+
+                        for (passno = 0; passno < cblk->totalpasses; passno++) {
+                            opj_tcd_pass_t *pass = &cblk->passes[passno];
+                            int dr;
+                            double dd, rdslope;
+                            if (passno == 0) {
+                                dr = pass->rate;
+                                dd = pass->distortiondec;
+                            } else {
+                                dr = pass->rate - cblk->passes[passno - 1].rate;
+                                dd = pass->distortiondec - cblk->passes[passno - 1].distortiondec;
+                            }
+                            if (dr == 0) {
+                                continue;
+                            }
+                            rdslope = dd / dr;
+                            if (rdslope < min) {
+                                min = rdslope;
+                            }
+                            if (rdslope > max) {
+                                max = rdslope;
+                            }
+                        } /* passno */
+
+                        /* fixed_quality */
+                        tcd_tile->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
+                        tilec->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
+                    } /* cbklno */
+                } /* precno */
+            } /* bandno */
+        } /* resno */
+
+        maxSE += (((double)(1 << tcd->image->comps[compno].prec) - 1.0)
+                  * ((double)(1 << tcd->image->comps[compno].prec) -1.0))
+                 * ((double)(tilec->numpix));
+    } /* compno */
+
+    /* index file */
+    if(cstr_info) {
+        opj_tile_info_t *tile_info = &cstr_info->tile[tcd->tcd_tileno];
+        tile_info->numpix = tcd_tile->numpix;
+        tile_info->distotile = tcd_tile->distotile;
+        tile_info->thresh = (double *) opj_malloc(tcd_tcp->numlayers * sizeof(double));
+    }
+
+    for (layno = 0; layno < tcd_tcp->numlayers; layno++) {
+        double lo = min;
+        double hi = max;
+        int success = 0;
+        int maxlen = tcd_tcp->rates[layno] ? int_min(((int) ceil(tcd_tcp->rates[layno])), len) : len;
+        double goodthresh = 0;
+        double stable_thresh = 0;
+        int i;
+        double distotarget;		/* fixed_quality */
+
+        /* fixed_quality */
+        distotarget = tcd_tile->distotile - ((K * maxSE) / pow((float)10, tcd_tcp->distoratio[layno] / 10));
+
+        /* Don't try to find an optimal threshold but rather take everything not included yet, if
+          -r xx,yy,zz,0   (disto_alloc == 1 and rates == 0)
+          -q xx,yy,zz,0	  (fixed_quality == 1 and distoratio == 0)
+          ==> possible to have some lossy layers and the last layer for sure lossless */
+        if ( ((cp->disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) {
+            opj_t2_t *t2 = t2_create(tcd->cinfo, tcd->image, cp);
+            double thresh = 0;
+
+            for (i = 0; i < 128; i++) {
+                int l = 0;
+                double distoachieved = 0;	/* fixed_quality */
+                thresh = (lo + hi) / 2;
+
+                tcd_makelayer(tcd, layno, thresh, 0);
+
+                if (cp->fixed_quality) {	/* fixed_quality */
+                    if(cp->cinema) {
+                        l = t2_encode_packets(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
+                        if (l == -999) {
+                            lo = thresh;
+                            continue;
+                        } else {
+                            distoachieved =	layno == 0 ?
+                                            tcd_tile->distolayer[0]	: cumdisto[layno - 1] + tcd_tile->distolayer[layno];
+                            if (distoachieved < distotarget) {
+                                hi=thresh;
+                                stable_thresh = thresh;
+                                continue;
+                            } else {
+                                lo=thresh;
+                            }
+                        }
+                    } else {
+                        distoachieved =	(layno == 0) ?
+                                        tcd_tile->distolayer[0]	: (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
+                        if (distoachieved < distotarget) {
+                            hi = thresh;
+                            stable_thresh = thresh;
+                            continue;
+                        }
+                        lo = thresh;
+                    }
+                } else {
+                    l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
+                    /* TODO: what to do with l ??? seek / tell ??? */
+                    /* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */
+                    if (l == -999) {
+                        lo = thresh;
+                        continue;
+                    }
+                    hi = thresh;
+                    stable_thresh = thresh;
+                }
+            }
+            success = 1;
+            goodthresh = stable_thresh == 0? thresh : stable_thresh;
+            t2_destroy(t2);
+        } else {
+            success = 1;
+            goodthresh = min;
+        }
+
+        if (!success) {
+            return OPJ_FALSE;
+        }
+
+        if(cstr_info) {	/* Threshold for Marcela Index */
+            cstr_info->tile[tcd->tcd_tileno].thresh[layno] = goodthresh;
+        }
+        tcd_makelayer(tcd, layno, goodthresh, 1);
+
+        /* fixed_quality */
+        cumdisto[layno] = (layno == 0) ? tcd_tile->distolayer[0] : (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
+    }
+
+    return OPJ_TRUE;
 }
 
-int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_codestream_info_t *cstr_info) {
-	int compno;
-	int l, i, numpacks = 0;
-	opj_tcd_tile_t *tile = NULL;
-	opj_tcp_t *tcd_tcp = NULL;
-	opj_cp_t *cp = NULL;
-
-	opj_tcp_t *tcp = &tcd->cp->tcps[0];
-	opj_tccp_t *tccp = &tcp->tccps[0];
-	opj_image_t *image = tcd->image;
-	
-	opj_t1_t *t1 = NULL;		/* T1 component */
-	opj_t2_t *t2 = NULL;		/* T2 component */
-
-	tcd->tcd_tileno = tileno;
-	tcd->tcd_tile = tcd->tcd_image->tiles;
-	tcd->tcp = &tcd->cp->tcps[tileno];
-
-	tile = tcd->tcd_tile;
-	tcd_tcp = tcd->tcp;
-	cp = tcd->cp;
-
-	if(tcd->cur_tp_num == 0){
-		tcd->encoding_time = opj_clock();	/* time needed to encode a tile */
-		/* INDEX >> "Precinct_nb_X et Precinct_nb_Y" */
-		if(cstr_info) {
-			opj_tcd_tilecomp_t *tilec_idx = &tile->comps[0];	/* based on component 0 */
-			for (i = 0; i < tilec_idx->numresolutions; i++) {
-				opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[i];
-				
-				cstr_info->tile[tileno].pw[i] = res_idx->pw;
-				cstr_info->tile[tileno].ph[i] = res_idx->ph;
-				
-				numpacks += res_idx->pw * res_idx->ph;
-				
-				cstr_info->tile[tileno].pdx[i] = tccp->prcw[i];
-				cstr_info->tile[tileno].pdy[i] = tccp->prch[i];
-			}
-			cstr_info->tile[tileno].packet = (opj_packet_info_t*) opj_calloc(cstr_info->numcomps * cstr_info->numlayers * numpacks, sizeof(opj_packet_info_t));
-		}
-		/* << INDEX */
-		
-		/*---------------TILE-------------------*/
-		
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			int x, y;
-			
-			int adjust = image->comps[compno].sgnd ? 0 : 1 << (image->comps[compno].prec - 1);
-			int offset_x = int_ceildiv(image->x0, image->comps[compno].dx);
-			int offset_y = int_ceildiv(image->y0, image->comps[compno].dy);
-			
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-			int tw = tilec->x1 - tilec->x0;
-			int w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
-			
-			/* extract tile data */
-			
-			if (tcd_tcp->tccps[compno].qmfbid == 1) {
-				for (y = tilec->y0; y < tilec->y1; y++) {
-					/* start of the src tile scanline */
-					int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
-					/* start of the dst tile scanline */
-					int *tile_data = &tilec->data[(y - tilec->y0) * tw];
-					for (x = tilec->x0; x < tilec->x1; x++) {
-						*tile_data++ = *data++ - adjust;
-					}
-				}
-			} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
-				for (y = tilec->y0; y < tilec->y1; y++) {
-					/* start of the src tile scanline */
-					int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
-					/* start of the dst tile scanline */
-					int *tile_data = &tilec->data[(y - tilec->y0) * tw];
-					for (x = tilec->x0; x < tilec->x1; x++) {
-						*tile_data++ = (*data++ - adjust) << 11;
-					}
-					
-				}
-			}
-		}
-		
-		/*----------------MCT-------------------*/
-		if (tcd_tcp->mct) {
-			int samples = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
-			if (tcd_tcp->tccps[0].qmfbid == 0) {
-				mct_encode_real(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
-			} else {
-				mct_encode(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
-			}
-		}
-		
-		/*----------------DWT---------------------*/
-		
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-			if (tcd_tcp->tccps[compno].qmfbid == 1) {
-				dwt_encode(tilec);
-			} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
-				dwt_encode_real(tilec);
-			}
-		}
-		
-		/*------------------TIER1-----------------*/
-		t1 = t1_create(tcd->cinfo);
-		t1_encode_cblks(t1, tile, tcd_tcp);
-		t1_destroy(t1);
-		
-		/*-----------RATE-ALLOCATE------------------*/
-		
-		/* INDEX */
-		if(cstr_info) {
-			cstr_info->index_write = 0;
-		}
-		if (cp->disto_alloc || cp->fixed_quality) {	/* fixed_quality */
-			/* Normal Rate/distortion allocation */
-			tcd_rateallocate(tcd, dest, len, cstr_info);
-		} else {
-			/* Fixed layer allocation */
-			tcd_rateallocate_fixed(tcd);
-		}
-	}
-	/*--------------TIER2------------------*/
-
-	/* INDEX */
-	if(cstr_info) {
-		cstr_info->index_write = 1;
-	}
-
-	t2 = t2_create(tcd->cinfo, image, cp);
-	l = t2_encode_packets(t2,tileno, tile, tcd_tcp->numlayers, dest, len, cstr_info,tcd->tp_num,tcd->tp_pos,tcd->cur_pino,FINAL_PASS,tcd->cur_totnum_tp);
-	t2_destroy(t2);
-	
-	/*---------------CLEAN-------------------*/
-
-	
-	if(tcd->cur_tp_num == tcd->cur_totnum_tp - 1){
-		tcd->encoding_time = opj_clock() - tcd->encoding_time;
-		opj_event_msg(tcd->cinfo, EVT_INFO, "- tile encoded in %f s\n", tcd->encoding_time);
-
-		/* cleaning memory */
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-			opj_aligned_free(tilec->data);
-		}
-	}
-
-	return l;
+int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_codestream_info_t *cstr_info)
+{
+    int compno;
+    int l, i, numpacks = 0;
+    opj_tcd_tile_t *tile = NULL;
+    opj_tcp_t *tcd_tcp = NULL;
+    opj_cp_t *cp = NULL;
+
+    opj_tcp_t *tcp = &tcd->cp->tcps[0];
+    opj_tccp_t *tccp = &tcp->tccps[0];
+    opj_image_t *image = tcd->image;
+
+    opj_t1_t *t1 = NULL;		/* T1 component */
+    opj_t2_t *t2 = NULL;		/* T2 component */
+
+    tcd->tcd_tileno = tileno;
+    tcd->tcd_tile = tcd->tcd_image->tiles;
+    tcd->tcp = &tcd->cp->tcps[tileno];
+
+    tile = tcd->tcd_tile;
+    tcd_tcp = tcd->tcp;
+    cp = tcd->cp;
+
+    if(tcd->cur_tp_num == 0) {
+        tcd->encoding_time = opj_clock();	/* time needed to encode a tile */
+        /* INDEX >> "Precinct_nb_X et Precinct_nb_Y" */
+        if(cstr_info) {
+            opj_tcd_tilecomp_t *tilec_idx = &tile->comps[0];	/* based on component 0 */
+            for (i = 0; i < tilec_idx->numresolutions; i++) {
+                opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[i];
+
+                cstr_info->tile[tileno].pw[i] = res_idx->pw;
+                cstr_info->tile[tileno].ph[i] = res_idx->ph;
+
+                numpacks += res_idx->pw * res_idx->ph;
+
+                cstr_info->tile[tileno].pdx[i] = tccp->prcw[i];
+                cstr_info->tile[tileno].pdy[i] = tccp->prch[i];
+            }
+            cstr_info->tile[tileno].packet = (opj_packet_info_t*) opj_calloc(cstr_info->numcomps * cstr_info->numlayers * numpacks, sizeof(opj_packet_info_t));
+        }
+        /* << INDEX */
+
+        /*---------------TILE-------------------*/
+
+        for (compno = 0; compno < tile->numcomps; compno++) {
+            int x, y;
+
+            int adjust = image->comps[compno].sgnd ? 0 : 1 << (image->comps[compno].prec - 1);
+            int offset_x = int_ceildiv(image->x0, image->comps[compno].dx);
+            int offset_y = int_ceildiv(image->y0, image->comps[compno].dy);
+
+            opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+            int tw = tilec->x1 - tilec->x0;
+            int w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
+
+            /* extract tile data */
+
+            if (tcd_tcp->tccps[compno].qmfbid == 1) {
+                for (y = tilec->y0; y < tilec->y1; y++) {
+                    /* start of the src tile scanline */
+                    int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
+                    /* start of the dst tile scanline */
+                    int *tile_data = &tilec->data[(y - tilec->y0) * tw];
+                    for (x = tilec->x0; x < tilec->x1; x++) {
+                        *tile_data++ = *data++ - adjust;
+                    }
+                }
+            } else if (tcd_tcp->tccps[compno].qmfbid == 0) {
+                for (y = tilec->y0; y < tilec->y1; y++) {
+                    /* start of the src tile scanline */
+                    int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
+                    /* start of the dst tile scanline */
+                    int *tile_data = &tilec->data[(y - tilec->y0) * tw];
+                    for (x = tilec->x0; x < tilec->x1; x++) {
+                        *tile_data++ = (*data++ - adjust) << 11;
+                    }
+
+                }
+            }
+        }
+
+        /*----------------MCT-------------------*/
+        if (tcd_tcp->mct) {
+            int samples = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
+            if (tcd_tcp->tccps[0].qmfbid == 0) {
+                mct_encode_real(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
+            } else {
+                mct_encode(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
+            }
+        }
+
+        /*----------------DWT---------------------*/
+
+        for (compno = 0; compno < tile->numcomps; compno++) {
+            opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+            if (tcd_tcp->tccps[compno].qmfbid == 1) {
+                dwt_encode(tilec);
+            } else if (tcd_tcp->tccps[compno].qmfbid == 0) {
+                dwt_encode_real(tilec);
+            }
+        }
+
+        /*------------------TIER1-----------------*/
+        t1 = t1_create(tcd->cinfo);
+        t1_encode_cblks(t1, tile, tcd_tcp);
+        t1_destroy(t1);
+
+        /*-----------RATE-ALLOCATE------------------*/
+
+        /* INDEX */
+        if(cstr_info) {
+            cstr_info->index_write = 0;
+        }
+        if (cp->disto_alloc || cp->fixed_quality) {	/* fixed_quality */
+            /* Normal Rate/distortion allocation */
+            tcd_rateallocate(tcd, dest, len, cstr_info);
+        } else {
+            /* Fixed layer allocation */
+            tcd_rateallocate_fixed(tcd);
+        }
+    }
+    /*--------------TIER2------------------*/
+
+    /* INDEX */
+    if(cstr_info) {
+        cstr_info->index_write = 1;
+    }
+
+    t2 = t2_create(tcd->cinfo, image, cp);
+    l = t2_encode_packets(t2,tileno, tile, tcd_tcp->numlayers, dest, len, cstr_info,tcd->tp_num,tcd->tp_pos,tcd->cur_pino,FINAL_PASS,tcd->cur_totnum_tp);
+    t2_destroy(t2);
+
+    /*---------------CLEAN-------------------*/
+
+
+    if(tcd->cur_tp_num == tcd->cur_totnum_tp - 1) {
+        tcd->encoding_time = opj_clock() - tcd->encoding_time;
+        opj_event_msg(tcd->cinfo, EVT_INFO, "- tile encoded in %f s\n", tcd->encoding_time);
+
+        /* cleaning memory */
+        for (compno = 0; compno < tile->numcomps; compno++) {
+            opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+            opj_aligned_free(tilec->data);
+        }
+    }
+
+    return l;
 }
 
-opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, opj_codestream_info_t *cstr_info) {
-	int l;
-	int compno;
-	int eof = 0;
-	double tile_time, t1_time, dwt_time;
-	opj_tcd_tile_t *tile = NULL;
-
-	opj_t1_t *t1 = NULL;		/* T1 component */
-	opj_t2_t *t2 = NULL;		/* T2 component */
-	
-	tcd->tcd_tileno = tileno;
-	tcd->tcd_tile = &(tcd->tcd_image->tiles[tileno]);
-	tcd->tcp = &(tcd->cp->tcps[tileno]);
-	tile = tcd->tcd_tile;
-	
-	tile_time = opj_clock();	/* time needed to decode a tile */
-	opj_event_msg(tcd->cinfo, EVT_INFO, "tile %d of %d\n", tileno + 1, tcd->cp->tw * tcd->cp->th);
-
-	/* INDEX >>  */
-	if(cstr_info) {
-		int resno, compno, numprec = 0;
-		for (compno = 0; compno < cstr_info->numcomps; compno++) {
-			opj_tcp_t *tcp = &tcd->cp->tcps[0];
-			opj_tccp_t *tccp = &tcp->tccps[compno];
-			opj_tcd_tilecomp_t *tilec_idx = &tile->comps[compno];	
-			for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
-				opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[resno];
-				cstr_info->tile[tileno].pw[resno] = res_idx->pw;
-				cstr_info->tile[tileno].ph[resno] = res_idx->ph;
-				numprec += res_idx->pw * res_idx->ph;
-				if (tccp->csty & J2K_CP_CSTY_PRT) {
-					cstr_info->tile[tileno].pdx[resno] = tccp->prcw[resno];
-					cstr_info->tile[tileno].pdy[resno] = tccp->prch[resno];
-				}
-				else {
-					cstr_info->tile[tileno].pdx[resno] = 15;
-					cstr_info->tile[tileno].pdy[resno] = 15;
-				}
-			}
-		}
-		cstr_info->tile[tileno].packet = (opj_packet_info_t *) opj_malloc(cstr_info->numlayers * numprec * sizeof(opj_packet_info_t));
-		cstr_info->packno = 0;
-	}
-	/* << INDEX */
-	
-	/*--------------TIER2------------------*/
-	
-	t2 = t2_create(tcd->cinfo, tcd->image, tcd->cp);
-	l = t2_decode_packets(t2, src, len, tileno, tile, cstr_info);
-	t2_destroy(t2);
-
-	if (l == -999) {
-		eof = 1;
-		opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bitstream\n");
-	}
-	
-	/*------------------TIER1-----------------*/
-	
-	t1_time = opj_clock();	/* time needed to decode a tile */
-	t1 = t1_create(tcd->cinfo);
-    if (t1 == NULL)
-    {
+opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, opj_codestream_info_t *cstr_info)
+{
+    int l;
+    int compno;
+    int eof = 0;
+    double tile_time, t1_time, dwt_time;
+    opj_tcd_tile_t *tile = NULL;
+
+    opj_t1_t *t1 = NULL;		/* T1 component */
+    opj_t2_t *t2 = NULL;		/* T2 component */
+
+    tcd->tcd_tileno = tileno;
+    tcd->tcd_tile = &(tcd->tcd_image->tiles[tileno]);
+    tcd->tcp = &(tcd->cp->tcps[tileno]);
+    tile = tcd->tcd_tile;
+
+    tile_time = opj_clock();	/* time needed to decode a tile */
+    opj_event_msg(tcd->cinfo, EVT_INFO, "tile %d of %d\n", tileno + 1, tcd->cp->tw * tcd->cp->th);
+
+    /* INDEX >>  */
+    if(cstr_info) {
+        int resno, compno, numprec = 0;
+        for (compno = 0; compno < cstr_info->numcomps; compno++) {
+            opj_tcp_t *tcp = &tcd->cp->tcps[0];
+            opj_tccp_t *tccp = &tcp->tccps[compno];
+            opj_tcd_tilecomp_t *tilec_idx = &tile->comps[compno];
+            for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
+                opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[resno];
+                cstr_info->tile[tileno].pw[resno] = res_idx->pw;
+                cstr_info->tile[tileno].ph[resno] = res_idx->ph;
+                numprec += res_idx->pw * res_idx->ph;
+                if (tccp->csty & J2K_CP_CSTY_PRT) {
+                    cstr_info->tile[tileno].pdx[resno] = tccp->prcw[resno];
+                    cstr_info->tile[tileno].pdy[resno] = tccp->prch[resno];
+                } else {
+                    cstr_info->tile[tileno].pdx[resno] = 15;
+                    cstr_info->tile[tileno].pdy[resno] = 15;
+                }
+            }
+        }
+        cstr_info->tile[tileno].packet = (opj_packet_info_t *) opj_malloc(cstr_info->numlayers * numprec * sizeof(opj_packet_info_t));
+        cstr_info->packno = 0;
+    }
+    /* << INDEX */
+
+    /*--------------TIER2------------------*/
+
+    t2 = t2_create(tcd->cinfo, tcd->image, tcd->cp);
+    l = t2_decode_packets(t2, src, len, tileno, tile, cstr_info);
+    t2_destroy(t2);
+
+    if (l == -999) {
+        eof = 1;
+        opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bitstream\n");
+    }
+
+    /*------------------TIER1-----------------*/
+
+    t1_time = opj_clock();	/* time needed to decode a tile */
+    t1 = t1_create(tcd->cinfo);
+    if (t1 == NULL) {
         opj_event_msg(tcd->cinfo, EVT_ERROR, "Out of memory\n");
         t1_destroy(t1);
         return OPJ_FALSE;
     }
 
-	for (compno = 0; compno < tile->numcomps; ++compno) {
-		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
-		/* The +3 is headroom required by the vectorized DWT */
-		tilec->data = (int*) opj_aligned_malloc((((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0))+3) * sizeof(int));
-        if (tilec->data == NULL)
-        {
+    for (compno = 0; compno < tile->numcomps; ++compno) {
+        opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
+        /* The +3 is headroom required by the vectorized DWT */
+        tilec->data = (int*) opj_aligned_malloc((((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0))+3) * sizeof(int));
+        if (tilec->data == NULL) {
             opj_event_msg(tcd->cinfo, EVT_ERROR, "Out of memory\n");
             return OPJ_FALSE;
         }
 
-		t1_decode_cblks(t1, tilec, &tcd->tcp->tccps[compno]);
-	}
-	t1_destroy(t1);
-	t1_time = opj_clock() - t1_time;
-	opj_event_msg(tcd->cinfo, EVT_INFO, "- tiers-1 took %f s\n", t1_time);
-	
-	/*----------------DWT---------------------*/
-
-	dwt_time = opj_clock();	/* time needed to decode a tile */
-	for (compno = 0; compno < tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-		int numres2decode;
-
-		if (tcd->cp->reduce != 0) {
-			if ( tile->comps[compno].numresolutions < ( tcd->cp->reduce - 1 ) ) {				
-				opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. The number of resolutions to remove [%d+1] is higher than the number "
-					" of resolutions in the original codestream [%d]\nModify the cp_reduce parameter.\n", tcd->cp->reduce, tile->comps[compno].numresolutions);
-				return OPJ_FALSE;
-			}
-      else {
-		  	tcd->image->comps[compno].resno_decoded =
-				tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
-      }
-		}
-
-		numres2decode = tcd->image->comps[compno].resno_decoded + 1;
-		if(numres2decode > 0){
-			if (tcd->tcp->tccps[compno].qmfbid == 1) {
-				dwt_decode(tilec, numres2decode);
-			} else {
-				dwt_decode_real(tilec, numres2decode);
-			}
-		}
-	}
-	dwt_time = opj_clock() - dwt_time;
-	opj_event_msg(tcd->cinfo, EVT_INFO, "- dwt took %f s\n", dwt_time);
-
-	/*----------------MCT-------------------*/
-
-	if (tcd->tcp->mct) {
-		int n = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
-
-		if (tile->numcomps >= 3 ){
-			if (tcd->tcp->tccps[0].qmfbid == 1) {
-				mct_decode(
-						tile->comps[0].data,
-						tile->comps[1].data,
-						tile->comps[2].data,
-						n);
-			} else {
-				mct_decode_real(
-						(float*)tile->comps[0].data,
-						(float*)tile->comps[1].data,
-						(float*)tile->comps[2].data,
-						n);
-			}
-		} else{
-			opj_event_msg(tcd->cinfo, EVT_WARNING,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",tile->numcomps);
-		}
-	}
-
-	/*---------------TILE-------------------*/
-
-	for (compno = 0; compno < tile->numcomps; ++compno) {
-		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
-		opj_image_comp_t* imagec = &tcd->image->comps[compno];
-		opj_tcd_resolution_t* res = &tilec->resolutions[imagec->resno_decoded];
-		int adjust = imagec->sgnd ? 0 : 1 << (imagec->prec - 1);
-		int min = imagec->sgnd ? -(1 << (imagec->prec - 1)) : 0;
-		int max = imagec->sgnd ?  (1 << (imagec->prec - 1)) - 1 : (1 << imagec->prec) - 1;
-
-		int tw = tilec->x1 - tilec->x0;
-		int w = imagec->w;
-
-		int offset_x = int_ceildivpow2(imagec->x0, imagec->factor);
-		int offset_y = int_ceildivpow2(imagec->y0, imagec->factor);
-
-		int i, j;
-		if(!imagec->data){
-			imagec->data = (int*) opj_malloc(imagec->w * imagec->h * sizeof(int));
-		}
-        if (!imagec->data)
-        {
+        t1_decode_cblks(t1, tilec, &tcd->tcp->tccps[compno]);
+    }
+    t1_destroy(t1);
+    t1_time = opj_clock() - t1_time;
+    opj_event_msg(tcd->cinfo, EVT_INFO, "- tiers-1 took %f s\n", t1_time);
+
+    /*----------------DWT---------------------*/
+
+    dwt_time = opj_clock();	/* time needed to decode a tile */
+    for (compno = 0; compno < tile->numcomps; compno++) {
+        opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+        int numres2decode;
+
+        if (tcd->cp->reduce != 0) {
+            if ( tile->comps[compno].numresolutions < ( tcd->cp->reduce - 1 ) ) {
+                opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. The number of resolutions to remove [%d+1] is higher than the number "
+                              " of resolutions in the original codestream [%d]\nModify the cp_reduce parameter.\n", tcd->cp->reduce, tile->comps[compno].numresolutions);
+                return OPJ_FALSE;
+            } else {
+                tcd->image->comps[compno].resno_decoded =
+                    tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
+            }
+        }
+
+        numres2decode = tcd->image->comps[compno].resno_decoded + 1;
+        if(numres2decode > 0) {
+            if (tcd->tcp->tccps[compno].qmfbid == 1) {
+                dwt_decode(tilec, numres2decode);
+            } else {
+                dwt_decode_real(tilec, numres2decode);
+            }
+        }
+    }
+    dwt_time = opj_clock() - dwt_time;
+    opj_event_msg(tcd->cinfo, EVT_INFO, "- dwt took %f s\n", dwt_time);
+
+    /*----------------MCT-------------------*/
+
+    if (tcd->tcp->mct) {
+        int n = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
+
+        if (tile->numcomps >= 3 ) {
+            if (tcd->tcp->tccps[0].qmfbid == 1) {
+                mct_decode(
+                    tile->comps[0].data,
+                    tile->comps[1].data,
+                    tile->comps[2].data,
+                    n);
+            } else {
+                mct_decode_real(
+                    (float*)tile->comps[0].data,
+                    (float*)tile->comps[1].data,
+                    (float*)tile->comps[2].data,
+                    n);
+            }
+        } else {
+            opj_event_msg(tcd->cinfo, EVT_WARNING,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",tile->numcomps);
+        }
+    }
+
+    /*---------------TILE-------------------*/
+
+    for (compno = 0; compno < tile->numcomps; ++compno) {
+        opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
+        opj_image_comp_t* imagec = &tcd->image->comps[compno];
+        opj_tcd_resolution_t* res = &tilec->resolutions[imagec->resno_decoded];
+        int adjust = imagec->sgnd ? 0 : 1 << (imagec->prec - 1);
+        int min = imagec->sgnd ? -(1 << (imagec->prec - 1)) : 0;
+        int max = imagec->sgnd ?  (1 << (imagec->prec - 1)) - 1 : (1 << imagec->prec) - 1;
+
+        int tw = tilec->x1 - tilec->x0;
+        int w = imagec->w;
+
+        int offset_x = int_ceildivpow2(imagec->x0, imagec->factor);
+        int offset_y = int_ceildivpow2(imagec->y0, imagec->factor);
+
+        int i, j;
+        if(!imagec->data) {
+            imagec->data = (int*) opj_malloc(imagec->w * imagec->h * sizeof(int));
+        }
+        if (!imagec->data) {
             opj_event_msg(tcd->cinfo, EVT_ERROR, "Out of memory\n");
             return OPJ_FALSE;
         }
-		if(tcd->tcp->tccps[compno].qmfbid == 1) {
-			for(j = res->y0; j < res->y1; ++j) {
-				for(i = res->x0; i < res->x1; ++i) {
-					int v = tilec->data[i - res->x0 + (j - res->y0) * tw];
-					v += adjust;
-					imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
-				}
-			}
-		}else{
-			for(j = res->y0; j < res->y1; ++j) {
-				for(i = res->x0; i < res->x1; ++i) {
-					float tmp = ((float*)tilec->data)[i - res->x0 + (j - res->y0) * tw];
-					int v = lrintf(tmp);
-					v += adjust;
-					imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
-				}
-			}
-		}
-		opj_aligned_free(tilec->data);
-	}
-
-	tile_time = opj_clock() - tile_time;	/* time needed to decode a tile */
-	opj_event_msg(tcd->cinfo, EVT_INFO, "- tile decoded in %f s\n", tile_time);
-
-	if (eof) {
-		return OPJ_FALSE;
-	}
-	
-	return OPJ_TRUE;
+        if(tcd->tcp->tccps[compno].qmfbid == 1) {
+            for(j = res->y0; j < res->y1; ++j) {
+                for(i = res->x0; i < res->x1; ++i) {
+                    int v = tilec->data[i - res->x0 + (j - res->y0) * tw];
+                    v += adjust;
+                    imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
+                }
+            }
+        } else {
+            for(j = res->y0; j < res->y1; ++j) {
+                for(i = res->x0; i < res->x1; ++i) {
+                    float tmp = ((float*)tilec->data)[i - res->x0 + (j - res->y0) * tw];
+                    int v = lrintf(tmp);
+                    v += adjust;
+                    imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
+                }
+            }
+        }
+        opj_aligned_free(tilec->data);
+    }
+
+    tile_time = opj_clock() - tile_time;	/* time needed to decode a tile */
+    opj_event_msg(tcd->cinfo, EVT_INFO, "- tile decoded in %f s\n", tile_time);
+
+    if (eof) {
+        return OPJ_FALSE;
+    }
+
+    return OPJ_TRUE;
 }
 
-void tcd_free_decode(opj_tcd_t *tcd) {
-	opj_tcd_image_t *tcd_image = tcd->tcd_image;	
+void tcd_free_decode(opj_tcd_t *tcd)
+{
+    opj_tcd_image_t *tcd_image = tcd->tcd_image;
     int i = 0;
-    for (i = 0; i < tcd_image->tw * tcd_image->th; i++)
-    {
+    for (i = 0; i < tcd_image->tw * tcd_image->th; i++) {
         tcd_free_decode_tile(tcd, i);
     }
 
-	opj_free(tcd_image->tiles);
+    opj_free(tcd_image->tiles);
 }
 
-void tcd_free_decode_tile(opj_tcd_t *tcd, int tileno) {
+void tcd_free_decode_tile(opj_tcd_t *tcd, int tileno)
+{
     int compno,resno,bandno,precno,cblkno;
 
-	opj_tcd_image_t *tcd_image = tcd->tcd_image;
+    opj_tcd_image_t *tcd_image = tcd->tcd_image;
 
-	opj_tcd_tile_t *tile = &tcd_image->tiles[tileno];
+    opj_tcd_tile_t *tile = &tcd_image->tiles[tileno];
     if (tile->comps != NULL) {
         for (compno = 0; compno < tile->numcomps; compno++) {
             opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
@@ -1567,13 +1576,13 @@ void tcd_free_decode_tile(opj_tcd_t *tcd, int tileno) {
 
                     }
                     opj_free(band->precincts);
-				}
-			}
+                }
+            }
             opj_free(tilec->resolutions);
-		}
+        }
         opj_free(tile->comps);
         tile->comps = NULL;
-	}
+    }
 }
 
 
diff --git a/src/lib/openmj2/tcd.h b/src/lib/openmj2/tcd.h
index 339e3b78..0118ddad 100644
--- a/src/lib/openmj2/tcd.h
+++ b/src/lib/openmj2/tcd.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -51,159 +51,159 @@ each other. The functions in TCD.C are used by some function in J2K.C.
 FIXME: documentation
 */
 typedef struct opj_tcd_seg {
-  unsigned char** data;
-  int dataindex;
-  int numpasses;
-  int len;
-  int maxpasses;
-  int numnewpasses;
-  int newlen;
+    unsigned char** data;
+    int dataindex;
+    int numpasses;
+    int len;
+    int maxpasses;
+    int numnewpasses;
+    int newlen;
 } opj_tcd_seg_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_pass {
-  int rate;
-  double distortiondec;
-  int term, len;
+    int rate;
+    double distortiondec;
+    int term, len;
 } opj_tcd_pass_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_layer {
-  int numpasses;		/* Number of passes in the layer */
-  int len;			/* len of information */
-  double disto;			/* add for index (Cfr. Marcela) */
-  unsigned char *data;		/* data */
+    int numpasses;		/* Number of passes in the layer */
+    int len;			/* len of information */
+    double disto;			/* add for index (Cfr. Marcela) */
+    unsigned char *data;		/* data */
 } opj_tcd_layer_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_cblk_enc {
-  unsigned char* data;	/* Data */
-  opj_tcd_layer_t* layers;	/* layer information */
-  opj_tcd_pass_t* passes;	/* information about the passes */
-  int x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
-  int numbps;
-  int numlenbits;
-  int numpasses;		/* number of pass already done for the code-blocks */
-  int numpassesinlayers;	/* number of passes in the layer */
-  int totalpasses;		/* total number of passes */
+    unsigned char* data;	/* Data */
+    opj_tcd_layer_t* layers;	/* layer information */
+    opj_tcd_pass_t* passes;	/* information about the passes */
+    int x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
+    int numbps;
+    int numlenbits;
+    int numpasses;		/* number of pass already done for the code-blocks */
+    int numpassesinlayers;	/* number of passes in the layer */
+    int totalpasses;		/* total number of passes */
 } opj_tcd_cblk_enc_t;
 
 typedef struct opj_tcd_cblk_dec {
-  unsigned char* data;	/* Data */
-  opj_tcd_seg_t* segs;		/* segments informations */
-	int x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
-  int numbps;
-  int numlenbits;
-  int len;			/* length */
-  int numnewpasses;		/* number of pass added to the code-blocks */
-  int numsegs;			/* number of segments */
+    unsigned char* data;	/* Data */
+    opj_tcd_seg_t* segs;		/* segments informations */
+    int x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
+    int numbps;
+    int numlenbits;
+    int len;			/* length */
+    int numnewpasses;		/* number of pass added to the code-blocks */
+    int numsegs;			/* number of segments */
 } opj_tcd_cblk_dec_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_precinct {
-  int x0, y0, x1, y1;		/* dimension of the precinct : left upper corner (x0, y0) right low corner (x1,y1) */
-  int cw, ch;			/* number of precinct in width and heigth */
-  union{		/* code-blocks informations */
-	  opj_tcd_cblk_enc_t* enc;
-	  opj_tcd_cblk_dec_t* dec;
-  } cblks;
-  opj_tgt_tree_t *incltree;		/* inclusion tree */
-  opj_tgt_tree_t *imsbtree;		/* IMSB tree */
+    int x0, y0, x1, y1;		/* dimension of the precinct : left upper corner (x0, y0) right low corner (x1,y1) */
+    int cw, ch;			/* number of precinct in width and heigth */
+    union {		/* code-blocks informations */
+        opj_tcd_cblk_enc_t* enc;
+        opj_tcd_cblk_dec_t* dec;
+    } cblks;
+    opj_tgt_tree_t *incltree;		/* inclusion tree */
+    opj_tgt_tree_t *imsbtree;		/* IMSB tree */
 } opj_tcd_precinct_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_band {
-  int x0, y0, x1, y1;		/* dimension of the subband : left upper corner (x0, y0) right low corner (x1,y1) */
-  int bandno;
-  opj_tcd_precinct_t *precincts;	/* precinct information */
-  int numbps;
-  float stepsize;
+    int x0, y0, x1, y1;		/* dimension of the subband : left upper corner (x0, y0) right low corner (x1,y1) */
+    int bandno;
+    opj_tcd_precinct_t *precincts;	/* precinct information */
+    int numbps;
+    float stepsize;
 } opj_tcd_band_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_resolution {
-  int x0, y0, x1, y1;		/* dimension of the resolution level : left upper corner (x0, y0) right low corner (x1,y1) */
-  int pw, ph;
-  int numbands;			/* number sub-band for the resolution level */
-  opj_tcd_band_t bands[3];		/* subband information */
+    int x0, y0, x1, y1;		/* dimension of the resolution level : left upper corner (x0, y0) right low corner (x1,y1) */
+    int pw, ph;
+    int numbands;			/* number sub-band for the resolution level */
+    opj_tcd_band_t bands[3];		/* subband information */
 } opj_tcd_resolution_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_tilecomp {
-  int x0, y0, x1, y1;		/* dimension of component : left upper corner (x0, y0) right low corner (x1,y1) */
-  int numresolutions;		/* number of resolutions level */
-  opj_tcd_resolution_t *resolutions;	/* resolutions information */
-  int *data;			/* data of the component */
-  int numpix;			/* add fixed_quality */
+    int x0, y0, x1, y1;		/* dimension of component : left upper corner (x0, y0) right low corner (x1,y1) */
+    int numresolutions;		/* number of resolutions level */
+    opj_tcd_resolution_t *resolutions;	/* resolutions information */
+    int *data;			/* data of the component */
+    int numpix;			/* add fixed_quality */
 } opj_tcd_tilecomp_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_tile {
-  int x0, y0, x1, y1;		/* dimension of the tile : left upper corner (x0, y0) right low corner (x1,y1) */
-  int numcomps;			/* number of components in tile */
-  opj_tcd_tilecomp_t *comps;	/* Components information */
-  int numpix;			/* add fixed_quality */
-  double distotile;		/* add fixed_quality */
-  double distolayer[100];	/* add fixed_quality */
-  /** packet number */
-  int packno;
+    int x0, y0, x1, y1;		/* dimension of the tile : left upper corner (x0, y0) right low corner (x1,y1) */
+    int numcomps;			/* number of components in tile */
+    opj_tcd_tilecomp_t *comps;	/* Components information */
+    int numpix;			/* add fixed_quality */
+    double distotile;		/* add fixed_quality */
+    double distolayer[100];	/* add fixed_quality */
+    /** packet number */
+    int packno;
 } opj_tcd_tile_t;
 
 /**
 FIXME: documentation
 */
 typedef struct opj_tcd_image {
-  int tw, th;			/* number of tiles in width and heigth */
-  opj_tcd_tile_t *tiles;		/* Tiles information */
+    int tw, th;			/* number of tiles in width and heigth */
+    opj_tcd_tile_t *tiles;		/* Tiles information */
 } opj_tcd_image_t;
 
 /**
 Tile coder/decoder
 */
 typedef struct opj_tcd {
-	/** Position of the tilepart flag in Progression order*/
-	int tp_pos;
-	/** Tile part number*/
-	int tp_num;
-	/** Current tile part number*/
-	int cur_tp_num;
-	/** Total number of tileparts of the current tile*/
-	int cur_totnum_tp;
-	/** Current Packet iterator number */
-	int cur_pino;
-	/** codec context */
-	opj_common_ptr cinfo;
+    /** Position of the tilepart flag in Progression order*/
+    int tp_pos;
+    /** Tile part number*/
+    int tp_num;
+    /** Current tile part number*/
+    int cur_tp_num;
+    /** Total number of tileparts of the current tile*/
+    int cur_totnum_tp;
+    /** Current Packet iterator number */
+    int cur_pino;
+    /** codec context */
+    opj_common_ptr cinfo;
 
-	/** info on each image tile */
-	opj_tcd_image_t *tcd_image;
-	/** image */
-	opj_image_t *image;
-	/** coding parameters */
-	opj_cp_t *cp;
-	/** pointer to the current encoded/decoded tile */
-	opj_tcd_tile_t *tcd_tile;
-	/** coding/decoding parameters common to all tiles */
-	opj_tcp_t *tcp;
-	/** current encoded/decoded tile */
-	int tcd_tileno;
-	/** Time taken to encode a tile*/
-	double encoding_time;
+    /** info on each image tile */
+    opj_tcd_image_t *tcd_image;
+    /** image */
+    opj_image_t *image;
+    /** coding parameters */
+    opj_cp_t *cp;
+    /** pointer to the current encoded/decoded tile */
+    opj_tcd_tile_t *tcd_tile;
+    /** coding/decoding parameters common to all tiles */
+    opj_tcp_t *tcp;
+    /** current encoded/decoded tile */
+    int tcd_tileno;
+    /** Time taken to encode a tile*/
+    double encoding_time;
 } opj_tcd_t;
 
 /** @name Exported functions */
@@ -264,8 +264,8 @@ Encode a tile from the raw image into a buffer
 @param tileno Number that identifies one of the tiles to be encoded
 @param dest Destination buffer
 @param len Length of destination buffer
-@param cstr_info Codestream information structure 
-@return 
+@param cstr_info Codestream information structure
+@return
 */
 int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_codestream_info_t *cstr_info);
 /**
diff --git a/src/lib/openmj2/tgt.c b/src/lib/openmj2/tgt.c
index d5d280d7..493397b8 100644
--- a/src/lib/openmj2/tgt.c
+++ b/src/lib/openmj2/tgt.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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -37,183 +37,189 @@
 
 #include "opj_includes.h"
 
-/* 
+/*
 ==========================================================
    Tag-tree coder interface
 ==========================================================
 */
 
-opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv) {
-	int nplh[32];
-	int nplv[32];
-	opj_tgt_node_t *node = NULL;
-	opj_tgt_node_t *parentnode = NULL;
-	opj_tgt_node_t *parentnode0 = NULL;
-	opj_tgt_tree_t *tree = NULL;
-	int i, j, k;
-	int numlvls;
-	int n;
-
-	tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t));
-	if(!tree) return NULL;
-	tree->numleafsh = numleafsh;
-	tree->numleafsv = numleafsv;
-
-	numlvls = 0;
-	nplh[0] = numleafsh;
-	nplv[0] = numleafsv;
-	tree->numnodes = 0;
-	do {
-		n = nplh[numlvls] * nplv[numlvls];
-		nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
-		nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
-		tree->numnodes += n;
-		++numlvls;
-	} while (n > 1);
-	
-	/* ADD */
-	if (tree->numnodes == 0) {
-		opj_free(tree);
-		return NULL;
-	}
-
-	tree->nodes = (opj_tgt_node_t*) opj_calloc(tree->numnodes, sizeof(opj_tgt_node_t));
-	if(!tree->nodes) {
-		opj_free(tree);
-		return NULL;
-	}
-
-	node = tree->nodes;
-	parentnode = &tree->nodes[tree->numleafsh * tree->numleafsv];
-	parentnode0 = parentnode;
-	
-	for (i = 0; i < numlvls - 1; ++i) {
-		for (j = 0; j < nplv[i]; ++j) {
-			k = nplh[i];
-			while (--k >= 0) {
-				node->parent = parentnode;
-				++node;
-				if (--k >= 0) {
-					node->parent = parentnode;
-					++node;
-				}
-				++parentnode;
-			}
-			if ((j & 1) || j == nplv[i] - 1) {
-				parentnode0 = parentnode;
-			} else {
-				parentnode = parentnode0;
-				parentnode0 += nplh[i];
-			}
-		}
-	}
-	node->parent = 0;
-	
-	tgt_reset(tree);
-	
-	return tree;
+opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv)
+{
+    int nplh[32];
+    int nplv[32];
+    opj_tgt_node_t *node = NULL;
+    opj_tgt_node_t *parentnode = NULL;
+    opj_tgt_node_t *parentnode0 = NULL;
+    opj_tgt_tree_t *tree = NULL;
+    int i, j, k;
+    int numlvls;
+    int n;
+
+    tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t));
+    if(!tree) return NULL;
+    tree->numleafsh = numleafsh;
+    tree->numleafsv = numleafsv;
+
+    numlvls = 0;
+    nplh[0] = numleafsh;
+    nplv[0] = numleafsv;
+    tree->numnodes = 0;
+    do {
+        n = nplh[numlvls] * nplv[numlvls];
+        nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
+        nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
+        tree->numnodes += n;
+        ++numlvls;
+    } while (n > 1);
+
+    /* ADD */
+    if (tree->numnodes == 0) {
+        opj_free(tree);
+        return NULL;
+    }
+
+    tree->nodes = (opj_tgt_node_t*) opj_calloc(tree->numnodes, sizeof(opj_tgt_node_t));
+    if(!tree->nodes) {
+        opj_free(tree);
+        return NULL;
+    }
+
+    node = tree->nodes;
+    parentnode = &tree->nodes[tree->numleafsh * tree->numleafsv];
+    parentnode0 = parentnode;
+
+    for (i = 0; i < numlvls - 1; ++i) {
+        for (j = 0; j < nplv[i]; ++j) {
+            k = nplh[i];
+            while (--k >= 0) {
+                node->parent = parentnode;
+                ++node;
+                if (--k >= 0) {
+                    node->parent = parentnode;
+                    ++node;
+                }
+                ++parentnode;
+            }
+            if ((j & 1) || j == nplv[i] - 1) {
+                parentnode0 = parentnode;
+            } else {
+                parentnode = parentnode0;
+                parentnode0 += nplh[i];
+            }
+        }
+    }
+    node->parent = 0;
+
+    tgt_reset(tree);
+
+    return tree;
 }
 
-void tgt_destroy(opj_tgt_tree_t *tree) {
-	opj_free(tree->nodes);
-	opj_free(tree);
+void tgt_destroy(opj_tgt_tree_t *tree)
+{
+    opj_free(tree->nodes);
+    opj_free(tree);
 }
 
-void tgt_reset(opj_tgt_tree_t *tree) {
-	int i;
-
-	if (NULL == tree)
-		return;
-	
-	for (i = 0; i < tree->numnodes; i++) {
-		tree->nodes[i].value = 999;
-		tree->nodes[i].low = 0;
-		tree->nodes[i].known = 0;
-	}
+void tgt_reset(opj_tgt_tree_t *tree)
+{
+    int i;
+
+    if (NULL == tree)
+        return;
+
+    for (i = 0; i < tree->numnodes; i++) {
+        tree->nodes[i].value = 999;
+        tree->nodes[i].low = 0;
+        tree->nodes[i].known = 0;
+    }
 }
 
-void tgt_setvalue(opj_tgt_tree_t *tree, int leafno, int value) {
-	opj_tgt_node_t *node;
-	node = &tree->nodes[leafno];
-	while (node && node->value > value) {
-		node->value = value;
-		node = node->parent;
-	}
+void tgt_setvalue(opj_tgt_tree_t *tree, int leafno, int value)
+{
+    opj_tgt_node_t *node;
+    node = &tree->nodes[leafno];
+    while (node && node->value > value) {
+        node->value = value;
+        node = node->parent;
+    }
 }
 
-void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold) {
-	opj_tgt_node_t *stk[31];
-	opj_tgt_node_t **stkptr;
-	opj_tgt_node_t *node;
-	int low;
-
-	stkptr = stk;
-	node = &tree->nodes[leafno];
-	while (node->parent) {
-		*stkptr++ = node;
-		node = node->parent;
-	}
-	
-	low = 0;
-	for (;;) {
-		if (low > node->low) {
-			node->low = low;
-		} else {
-			low = node->low;
-		}
-		
-		while (low < threshold) {
-			if (low >= node->value) {
-				if (!node->known) {
-					bio_write(bio, 1, 1);
-					node->known = 1;
-				}
-				break;
-			}
-			bio_write(bio, 0, 1);
-			++low;
-		}
-		
-		node->low = low;
-		if (stkptr == stk)
-			break;
-		node = *--stkptr;
-	}
+void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold)
+{
+    opj_tgt_node_t *stk[31];
+    opj_tgt_node_t **stkptr;
+    opj_tgt_node_t *node;
+    int low;
+
+    stkptr = stk;
+    node = &tree->nodes[leafno];
+    while (node->parent) {
+        *stkptr++ = node;
+        node = node->parent;
+    }
+
+    low = 0;
+    for (;;) {
+        if (low > node->low) {
+            node->low = low;
+        } else {
+            low = node->low;
+        }
+
+        while (low < threshold) {
+            if (low >= node->value) {
+                if (!node->known) {
+                    bio_write(bio, 1, 1);
+                    node->known = 1;
+                }
+                break;
+            }
+            bio_write(bio, 0, 1);
+            ++low;
+        }
+
+        node->low = low;
+        if (stkptr == stk)
+            break;
+        node = *--stkptr;
+    }
 }
 
-int tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold) {
-	opj_tgt_node_t *stk[31];
-	opj_tgt_node_t **stkptr;
-	opj_tgt_node_t *node;
-	int low;
-
-	stkptr = stk;
-	node = &tree->nodes[leafno];
-	while (node->parent) {
-		*stkptr++ = node;
-		node = node->parent;
-	}
-	
-	low = 0;
-	for (;;) {
-		if (low > node->low) {
-			node->low = low;
-		} else {
-			low = node->low;
-		}
-		while (low < threshold && low < node->value) {
-			if (bio_read(bio, 1)) {
-				node->value = low;
-			} else {
-				++low;
-			}
-		}
-		node->low = low;
-		if (stkptr == stk) {
-			break;
-		}
-		node = *--stkptr;
-	}
-	
-	return (node->value < threshold) ? 1 : 0;
+int tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold)
+{
+    opj_tgt_node_t *stk[31];
+    opj_tgt_node_t **stkptr;
+    opj_tgt_node_t *node;
+    int low;
+
+    stkptr = stk;
+    node = &tree->nodes[leafno];
+    while (node->parent) {
+        *stkptr++ = node;
+        node = node->parent;
+    }
+
+    low = 0;
+    for (;;) {
+        if (low > node->low) {
+            node->low = low;
+        } else {
+            low = node->low;
+        }
+        while (low < threshold && low < node->value) {
+            if (bio_read(bio, 1)) {
+                node->value = low;
+            } else {
+                ++low;
+            }
+        }
+        node->low = low;
+        if (stkptr == stk) {
+            break;
+        }
+        node = *--stkptr;
+    }
+
+    return (node->value < threshold) ? 1 : 0;
 }
diff --git a/src/lib/openmj2/tgt.h b/src/lib/openmj2/tgt.h
index d0eb42dc..28450c12 100644
--- a/src/lib/openmj2/tgt.h
+++ b/src/lib/openmj2/tgt.h
@@ -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.
  *
@@ -8,7 +8,7 @@
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
  * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
@@ -52,20 +52,20 @@ are used by some function in T2.C.
 Tag node
 */
 typedef struct opj_tgt_node {
-  struct opj_tgt_node *parent;
-  int value;
-  int low;
-  int known;
+    struct opj_tgt_node *parent;
+    int value;
+    int low;
+    int known;
 } opj_tgt_node_t;
 
 /**
 Tag tree
 */
 typedef struct opj_tgt_tree {
-  int numleafsh;
-  int numleafsv;
-  int numnodes;
-  opj_tgt_node_t *nodes;
+    int numleafsh;
+    int numleafsv;
+    int numnodes;
+    opj_tgt_node_t *nodes;
 } opj_tgt_tree_t;
 
 /** @name Exported functions */