removed é in license header to prevent warning C4819 (see http://code.google.com/p/openjpeg/issues/detail?id=57)

57 files changed, 217 insertions, 214 deletions

diff --git a/CHANGES b/CHANGES
index fd001dbb..1dca4dd1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+January 29, 2011
+* [antonin] removed 'é' in license header to prevent warning C4819 (see http://code.google.com/p/openjpeg/issues/detail?id=57).
+
 January 24, 2011
 - [antonin] remove more obsolete VS files. Left only mj2_to_metadata VS files, as this is the only executable not yet handled by CMake.
 
diff --git a/jp3d/LICENSE.txt b/jp3d/LICENSE.txt
index 4716ce35..a128b1a7 100755
--- a/jp3d/LICENSE.txt
+++ b/jp3d/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/jp3d/codec/convert.c b/jp3d/codec/convert.c
index 92a8163a..626e5e9d 100755
--- a/jp3d/codec/convert.c
+++ b/jp3d/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/jp3d/codec/convert.h b/jp3d/codec/convert.h
index 18ae2127..61e7f3fe 100755
--- a/jp3d/codec/convert.h
+++ b/jp3d/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/jp3d/codec/jp3d_to_volume.c b/jp3d/codec/jp3d_to_volume.c
index 8df9c405..eb7fe308 100755
--- a/jp3d/codec/jp3d_to_volume.c
+++ b/jp3d/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/jp3d/codec/volume_to_jp3d.c b/jp3d/codec/volume_to_jp3d.c
index d966f2ed..a7568a59 100755
--- a/jp3d/codec/volume_to_jp3d.c
+++ b/jp3d/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/jp3d/libjp3dvm/bio.c b/jp3d/libjp3dvm/bio.c
index 3ac93158..b5f01e30 100755
--- a/jp3d/libjp3dvm/bio.c
+++ b/jp3d/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/jp3d/libjp3dvm/bio.h b/jp3d/libjp3dvm/bio.h
index c65103bd..4f15b22d 100755
--- a/jp3d/libjp3dvm/bio.h
+++ b/jp3d/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/jp3d/libjp3dvm/cio.c b/jp3d/libjp3dvm/cio.c
index 8814a33b..b934888f 100755
--- a/jp3d/libjp3dvm/cio.c
+++ b/jp3d/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/jp3d/libjp3dvm/cio.h b/jp3d/libjp3dvm/cio.h
index 6f58aeaa..54e0478a 100755
--- a/jp3d/libjp3dvm/cio.h
+++ b/jp3d/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/jp3d/libjp3dvm/dwt.c b/jp3d/libjp3dvm/dwt.c
index 4ac23bb3..42b5527b 100755
--- a/jp3d/libjp3dvm/dwt.c
+++ b/jp3d/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/jp3d/libjp3dvm/dwt.h b/jp3d/libjp3dvm/dwt.h
index afb1ba4f..147ec9b0 100755
--- a/jp3d/libjp3dvm/dwt.h
+++ b/jp3d/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/jp3d/libjp3dvm/event.c b/jp3d/libjp3dvm/event.c
index c558218c..af011e7f 100755
--- a/jp3d/libjp3dvm/event.c
+++ b/jp3d/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/jp3d/libjp3dvm/event.h b/jp3d/libjp3dvm/event.h
index 5a83bd26..4d6ca0e2 100755
--- a/jp3d/libjp3dvm/event.h
+++ b/jp3d/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/jp3d/libjp3dvm/fix.h b/jp3d/libjp3dvm/fix.h
index f2113b5a..484947b2 100755
--- a/jp3d/libjp3dvm/fix.h
+++ b/jp3d/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/jp3d/libjp3dvm/int.h b/jp3d/libjp3dvm/int.h
index 38932d98..38b946e5 100755
--- a/jp3d/libjp3dvm/int.h
+++ b/jp3d/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/jp3d/libjp3dvm/jp3d.c b/jp3d/libjp3dvm/jp3d.c
index 4a5527b7..0b9e7a77 100755
--- a/jp3d/libjp3dvm/jp3d.c
+++ b/jp3d/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/jp3d/libjp3dvm/jp3d.h b/jp3d/libjp3dvm/jp3d.h
index d9dcc8e3..fbd14d63 100755
--- a/jp3d/libjp3dvm/jp3d.h
+++ b/jp3d/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/jp3d/libjp3dvm/jp3d_lib.c b/jp3d/libjp3dvm/jp3d_lib.c
index b2303991..844e6405 100755
--- a/jp3d/libjp3dvm/jp3d_lib.c
+++ b/jp3d/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/jp3d/libjp3dvm/jp3d_lib.h b/jp3d/libjp3dvm/jp3d_lib.h
index 45b28309..aab66fb0 100755
--- a/jp3d/libjp3dvm/jp3d_lib.h
+++ b/jp3d/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/jp3d/libjp3dvm/mct.c b/jp3d/libjp3dvm/mct.c
index be4b875e..64123600 100755
--- a/jp3d/libjp3dvm/mct.c
+++ b/jp3d/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/jp3d/libjp3dvm/mct.h b/jp3d/libjp3dvm/mct.h
index 81513f7c..d7d6baf7 100755
--- a/jp3d/libjp3dvm/mct.h
+++ b/jp3d/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/jp3d/libjp3dvm/mqc.c b/jp3d/libjp3dvm/mqc.c
index 4117bf1f..87c30704 100755
--- a/jp3d/libjp3dvm/mqc.c
+++ b/jp3d/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/jp3d/libjp3dvm/mqc.h b/jp3d/libjp3dvm/mqc.h
index 67cfc008..7bc8f13f 100755
--- a/jp3d/libjp3dvm/mqc.h
+++ b/jp3d/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/jp3d/libjp3dvm/openjpeg.c b/jp3d/libjp3dvm/openjpeg.c
index 8e3a0782..3a1d649e 100755
--- a/jp3d/libjp3dvm/openjpeg.c
+++ b/jp3d/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/jp3d/libjp3dvm/openjpeg3d.h b/jp3d/libjp3dvm/openjpeg3d.h
index ee878ebc..9ba9487b 100755
--- a/jp3d/libjp3dvm/openjpeg3d.h
+++ b/jp3d/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/jp3d/libjp3dvm/opj_includes.h b/jp3d/libjp3dvm/opj_includes.h
index 0c70ff10..84aa7d0f 100755
--- a/jp3d/libjp3dvm/opj_includes.h
+++ b/jp3d/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/jp3d/libjp3dvm/pi.c b/jp3d/libjp3dvm/pi.c
index 5fd673fd..d506ace5 100755
--- a/jp3d/libjp3dvm/pi.c
+++ b/jp3d/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/jp3d/libjp3dvm/pi.h b/jp3d/libjp3dvm/pi.h
index 1d3340be..f4177903 100755
--- a/jp3d/libjp3dvm/pi.h
+++ b/jp3d/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/jp3d/libjp3dvm/raw.c b/jp3d/libjp3dvm/raw.c
index 59d7d35b..14e3aa40 100755
--- a/jp3d/libjp3dvm/raw.c
+++ b/jp3d/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/jp3d/libjp3dvm/raw.h b/jp3d/libjp3dvm/raw.h
index e17070ab..48e55944 100755
--- a/jp3d/libjp3dvm/raw.h
+++ b/jp3d/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/jp3d/libjp3dvm/t1.c b/jp3d/libjp3dvm/t1.c
index 43a78b6a..0e18e544 100755
--- a/jp3d/libjp3dvm/t1.c
+++ b/jp3d/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/jp3d/libjp3dvm/t1.h b/jp3d/libjp3dvm/t1.h
index ec7160c1..287e5bb8 100755
--- a/jp3d/libjp3dvm/t1.h
+++ b/jp3d/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/jp3d/libjp3dvm/t2.c b/jp3d/libjp3dvm/t2.c
index 20d8e7d2..f3fa05b9 100755
--- a/jp3d/libjp3dvm/t2.c
+++ b/jp3d/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/jp3d/libjp3dvm/t2.h b/jp3d/libjp3dvm/t2.h
index 191d0bc4..e1589703 100755
--- a/jp3d/libjp3dvm/t2.h
+++ b/jp3d/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/jp3d/libjp3dvm/tcd.c b/jp3d/libjp3dvm/tcd.c
index b0184d58..f10b6124 100755
--- a/jp3d/libjp3dvm/tcd.c
+++ b/jp3d/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/jp3d/libjp3dvm/tcd.h b/jp3d/libjp3dvm/tcd.h
index 0de60b8c..e90e653e 100755
--- a/jp3d/libjp3dvm/tcd.h
+++ b/jp3d/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/jp3d/libjp3dvm/tgt.c b/jp3d/libjp3dvm/tgt.c
index 9398ea94..e50432fd 100755
--- a/jp3d/libjp3dvm/tgt.c
+++ b/jp3d/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/jp3d/libjp3dvm/tgt.h b/jp3d/libjp3dvm/tgt.h
index ad27f113..4f1cea01 100755
--- a/jp3d/libjp3dvm/tgt.h
+++ b/jp3d/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/jp3d/libjp3dvm/volume.c b/jp3d/libjp3dvm/volume.c
index 9066e390..c26bb0ee 100755
--- a/jp3d/libjp3dvm/volume.c
+++ b/jp3d/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/jp3d/libjp3dvm/volume.h b/jp3d/libjp3dvm/volume.h
index 737bde79..464a9e5d 100755
--- a/jp3d/libjp3dvm/volume.h
+++ b/jp3d/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.

  *

diff --git a/jpwl/crc.c b/jpwl/crc.c
index a54b6575..64f72cb5 100644
--- a/jpwl/crc.c
+++ b/jpwl/crc.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) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy

  * All rights reserved.

@@ -55,37 +55,37 @@
  */

 const unsigned short CRC16_table[256] = {

 	0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 

-	0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, 
-	0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, 
-	0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
-	0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, 
-	0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, 
-	0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, 
-	0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, 
-	0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, 
-	0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, 
-	0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, 
-	0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
-	0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, 
-	0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, 
-	0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, 
-	0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, 
-	0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, 
-	0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
-	0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, 
-	0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, 
-	0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
-	0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, 
-	0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, 
-	0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, 
-	0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, 
-	0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, 
-	0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, 
-	0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, 
-	0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, 
-	0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, 
-	0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, 
-	0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
+	0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, 

+	0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, 

+	0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,

+	0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, 

+	0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, 

+	0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, 

+	0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, 

+	0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, 

+	0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, 

+	0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, 

+	0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,

+	0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, 

+	0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, 

+	0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, 

+	0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, 

+	0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, 

+	0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,

+	0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, 

+	0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, 

+	0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,

+	0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, 

+	0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, 

+	0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, 

+	0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, 

+	0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, 

+	0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, 

+	0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, 

+	0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, 

+	0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, 

+	0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, 

+	0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0

 };

 

 void updateCRC16(unsigned short *crc, unsigned char data) {

diff --git a/jpwl/crc.h b/jpwl/crc.h
index 2d871687..1db27bb5 100644
--- a/jpwl/crc.h
+++ b/jpwl/crc.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) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/jpwl.c b/jpwl/jpwl.c
index 07ca796a..da75901d 100644
--- a/jpwl/jpwl.c
+++ b/jpwl/jpwl.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) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy

  * All rights reserved.

