diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-01-14 03:02:32 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-01-14 03:02:32 +0000 |
| commit | f1fd8f35257f39e1681d68d7d2dc381ef58643c3 (patch) | |
| tree | 5a96102453c3ac8141714f13595eee42570ad763 | |
| parent | 8fc48001c51dda6dea811bafe51d327786a6dca6 (diff) | |
| download | netpbm-mirror-f1fd8f35257f39e1681d68d7d2dc381ef58643c3.tar.gz netpbm-mirror-f1fd8f35257f39e1681d68d7d2dc381ef58643c3.tar.xz netpbm-mirror-f1fd8f35257f39e1681d68d7d2dc381ef58643c3.zip | |
Release 10.47.35
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1629 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | analyzer/pgmtexture.c | 7 | ||||
| -rw-r--r-- | doc/HISTORY | 9 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/analyzer/pgmtexture.c b/analyzer/pgmtexture.c index 9fb80950..6a9f5a4f 100644 --- a/analyzer/pgmtexture.c +++ b/analyzer/pgmtexture.c @@ -542,7 +542,7 @@ f5_idm (float **P, int Ng) } static float -Pxpy[2 * PGM_MAXMAXVAL]; +Pxpy[2 * (PGM_MAXMAXVAL+1) + 1]; static float f6_savg (float **P, int Ng) @@ -627,8 +627,9 @@ f10_dvar (float **P, int Ng) /* Difference Variance */ { - int i, j, tmp; - float sum = 0, sum_sqr = 0, var = 0; + int i, j; + double tmp; + double sum = 0, sum_sqr = 0, var = 0; for (i = 0; i <= 2 * Ng; ++i) Pxpy[i] = 0; diff --git a/doc/HISTORY b/doc/HISTORY index 7ce67faa..4d3e548a 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +12.01.14 BJH Release 10.47.35 + + pgmtexture: fix integer overflow in difference variance. + Always broken. + + pgmtexture: fix array bounds violations in various calculations. + Always broken. + 11.12.12 BJH Release 10.47.34 pamscale: fix all black output with resampling. Always broken. @@ -24,7 +32,6 @@ CHANGE HISTORY pnmtops: fix message: says "from top edge" where it means "from bottom edge." -11.09.28 BJH Release 10.56.00 11.08.22 BJH Release 10.47.30 diff --git a/version.mk b/version.mk index 36ad73c6..637d32b6 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 34 +NETPBM_POINT_RELEASE = 35 |