diff --git a/LICENSE.txt b/LICENSE.txt
index 4716ce35..a128b1a7 100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, HervŽ Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez, Image Processing Laboratory (LPI) - University of Valladolid, Spain
  * All rights reserved.
diff --git a/codec/convert.c b/codec/convert.c
index 92a8163a..626e5e9d 100755
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/codec/convert.h b/codec/convert.h
index 18ae2127..61e7f3fe 100755
--- a/codec/convert.h
+++ b/codec/convert.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, HervŽ Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/codec/jp3d_to_volume.c b/codec/jp3d_to_volume.c
index 8df9c405..eb7fe308 100755
--- a/codec/jp3d_to_volume.c
+++ b/codec/jp3d_to_volume.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/codec/volume_to_jp3d.c b/codec/volume_to_jp3d.c
index d966f2ed..a7568a59 100755
--- a/codec/volume_to_jp3d.c
+++ b/codec/volume_to_jp3d.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/libjp3dvm/bio.c b/libjp3dvm/bio.c
index 3ac93158..b5f01e30 100755
--- a/libjp3dvm/bio.c
+++ b/libjp3dvm/bio.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/bio.h b/libjp3dvm/bio.h
index c65103bd..4f15b22d 100755
--- a/libjp3dvm/bio.h
+++ b/libjp3dvm/bio.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/cio.c b/libjp3dvm/cio.c
index 8814a33b..b934888f 100755
--- a/libjp3dvm/cio.c
+++ b/libjp3dvm/cio.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/cio.h b/libjp3dvm/cio.h
index 6f58aeaa..54e0478a 100755
--- a/libjp3dvm/cio.h
+++ b/libjp3dvm/cio.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/dwt.c b/libjp3dvm/dwt.c
index 4ac23bb3..42b5527b 100755
--- a/libjp3dvm/dwt.c
+++ b/libjp3dvm/dwt.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
@@ -212,17 +212,17 @@ static int flagnorm[10][10][10][8];
 	}
 };*/
 
-static opj_atk_t atk_info_wt[] = {
-	{0, 1, J3D_ATK_WS, J3D_ATK_IRR, 0, J3D_ATK_WS, 1.230174104, 4, {0}, {0}, {0}, {1,1,1,1}, {-1.586134342059924, -0.052980118572961, 0.882911075530934, 0.443506852043971}},/* WT 9-7 IRR*/
-	{1, 0, J3D_ATK_WS, J3D_ATK_REV, 0, J3D_ATK_WS, 0, 2, {0}, {1,2}, {1,2}, {1,1}, {-1,1}},/* WT 5-3 REV*/
-	{2, 0, J3D_ATK_ARB, J3D_ATK_REV, 0, J3D_ATK_CON, 0, 2, {0,0}, {0,1}, {0,1}, {1,1}, {{-1},{1}}}, /* WT 2-2 REV*/
-	{3, 0, J3D_ATK_ARB, J3D_ATK_REV, 1, J3D_ATK_CON, 0, 3, {0,0,-1}, {0,1,2}, {0,1,2}, {1,1,3}, {{-1},{1},{1,0,-1}}}, /* WT 2-6 REV*/
-	{4, 0, J3D_ATK_ARB, J3D_ATK_REV, 1, J3D_ATK_CON, 0, 3, {0,0,-2}, {0,1,6}, {0,1,32}, {1,1,5}, {{-1},{1},{-3,22,0,-22,3}}}, /* WT 2-10 REV*/
-	{5, 1, J3D_ATK_ARB, J3D_ATK_IRR, 1, J3D_ATK_WS, 1, 7, {0}, {0}, {0}, {1,1,2,1,2,1,3},{{-1},{1.58613434206},{-0.460348209828, 0.460348209828},{0.25},{0.374213867768,-0.374213867768},{-1.33613434206},{0.29306717103,0,-0.29306717103}}}, /* WT 6-10 IRR*/
-	{6, 1, J3D_ATK_ARB, J3D_ATK_IRR, 0, J3D_ATK_WS, 1, 11, {0}, {0}, {0}, {1,1,2,1,2,1,2,1,2,1,5},{{-1},{0,99715069105},{-1.00573127827, 1.00573127827},{-0.27040357631},{2.20509972343, -2.20509972343},{0.08059995736},
-		{-1.62682532350, 1.62682532350},{0.52040357631},{0.60404664250, -0.60404664250},{-0.82775064841},{-0.06615812964, 0.29402137720, 0, -0.29402137720, 0.06615812964}}}, /* WT 10-18 IRR*/
-	{7, 1, J3D_ATK_WS, J3D_ATK_IRR, 0, J3D_ATK_WS, 1, 2, {0}, {0}, {0}, {1,1}, {-0.5, 0.25}},	/* WT 5-3 IRR*/
-	{8, 0, J3D_ATK_WS, J3D_ATK_REV, 0, J3D_ATK_WS, 0, 2, {0}, {4,4}, {8,8}, {2,2}, {{-9,1},{5,-1}}}		/* WT 13-7 REV*/
+static opj_atk_t atk_info_wt[] = {
+	{0, 1, J3D_ATK_WS, J3D_ATK_IRR, 0, J3D_ATK_WS, 1.230174104, 4, {0}, {0}, {0}, {1,1,1,1}, {-1.586134342059924, -0.052980118572961, 0.882911075530934, 0.443506852043971}},/* WT 9-7 IRR*/
+	{1, 0, J3D_ATK_WS, J3D_ATK_REV, 0, J3D_ATK_WS, 0, 2, {0}, {1,2}, {1,2}, {1,1}, {-1,1}},/* WT 5-3 REV*/
+	{2, 0, J3D_ATK_ARB, J3D_ATK_REV, 0, J3D_ATK_CON, 0, 2, {0,0}, {0,1}, {0,1}, {1,1}, {{-1},{1}}}, /* WT 2-2 REV*/
+	{3, 0, J3D_ATK_ARB, J3D_ATK_REV, 1, J3D_ATK_CON, 0, 3, {0,0,-1}, {0,1,2}, {0,1,2}, {1,1,3}, {{-1},{1},{1,0,-1}}}, /* WT 2-6 REV*/
+	{4, 0, J3D_ATK_ARB, J3D_ATK_REV, 1, J3D_ATK_CON, 0, 3, {0,0,-2}, {0,1,6}, {0,1,32}, {1,1,5}, {{-1},{1},{-3,22,0,-22,3}}}, /* WT 2-10 REV*/
+	{5, 1, J3D_ATK_ARB, J3D_ATK_IRR, 1, J3D_ATK_WS, 1, 7, {0}, {0}, {0}, {1,1,2,1,2,1,3},{{-1},{1.58613434206},{-0.460348209828, 0.460348209828},{0.25},{0.374213867768,-0.374213867768},{-1.33613434206},{0.29306717103,0,-0.29306717103}}}, /* WT 6-10 IRR*/
+	{6, 1, J3D_ATK_ARB, J3D_ATK_IRR, 0, J3D_ATK_WS, 1, 11, {0}, {0}, {0}, {1,1,2,1,2,1,2,1,2,1,5},{{-1},{0,99715069105},{-1.00573127827, 1.00573127827},{-0.27040357631},{2.20509972343, -2.20509972343},{0.08059995736},
+		{-1.62682532350, 1.62682532350},{0.52040357631},{0.60404664250, -0.60404664250},{-0.82775064841},{-0.06615812964, 0.29402137720, 0, -0.29402137720, 0.06615812964}}}, /* WT 10-18 IRR*/
+	{7, 1, J3D_ATK_WS, J3D_ATK_IRR, 0, J3D_ATK_WS, 1, 2, {0}, {0}, {0}, {1,1}, {-0.5, 0.25}},	/* WT 5-3 IRR*/
+	{8, 0, J3D_ATK_WS, J3D_ATK_REV, 0, J3D_ATK_WS, 0, 2, {0}, {4,4}, {8,8}, {2,2}, {{-9,1},{5,-1}}}		/* WT 13-7 REV*/
 };
 /* 
 ==========================================================
@@ -369,40 +369,40 @@ static void dwt_encode_53(int *a, int dn, int sn, int cas) {
 	}
 }
 static void dwt_encode_97(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 */
-			}
-		}
-}
+	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 */
+			}
+		}
+}
 /* <summary>                            */
 /* Inverse 5-3 or 9-7 wavelet tranform in 1-D. */
 /* </summary>                           */ 
@@ -424,38 +424,38 @@ static void dwt_decode_53(int *a, int dn, int sn, int cas) {
 }
 static void dwt_decode_97(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) = fix_mul(S(i), 10078);	/* 10076 */
