diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-01-15 17:04:46 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-01-15 17:04:46 +0000 |
| commit | 0e3537400827bbe63e6b49968ab4c959dbad145d (patch) | |
| tree | d88ad87c1f24b053168111604c9df5339f069d1f | |
| parent | 9deaf47f30991c299239a5d3b53be3003cba5517 (diff) | |
| download | netpbm-mirror-0e3537400827bbe63e6b49968ab4c959dbad145d.tar.gz netpbm-mirror-0e3537400827bbe63e6b49968ab4c959dbad145d.tar.xz netpbm-mirror-0e3537400827bbe63e6b49968ab4c959dbad145d.zip | |
Release 10.35.37
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@563 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rw-r--r-- | converter/other/pamtosvg/pamtosvg.c | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 6 | ||||
| -rw-r--r-- | lib/util/wordaccess_64_le.h | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.version b/Makefile.version index 5f05dafe..e637c554 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 36 +NETPBM_POINT_RELEASE = 37 diff --git a/converter/other/pamtosvg/pamtosvg.c b/converter/other/pamtosvg/pamtosvg.c index 31597a4a..84d67948 100644 --- a/converter/other/pamtosvg/pamtosvg.c +++ b/converter/other/pamtosvg/pamtosvg.c @@ -27,7 +27,7 @@ readImageToBitmap(FILE * const ifP, at_bitmap_type * bitmapP; struct pam pam; tuple ** tuples; - uint row; + unsigned int row; tuple * row255; MALLOCVAR_NOFAIL(bitmapP); diff --git a/doc/HISTORY b/doc/HISTORY index a956e3b3..1247e811 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -3,6 +3,12 @@ Netpbm. CHANGE HISTORY -------------- +08.01.15 BJH Release 10.35.37 + + Fix fast endianness stuff for 64 bit LE; bypass a compiler + bug that causes compile failure. + + Build: remove use of "uint" type in pamtosvg. 07.12.27 BJH Release 10.35.36 diff --git a/lib/util/wordaccess_64_le.h b/lib/util/wordaccess_64_le.h index 2343b6d4..4bb52b2e 100644 --- a/lib/util/wordaccess_64_le.h +++ b/lib/util/wordaccess_64_le.h @@ -44,7 +44,7 @@ wordintClz(wordint const x){ /* Find the data type closest to 64 bits, and file off any extra. */ else if ((s=sizeof(long int)) >= 8) - return (__builtin_clzl((int)x << (s - 8) * 8)); + return (__builtin_clzl((long int)x << (s - 8) * 8)); else if ((s=sizeof(long long int)) >= 8) return (__builtin_clzll((long long int)x << (s - 8) * 8)); else |