removed é in license header to prevent warning C4819 (see http://code.google.com/p/openjpeg/issues/detail?id=57)
This commit is contained in:
parent
64af129291
commit
4cc02c354a
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez, Image Processing Laboratory (LPI) - University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
256
libjp3dvm/dwt.c
256
libjp3dvm/dwt.c
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
|
* Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
@ -212,17 +212,17 @@ static int flagnorm[10][10][10][8];
|
||||||
}
|
}
|
||||||
};*/
|
};*/
|
||||||
|
|
||||||
static opj_atk_t atk_info_wt[] = {
|
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*/
|
{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*/
|
{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*/
|
{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*/
|
{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*/
|
{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*/
|
{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},
|
{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*/
|
{-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*/
|
{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*/
|
{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) {
|
static void dwt_encode_97(int *a, int dn, int sn, int cas) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!cas) {
|
if (!cas) {
|
||||||
if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */
|
if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
D(i) -= fix_mul(S_(i) + S_(i + 1), 12993);
|
D(i) -= fix_mul(S_(i) + S_(i + 1), 12993);
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
S(i) -= fix_mul(D_(i - 1) + D_(i), 434);
|
S(i) -= fix_mul(D_(i - 1) + D_(i), 434);
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
D(i) += fix_mul(S_(i) + S_(i + 1), 7233);
|
D(i) += fix_mul(S_(i) + S_(i + 1), 7233);
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
S(i) += fix_mul(D_(i - 1) + D_(i), 3633);
|
S(i) += fix_mul(D_(i - 1) + D_(i), 3633);
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
D(i) = fix_mul(D(i), 5038); /*5038 */
|
D(i) = fix_mul(D(i), 5038); /*5038 */
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
S(i) = fix_mul(S(i), 6659); /*6660 */
|
S(i) = fix_mul(S(i), 6659); /*6660 */
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ((sn > 0) || (dn > 1)) { /* NEW : CASE ONE ELEMENT */
|
if ((sn > 0) || (dn > 1)) { /* NEW : CASE ONE ELEMENT */
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
S(i) -= fix_mul(DD_(i) + DD_(i - 1), 12993);
|
S(i) -= fix_mul(DD_(i) + DD_(i - 1), 12993);
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
D(i) -= fix_mul(SS_(i) + SS_(i + 1), 434);
|
D(i) -= fix_mul(SS_(i) + SS_(i + 1), 434);
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
S(i) += fix_mul(DD_(i) + DD_(i - 1), 7233);
|
S(i) += fix_mul(DD_(i) + DD_(i - 1), 7233);
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
D(i) += fix_mul(SS_(i) + SS_(i + 1), 3633);
|
D(i) += fix_mul(SS_(i) + SS_(i + 1), 3633);
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
S(i) = fix_mul(S(i), 5038); /*5038 */
|
S(i) = fix_mul(S(i), 5038); /*5038 */
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
D(i) = fix_mul(D(i), 6659); /*6660 */
|
D(i) = fix_mul(D(i), 6659); /*6660 */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* <summary> */
|
/* <summary> */
|
||||||
/* Inverse 5-3 or 9-7 wavelet tranform in 1-D. */
|
/* Inverse 5-3 or 9-7 wavelet tranform in 1-D. */
|
||||||
/* </summary> */
|
/* </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) {
|
static void dwt_decode_97(int *a, int dn, int sn, int cas) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!cas) {
|
if (!cas) {
|
||||||
if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */
|
if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
S(i) = fix_mul(S(i), 10078); /* 10076 */
|
S(i) = fix_mul(S(i), 10078); /* 10076 */
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
D(i) = fix_mul(D(i), 13318); /* 13320 */
|
D(i) = fix_mul(D(i), 13318); /* 13320 */
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
S(i) -= fix_mul(D_(i - 1) + D_(i), 3633);
|
S(i) -= fix_mul(D_(i - 1) + D_(i), 3633);
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
D(i) -= fix_mul(S_(i) + S_(i + 1), 7233);
|
D(i) -= fix_mul(S_(i) + S_(i + 1), 7233);
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
S(i) += fix_mul(D_(i - 1) + D_(i), 434);
|
S(i) += fix_mul(D_(i - 1) + D_(i), 434);
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
D(i) += fix_mul(S_(i) + S_(i + 1), 12994); /* 12993 */
|
D(i) += fix_mul(S_(i) + S_(i + 1), 12994); /* 12993 */
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ((sn > 0) || (dn > 1)) { /* NEW : CASE ONE ELEMENT */
|
if ((sn > 0) || (dn > 1)) { /* NEW : CASE ONE ELEMENT */
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
D(i) = fix_mul(D(i), 10078); /* 10076 */
|
D(i) = fix_mul(D(i), 10078); /* 10076 */
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
S(i) = fix_mul(S(i), 13318); /* 13320 */
|
S(i) = fix_mul(S(i), 13318); /* 13320 */
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
D(i) -= fix_mul(SS_(i) + SS_(i + 1), 3633);
|
D(i) -= fix_mul(SS_(i) + SS_(i + 1), 3633);
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
S(i) -= fix_mul(DD_(i) + DD_(i - 1), 7233);
|
S(i) -= fix_mul(DD_(i) + DD_(i - 1), 7233);
|
||||||
for (i = 0; i < sn; i++)
|
for (i = 0; i < sn; i++)
|
||||||
D(i) += fix_mul(SS_(i) + SS_(i + 1), 434);
|
D(i) += fix_mul(SS_(i) + SS_(i + 1), 434);
|
||||||
for (i = 0; i < dn; i++)
|
for (i = 0; i < dn; i++)
|
||||||
S(i) += fix_mul(DD_(i) + DD_(i - 1), 12994); /* 12993 */
|
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. */
|
/* Get norm of arbitrary wavelet transform. */
|
||||||
/* </summary> */
|
/* </summary> */
|
||||||
static int upandconv(double *nXPS, double *LPS, int lenXPS, int lenLPS) {
|
static int upandconv(double *nXPS, double *LPS, int lenXPS, int lenLPS) {
|
||||||
/* Perform the convolution of the vectors. */
|
/* Perform the convolution of the vectors. */
|
||||||
int i,j;
|
int i,j;
|
||||||
double *tmp = (double *)opj_malloc(2*lenXPS * sizeof(double));
|
double *tmp = (double *)opj_malloc(2*lenXPS * sizeof(double));
|
||||||
//Upsample
|
//Upsample
|
||||||
memset(tmp, 0, 2*lenXPS*sizeof(double));
|
memset(tmp, 0, 2*lenXPS*sizeof(double));
|
||||||
for (i = 0; i < lenXPS; i++) {
|
for (i = 0; i < lenXPS; i++) {
|
||||||
*(tmp + 2*i) = *(nXPS + i);
|
*(tmp + 2*i) = *(nXPS + i);
|
||||||
*(nXPS + i) = 0;
|
*(nXPS + i) = 0;
|
||||||
}
|
}
|
||||||
//Convolution
|
//Convolution
|
||||||
for (i = 0; i < 2*lenXPS; i++) {
|
for (i = 0; i < 2*lenXPS; i++) {
|
||||||
for (j = 0; j < lenLPS; j++) {
|
for (j = 0; j < lenLPS; j++) {
|
||||||
*(nXPS+i+j) = *(nXPS+i+j) + *(tmp + i) * *(LPS + 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));
|
//fprintf(stdout,"*(tmp + %d) * *(LPS + %d) = %f * %f \n",i,j,*(tmp + i),*(LPS + j));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
free(tmp);
|
free(tmp);
|
||||||
return 2*lenXPS+lenLPS-1;
|
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[4] = 0.591271763114; wtfilt->HPS[4] = 0.602949018236;
|
||||||
wtfilt->LPS[5] = -0.057543526228; wtfilt->HPS[5] = -0.266864118443;
|
wtfilt->LPS[5] = -0.057543526228; wtfilt->HPS[5] = -0.266864118443;
|
||||||
wtfilt->LPS[6] = -0.091271763114; wtfilt->HPS[6] = -0.078223266529;
|
wtfilt->LPS[6] = -0.091271763114; wtfilt->HPS[6] = -0.078223266529;
|
||||||
wtfilt->HPS[7] = 0.016864118443;
|
wtfilt->HPS[7] = 0.016864118443;
|
||||||
wtfilt->HPS[8] = 0.026748757411;
|
wtfilt->HPS[8] = 0.026748757411;
|
||||||
} else if (dwtid == 1) { //DWT 5-3
|
} else if (dwtid == 1) { //DWT 5-3
|
||||||
wtfilt->lenLPS = 3; wtfilt->lenHPS = 5;
|
wtfilt->lenLPS = 3; wtfilt->lenHPS = 5;
|
||||||
wtfilt->LPS = (double *)opj_malloc(wtfilt->lenLPS * sizeof(double));
|
wtfilt->LPS = (double *)opj_malloc(wtfilt->lenLPS * sizeof(double));
|
||||||
wtfilt->HPS = (double *)opj_malloc(wtfilt->lenHPS * sizeof(double));
|
wtfilt->HPS = (double *)opj_malloc(wtfilt->lenHPS * sizeof(double));
|
||||||
wtfilt->LPS[0] = 0.5; wtfilt->HPS[0] = -0.125;
|
wtfilt->LPS[0] = 0.5; wtfilt->HPS[0] = -0.125;
|
||||||
wtfilt->LPS[1] = 1; wtfilt->HPS[1] = -0.25;
|
wtfilt->LPS[1] = 1; wtfilt->HPS[1] = -0.25;
|
||||||
wtfilt->LPS[2] = 0.5; wtfilt->HPS[2] = 0.75;
|
wtfilt->LPS[2] = 0.5; wtfilt->HPS[2] = 0.75;
|
||||||
wtfilt->HPS[3] = -0.25;
|
wtfilt->HPS[3] = -0.25;
|
||||||
wtfilt->HPS[4] = -0.125;
|
wtfilt->HPS[4] = -0.125;
|
||||||
} else {
|
} else {
|
||||||
|
@ -683,16 +683,16 @@ void dwt_encode(opj_tcd_tilecomp_t * tilec, int dwtid[3]) {
|
||||||
|
|
||||||
a = tilec->data;
|
a = tilec->data;
|
||||||
|
|
||||||
for (x = 0, y = 0, z = 0; (x < levelx) && (y < levely); x++, y++, z++) {
|
for (x = 0, y = 0, z = 0; (x < levelx) && (y < levely); x++, y++, z++) {
|
||||||
int rw; /* width of the resolution level computed */
|
int rw; /* width of the resolution level computed */
|
||||||
int rh; /* heigth of the resolution level computed */
|
int rh; /* heigth of the resolution level computed */
|
||||||
int rd; /* depth 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 rw1; /* width of the resolution level once lower than computed one */
|
||||||
int rh1; /* height 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 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_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_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 cas_axl; /* 0 = non inversion on axial filtering 1 = inversion between low-pass and high-pass filtering */
|
||||||
int dn, sn;
|
int dn, sn;
|
||||||
|
|
||||||
rw = tilec->resolutions[level - x].x1 - tilec->resolutions[level - x].x0;
|
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_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_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;
|
cas_axl = tilec->resolutions[level - z].z0 % 2;
|
||||||
|
|
||||||
/*fprintf(stdout," x %d y %d z %d \n",x,y,z);
|
/*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," 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," 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," 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++) {
|
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++) {
|
for (j = 0; j < rw; j++) {
|
||||||
aj = cj + j;
|
aj = cj + j;
|
||||||
for (k = 0; k < rh; k++) bj[k] = aj[k*w];
|
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);
|
dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
|
||||||
}
|
}
|
||||||
} else if (dwtid[1] == 1) { /*DWT 5-3*/
|
} else if (dwtid[1] == 1) { /*DWT 5-3*/
|
||||||
for (j = 0; j < rw; j++) {
|
for (j = 0; j < rw; j++) {
|
||||||
aj = cj + j;
|
aj = cj + j;
|
||||||
for (k = 0; k < rh; k++) bj[k] = aj[k*w];
|
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);
|
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 */
|
/* General lifting framework -- DCCS-LIWT */
|
||||||
for (x = level - 1, y = level - 1, z = level - 1; (x >= stops[0]) && (y >= stops[1]); x--, y--, z--) {
|
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 rw; /* width of the resolution level computed */
|
||||||
int rh; /* heigth of the resolution level computed */
|
int rh; /* heigth of the resolution level computed */
|
||||||
int rd; /* depth 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 rw1; /* width of the resolution level once lower than computed one */
|
||||||
int rh1; /* height 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 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_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_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 cas_axl; /* 0 = non inversion on axial filtering 1 = inversion between low-pass and high-pass filtering */
|
||||||
int dn, sn;
|
int dn, sn;
|
||||||
|
|
||||||
rw = tilec->resolutions[level - x].x1 - tilec->resolutions[level - x].x0;
|
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_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_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;
|
cas_axl = tilec->resolutions[level - z].z0 % 2;
|
||||||
|
|
||||||
/*fprintf(stdout," x %d y %d z %d \n",x,y,z);
|
/*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," 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," 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," 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);*/
|
fprintf(stdout,"IDWT Transform %d %d %d %d\n",level, z, rd,rd1);*/
|
||||||
|
|
||||||
if (z >= stops[2] && rd != rd1) {
|
if (z >= stops[2] && rd != rd1) {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
|
* Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, Hervé Drolon, FreeImage Team
|
* Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, Hervé Drolon, FreeImage Team
|
* Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, Hervé Drolon, FreeImage Team
|
* Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, Hervé Drolon, FreeImage Team
|
* Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, Hervé Drolon, FreeImage Team
|
* Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
|
* Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
|
* Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
|
* 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) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, Hervé Drolon, FreeImage Team
|
* Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -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
|
* Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue