diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-09-30 15:29:05 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-09-30 15:29:05 +0000 |
| commit | 58de3a53d11a726750e3722701f3f67d711ae3c5 (patch) | |
| tree | c6fa0a3d281bb5f03ffadad41e8bda7d9d6205c2 | |
| parent | 74e9f65431bf11763a11d1fca9f7f94cade9d99f (diff) | |
| download | netpbm-mirror-58de3a53d11a726750e3722701f3f67d711ae3c5.tar.gz netpbm-mirror-58de3a53d11a726750e3722701f3f67d711ae3c5.tar.xz netpbm-mirror-58de3a53d11a726750e3722701f3f67d711ae3c5.zip | |
Release 10.47.20
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1326 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/ppm/ppmtompeg/param.c | 10 | ||||
| -rw-r--r-- | doc/HISTORY | 7 | ||||
| -rw-r--r-- | lib/util/floatcode.h | 4 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/converter/ppm/ppmtompeg/param.c b/converter/ppm/ppmtompeg/param.c index bb5bc79a..a145d33c 100644 --- a/converter/ppm/ppmtompeg/param.c +++ b/converter/ppm/ppmtompeg/param.c @@ -283,8 +283,8 @@ GetFrameRate(const char * const p) static void -mergeInputSource(struct inputSource * const baseSourceP, - struct inputSource * const addedSourceP) { +mergeInputSource(struct inputSource * const baseSourceP, + const struct inputSource * const addedSourceP) { unsigned int i; @@ -294,12 +294,6 @@ mergeInputSource(struct inputSource * const baseSourceP, for (i = 0; i < addedSourceP->numInputFileEntries; ++i) baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] = addedSourceP->inputFileEntries[i]; - - free(addedSourceP); - /* Note the space allocated for the *addedSourceP input file - entries themselves is still allocated, and used by - *baseSourceP. - */ } diff --git a/doc/HISTORY b/doc/HISTORY index 4cfbe41e..234a9b3f 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,13 @@ Netpbm. CHANGE HISTORY -------------- +10.09.30 BJH Release 10.47.20 + + pm_floatFromBigendFloat, pm_doubleFromBigendFloat, fitstopnm: + fix corrupted output. Broken in 10.46. + + ppmtompeg: fix crash with free of unallocated memory. + 10.08.28 BJH Release 10.47.19 Build: don't expect snprintf() to exist. diff --git a/lib/util/floatcode.h b/lib/util/floatcode.h index 99aec256..23c57e9b 100644 --- a/lib/util/floatcode.h +++ b/lib/util/floatcode.h @@ -25,7 +25,7 @@ typedef struct { static __inline__ float pm_floatFromBigendFloat(pm_bigendFloat const arg) { - uint32_t retval; + float retval; switch (pm_byteOrder) { case BIG_ENDIAN: { @@ -109,7 +109,7 @@ typedef struct { static __inline__ double pm_doubleFromBigendDouble(pm_bigendDouble const arg) { - uint32_t retval; + double retval; switch (pm_byteOrder) { case BIG_ENDIAN: { diff --git a/version.mk b/version.mk index 11f549d3..efff5f45 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 19 +NETPBM_POINT_RELEASE = 20 |