fixed a bug in t1_getwmsedec (stepsize was divided by 8192)

diff --git a/ChangeLog b/ChangeLog
index ea48d5da9183749936f6ce85412346aa4aaf3d7e..b067d470858e37d43c6b3b8fd4d48f0bc91219b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,4 +5,7 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
-December 5, 2005 - 1.0.0
+December 8, 2005 - 1.1.1
+* [Antonin Descampe] fixed a bug in t1_getwmsedec (stepsize was divided by 8192)
+
+December 5, 2005 - 1.1.0

diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c
index 6a7810aa58e5884a16dcb6a0c837632fc54b7571..feb1f73467b84760ab2adea1d4293f0c506bd959 100644 (file)
--- a/libopenjpeg/t1.c
+++ b/libopenjpeg/t1.c
@@ -511,7 +511,7 @@ static double t1_getwmsedec(int nmsedec, int compno, int level, int orient, int
                w1 = (numcomps > 1) ? mct_getnorm_real(compno) : 1;
                w2 = dwt_getnorm_real(level, orient);
        }
-       wmsedec = w1 * w2 * (stepsize / 8192.0) * (1 << bpno);
+       wmsedec = w1 * w2 * stepsize * (1 << bpno);
        wmsedec *= wmsedec * nmsedec / 8192.0;
        
        return wmsedec;