-			for (i = 0; i < dn; i++)
-				D(i) = fix_mul(D(i), 13318);	/* 13320 */
-			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(S_(i) + S_(i + 1), 7233);
-			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), 12994);	/* 12993 */
-		}
-	} else {
-		if ((sn > 0) || (dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < sn; i++)
-				D(i) = fix_mul(D(i), 10078);	/* 10076 */
-			for (i = 0; i < dn; i++)
-				S(i) = fix_mul(S(i), 13318);	/* 13320 */
-			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(DD_(i) + DD_(i - 1), 7233);
-			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), 12994);	/* 12993 */
-		}
-	}
+
+	if (!cas) {
+		if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+			for (i = 0; i < sn; i++)
+				S(i) = fix_mul(S(i), 10078);	/* 10076 */
+			for (i = 0; i < dn; i++)
+				D(i) = fix_mul(D(i), 13318);	/* 13320 */
+			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(S_(i) + S_(i + 1), 7233);
+			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), 12994);	/* 12993 */
+		}
+	} else {
+		if ((sn > 0) || (dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+			for (i = 0; i < sn; i++)
+				D(i) = fix_mul(D(i), 10078);	/* 10076 */
+			for (i = 0; i < dn; i++)
+				S(i) = fix_mul(S(i), 13318);	/* 13320 */
+			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(DD_(i) + DD_(i - 1), 7233);
+			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), 12994);	/* 12993 */
+		}
+	}
 }
 
 