diff --git a/jpwl/jpwl.h b/jpwl/jpwl.h
index a96840cc..0c5d93cf 100644
--- a/jpwl/jpwl.h
+++ b/jpwl/jpwl.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) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/jpwl_lib.c b/jpwl/jpwl_lib.c
index 90391b01..504f59ca 100644
--- a/jpwl/jpwl_lib.c
+++ b/jpwl/jpwl_lib.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) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/rs.c b/jpwl/rs.c
index d699bee5..dbe5c9f5 100644
--- a/jpwl/rs.c
+++ b/jpwl/rs.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) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/rs.h b/jpwl/rs.h
index d3c573eb..aa72d55a 100644
--- a/jpwl/rs.h
+++ b/jpwl/rs.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) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/libopenjpeg/event.c b/libopenjpeg/event.c
index 953a9973..c38a7ccb 100644
--- a/libopenjpeg/event.c
+++ b/libopenjpeg/event.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libopenjpeg/event.h b/libopenjpeg/event.h
index 11910b0e..0a6898da 100644
--- a/libopenjpeg/event.h
+++ b/libopenjpeg/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/libopenjpeg/image.c b/libopenjpeg/image.c
index 30b7d139..a0bb273d 100644
--- a/libopenjpeg/image.c
+++ b/libopenjpeg/image.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/libopenjpeg/image.h b/libopenjpeg/image.h
index 04c362eb..5789e547 100644
--- a/libopenjpeg/image.h
+++ b/libopenjpeg/image.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/libopenjpeg/j2k_lib.c b/libopenjpeg/j2k_lib.c
index d815f166..2eaabd53 100644
--- a/libopenjpeg/j2k_lib.c
+++ b/libopenjpeg/j2k_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/libopenjpeg/j2k_lib.h b/libopenjpeg/j2k_lib.h
index 7df4d367..f8177be5 100644
--- a/libopenjpeg/j2k_lib.h
+++ b/libopenjpeg/j2k_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/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 6722b33d..51257d5e 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.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/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 53739abf..c4dda3ce 100644
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/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/libopenjpeg/opj_malloc.h b/libopenjpeg/opj_malloc.h
index 64908f3e..8b3f7c19 100644
--- a/libopenjpeg/opj_malloc.h
+++ b/libopenjpeg/opj_malloc.h
@@ -1,5 +1,5 @@
 /*

- * Copyright (c) 2005, Hervé Drolon, FreeImage Team

+ * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team

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

  * All rights reserved.

  *