@@ -463,21 +463,21 @@ static void dwt_decode_97(int *a, int dn, int sn, int cas) {
 /* Get norm of arbitrary wavelet transform. */
 /* </summary>               */
 static int upandconv(double *nXPS, double *LPS, int lenXPS, int lenLPS) {
-	/* Perform the convolution of the vectors. */
-	int i,j;
-	double *tmp = (double *)opj_malloc(2*lenXPS * sizeof(double));
-	//Upsample
-	memset(tmp, 0, 2*lenXPS*sizeof(double));
-	for (i = 0; i < lenXPS; i++) {
-		*(tmp + 2*i) = *(nXPS + i);
-		*(nXPS + i) = 0;
-	}
-	//Convolution
-	for (i = 0; i < 2*lenXPS; i++) {
-		for (j = 0; j < lenLPS; j++) {
-			*(nXPS+i+j) = *(nXPS+i+j) + *(tmp + i) * *(LPS + j);
+	/* Perform the convolution of the vectors. */
+	int i,j;
+	double *tmp = (double *)opj_malloc(2*lenXPS * sizeof(double));
+	//Upsample
+	memset(tmp, 0, 2*lenXPS*sizeof(double));
+	for (i = 0; i < lenXPS; i++) {
+		*(tmp + 2*i) = *(nXPS + i);
+		*(nXPS + i) = 0;
+	}
+	//Convolution
+	for (i = 0; i < 2*lenXPS; i++) {
+		for (j = 0; j < lenLPS; j++) {
+			*(nXPS+i+j) = *(nXPS+i+j) + *(tmp + i) * *(LPS + j);
 			//fprintf(stdout,"*(tmp + %d) * *(LPS + %d) = %f * %f \n",i,j,*(tmp + i),*(LPS + j));
-		}
+		}
 	}
 	free(tmp);
 	return 2*lenXPS+lenLPS-1;
@@ -621,15 +621,15 @@ static void dwt_getwtfilters(opj_wtfilt_t *wtfilt, int dwtid) {
 			wtfilt->LPS[4] = 0.591271763114;	wtfilt->HPS[4] = 0.602949018236;
 			wtfilt->LPS[5] = -0.057543526228;	wtfilt->HPS[5] = -0.266864118443;
 			wtfilt->LPS[6] = -0.091271763114;	wtfilt->HPS[6] = -0.078223266529;
-												wtfilt->HPS[7] = 0.016864118443;
-												wtfilt->HPS[8] = 0.026748757411;			
+												wtfilt->HPS[7] = 0.016864118443;
+												wtfilt->HPS[8] = 0.026748757411;			
 	} else if (dwtid == 1) { //DWT 5-3 
 			wtfilt->lenLPS = 3;		wtfilt->lenHPS = 5;
 			wtfilt->LPS = (double *)opj_malloc(wtfilt->lenLPS * sizeof(double));
 			wtfilt->HPS = (double *)opj_malloc(wtfilt->lenHPS * sizeof(double));
-			wtfilt->LPS[0] = 0.5;	wtfilt->HPS[0] = -0.125; 
-			wtfilt->LPS[1] = 1;		wtfilt->HPS[1] = -0.25; 
-			wtfilt->LPS[2] = 0.5;	wtfilt->HPS[2] = 0.75;
+			wtfilt->LPS[0] = 0.5;	wtfilt->HPS[0] = -0.125; 
+			wtfilt->LPS[1] = 1;		wtfilt->HPS[1] = -0.25; 
+			wtfilt->LPS[2] = 0.5;	wtfilt->HPS[2] = 0.75;
 									wtfilt->HPS[3] = -0.25; 
 									wtfilt->HPS[4] = -0.125;
 	} else {
@@ -683,16 +683,16 @@ void dwt_encode(opj_tcd_tilecomp_t * tilec, int dwtid[3]) {
 
 	a = tilec->data;
 
-	for (x = 0, y = 0, z = 0; (x < levelx) && (y < levely); x++, y++, z++) {
-		int rw;			/* width of the resolution level computed                                                           */
-		int rh;			/* heigth of the resolution level computed                                                          */
-		int rd;			/* depth 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 rd1;		/* depth 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 cas_axl;	/* 0 = non inversion on axial filtering 1 = inversion between low-pass and high-pass filtering   */
+	for (x = 0, y = 0, z = 0; (x < levelx) && (y < levely); x++, y++, z++) {
+		int rw;			/* width of the resolution level computed                                                           */
+		int rh;			/* heigth of the resolution level computed                                                          */
+		int rd;			/* depth 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 rd1;		/* depth 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 cas_axl;	/* 0 = non inversion on axial filtering 1 = inversion between low-pass and high-pass filtering   */
 		int dn, sn;
 		
 		rw = tilec->resolutions[level - x].x1 - tilec->resolutions[level - x].x0;
@@ -705,11 +705,11 @@ void dwt_encode(opj_tcd_tilecomp_t * tilec, int dwtid[3]) {
 		cas_col = tilec->resolutions[level - x].x0 % 2; /* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
 		cas_row = tilec->resolutions[level - y].y0 % 2; /* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
 		cas_axl = tilec->resolutions[level - z].z0 % 2;
-	
-		/*fprintf(stdout," x %d y %d z %d \n",x,y,z);
-		fprintf(stdout," levelx %d levely %d levelz %d \n",levelx,levely,levelz);
-		fprintf(stdout," z1 %d z0 %d\n",tilec->resolutions[level - z].z1,tilec->resolutions[level - z].z0);
-		fprintf(stdout," rw %d rh %d rd %d \n rw1 %d rh1 %d rd1 %d \n",rw,rh,rd,rw1,rh1,rd1);*/
+	
+		/*fprintf(stdout," x %d y %d z %d \n",x,y,z);
+		fprintf(stdout," levelx %d levely %d levelz %d \n",levelx,levely,levelz);
+		fprintf(stdout," z1 %d z0 %d\n",tilec->resolutions[level - z].z1,tilec->resolutions[level - z].z0);
+		fprintf(stdout," rw %d rh %d rd %d \n rw1 %d rh1 %d rd1 %d \n",rw,rh,rd,rw1,rh1,rd1);*/
 
 		for (i = 0; i < rd; i++) {
 			
@@ -744,14 +744,14 @@ void dwt_encode(opj_tcd_tilecomp_t * tilec, int dwtid[3]) {
 				for (j = 0; j < rw; j++) {
 					aj = cj + j;
 					for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
-					dwt_encode_97(bj, dn, sn, cas_col);
+					dwt_encode_97(bj, dn, sn, cas_col);
 					dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
 				}
             } else if (dwtid[1] == 1) { /*DWT 5-3*/
 				for (j = 0; j < rw; j++) {
 					aj = cj + j;
 					for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
-					dwt_encode_53(bj, dn, sn, cas_col);
+					dwt_encode_53(bj, dn, sn, cas_col);
 					dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
 				}
 			} 
@@ -813,15 +813,15 @@ void dwt_decode(opj_tcd_tilecomp_t * tilec, int stops[3], int dwtid[3]) {
 		
 /* General lifting framework -- DCCS-LIWT */
 	for (x = level - 1, y = level - 1, z = level - 1; (x >= stops[0]) && (y >= stops[1]); x--, y--, z--) {
-		int rw;			/* width of the resolution level computed                                                           */
-		int rh;			/* heigth of the resolution level computed                                                          */
-		int rd;			/* depth 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 rd1;		/* depth 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 cas_axl;	/* 0 = non inversion on axial filtering 1 = inversion between low-pass and high-pass filtering   */
+		int rw;			/* width of the resolution level computed                                                           */
+		int rh;			/* heigth of the resolution level computed                                                          */
+		int rd;			/* depth 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 rd1;		/* depth 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 cas_axl;	/* 0 = non inversion on axial filtering 1 = inversion between low-pass and high-pass filtering   */
 		int dn, sn;
 		
 		rw = tilec->resolutions[level - x].x1 - tilec->resolutions[level - x].x0;
@@ -834,11 +834,11 @@ void dwt_decode(opj_tcd_tilecomp_t * tilec, int stops[3], int dwtid[3]) {
 		cas_col = tilec->resolutions[level - x].x0 % 2; /* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
 		cas_row = tilec->resolutions[level - y].y0 % 2; /* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
 		cas_axl = tilec->resolutions[level - z].z0 % 2;
-	
-		/*fprintf(stdout," x %d y %d z %d \n",x,y,z);
-		fprintf(stdout," levelx %d levely %d levelz %d \n",levelx,levely,levelz);
-		fprintf(stdout," dwtid[0] %d [1] %d [2] %d \n",dwtid[0],dwtid[1],dwtid[2]);
-		fprintf(stdout," rw %d rh %d rd %d \n rw1 %d rh1 %d rd1 %d \n",rw,rh,rd,rw1,rh1,rd1);
+	
+		/*fprintf(stdout," x %d y %d z %d \n",x,y,z);
+		fprintf(stdout," levelx %d levely %d levelz %d \n",levelx,levely,levelz);
+		fprintf(stdout," dwtid[0] %d [1] %d [2] %d \n",dwtid[0],dwtid[1],dwtid[2]);
+		fprintf(stdout," rw %d rh %d rd %d \n rw1 %d rh1 %d rd1 %d \n",rw,rh,rd,rw1,rh1,rd1);
 		fprintf(stdout,"IDWT Transform %d %d %d %d\n",level, z, rd,rd1);*/
 
 		if (z >= stops[2] && rd != rd1) {
diff --git a/libjp3dvm/dwt.h b/libjp3dvm/dwt.h
index afb1ba4f..147ec9b0 100755
--- a/libjp3dvm/dwt.h
+++ b/libjp3dvm/dwt.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
diff --git a/libjp3dvm/event.c b/libjp3dvm/event.c
index c558218c..af011e7f 100755
--- a/libjp3dvm/event.c
+++ b/libjp3dvm/event.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libjp3dvm/event.h b/libjp3dvm/event.h
index 5a83bd26..4d6ca0e2 100755
--- a/libjp3dvm/event.h
+++ b/libjp3dvm/event.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libjp3dvm/fix.h b/libjp3dvm/fix.h
index f2113b5a..484947b2 100755
--- a/libjp3dvm/fix.h
+++ b/libjp3dvm/fix.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/int.h b/libjp3dvm/int.h
index 38932d98..38b946e5 100755
--- a/libjp3dvm/int.h
+++ b/libjp3dvm/int.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/jp3d.c b/libjp3dvm/jp3d.c
index 4a5527b7..0b9e7a77 100755
--- a/libjp3dvm/jp3d.c
+++ b/libjp3dvm/jp3d.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/libjp3dvm/jp3d.h b/libjp3dvm/jp3d.h
index d9dcc8e3..fbd14d63 100755
--- a/libjp3dvm/jp3d.h
+++ b/libjp3dvm/jp3d.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/libjp3dvm/jp3d_lib.c b/libjp3dvm/jp3d_lib.c
index b2303991..844e6405 100755
--- a/libjp3dvm/jp3d_lib.c
+++ b/libjp3dvm/jp3d_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libjp3dvm/jp3d_lib.h b/libjp3dvm/jp3d_lib.h
index 45b28309..aab66fb0 100755
--- a/libjp3dvm/jp3d_lib.h
+++ b/libjp3dvm/jp3d_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libjp3dvm/mct.c b/libjp3dvm/mct.c
index be4b875e..64123600 100755
--- a/libjp3dvm/mct.c
+++ b/libjp3dvm/mct.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/mct.h b/libjp3dvm/mct.h
index 81513f7c..d7d6baf7 100755
--- a/libjp3dvm/mct.h
+++ b/libjp3dvm/mct.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/mqc.c b/libjp3dvm/mqc.c
index 4117bf1f..87c30704 100755
--- a/libjp3dvm/mqc.c
+++ b/libjp3dvm/mqc.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/mqc.h b/libjp3dvm/mqc.h
index 67cfc008..7bc8f13f 100755
--- a/libjp3dvm/mqc.h
+++ b/libjp3dvm/mqc.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/openjpeg.c b/libjp3dvm/openjpeg.c
index 8e3a0782..3a1d649e 100755
--- a/libjp3dvm/openjpeg.c
+++ b/libjp3dvm/openjpeg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
  *
diff --git a/libjp3dvm/openjpeg3d.h b/libjp3dvm/openjpeg3d.h
index ee878ebc..9ba9487b 100755
--- a/libjp3dvm/openjpeg3d.h
+++ b/libjp3dvm/openjpeg3d.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/libjp3dvm/opj_includes.h b/libjp3dvm/opj_includes.h
index 0c70ff10..84aa7d0f 100755
--- a/libjp3dvm/opj_includes.h
+++ b/libjp3dvm/opj_includes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libjp3dvm/pi.c b/libjp3dvm/pi.c
index 5fd673fd..d506ace5 100755
--- a/libjp3dvm/pi.c
+++ b/libjp3dvm/pi.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
diff --git a/libjp3dvm/pi.h b/libjp3dvm/pi.h
index 1d3340be..f4177903 100755
--- a/libjp3dvm/pi.h
+++ b/libjp3dvm/pi.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/libjp3dvm/raw.c b/libjp3dvm/raw.c
index 59d7d35b..14e3aa40 100755
--- a/libjp3dvm/raw.c
+++ b/libjp3dvm/raw.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/raw.h b/libjp3dvm/raw.h
index e17070ab..48e55944 100755
--- a/libjp3dvm/raw.h
+++ b/libjp3dvm/raw.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/t1.c b/libjp3dvm/t1.c
index 43a78b6a..0e18e544 100755
--- a/libjp3dvm/t1.c
+++ b/libjp3dvm/t1.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/t1.h b/libjp3dvm/t1.h
index ec7160c1..287e5bb8 100755
--- a/libjp3dvm/t1.h
+++ b/libjp3dvm/t1.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/t2.c b/libjp3dvm/t2.c
index 20d8e7d2..f3fa05b9 100755
--- a/libjp3dvm/t2.c
+++ b/libjp3dvm/t2.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/t2.h b/libjp3dvm/t2.h
index 191d0bc4..e1589703 100755
--- a/libjp3dvm/t2.h
+++ b/libjp3dvm/t2.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/libjp3dvm/tcd.c b/libjp3dvm/tcd.c
index b0184d58..f10b6124 100755
--- a/libjp3dvm/tcd.c
+++ b/libjp3dvm/tcd.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
diff --git a/libjp3dvm/tcd.h b/libjp3dvm/tcd.h
index 0de60b8c..e90e653e 100755
--- a/libjp3dvm/tcd.h
+++ b/libjp3dvm/tcd.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/libjp3dvm/tgt.c b/libjp3dvm/tgt.c
index 9398ea94..e50432fd 100755
--- a/libjp3dvm/tgt.c
+++ b/libjp3dvm/tgt.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/tgt.h b/libjp3dvm/tgt.h
index ad27f113..4f1cea01 100755
--- a/libjp3dvm/tgt.h
+++ b/libjp3dvm/tgt.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/libjp3dvm/volume.c b/libjp3dvm/volume.c
index 9066e390..c26bb0ee 100755
--- a/libjp3dvm/volume.c
+++ b/libjp3dvm/volume.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libjp3dvm/volume.h b/libjp3dvm/volume.h
index 737bde79..464a9e5d 100755
--- a/libjp3dvm/volume.h
+++ b/libjp3dvm/volume.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
  *