diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-06-26 01:59:03 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-06-26 01:59:03 +0000 |
| commit | e3dc2cbef260dd0200337f1196253afa66487665 (patch) | |
| tree | 05584d7ea991b475dc5ee9a44202010ef897ca96 | |
| parent | 70f64bdbccedbd86d83a97a000f2226abb6bf82e (diff) | |
| download | netpbm-mirror-e3dc2cbef260dd0200337f1196253afa66487665.tar.gz netpbm-mirror-e3dc2cbef260dd0200337f1196253afa66487665.tar.xz netpbm-mirror-e3dc2cbef260dd0200337f1196253afa66487665.zip | |
release 10.35.28
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@328 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rw-r--r-- | converter/other/fitstopnm.c | 1 | ||||
| -rw-r--r-- | converter/other/pamtofits.c | 4 | ||||
| -rw-r--r-- | doc/HISTORY | 10 | ||||
| -rw-r--r-- | lib/pam.h | 7 |
5 files changed, 19 insertions, 5 deletions
diff --git a/Makefile.version b/Makefile.version index 6b9dc6c6..1cade288 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 27 +NETPBM_POINT_RELEASE = 28 diff --git a/converter/other/fitstopnm.c b/converter/other/fitstopnm.c index 796ca489..b143882b 100644 --- a/converter/other/fitstopnm.c +++ b/converter/other/fitstopnm.c @@ -418,6 +418,7 @@ read_val (fp, bitpix, vp) else lval = c[0]<<24 | c[1]<<16 | c[2]<<8 | c[3]; *vp = lval; + break; case -32: for (i=0; i<4; i++) { diff --git a/converter/other/pamtofits.c b/converter/other/pamtofits.c index d0552a5c..ec271ff3 100644 --- a/converter/other/pamtofits.c +++ b/converter/other/pamtofits.c @@ -32,8 +32,8 @@ struct cmdlineInfo { const char * inputFileName; unsigned int maxSpec; - double max; - double min; + float max; + float min; }; diff --git a/doc/HISTORY b/doc/HISTORY index 54263b9a..f38154ed 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +07.06.25 BJH Release 10.35.28 + + fitstopnm: fix BITPIX = -32. + + pamtofits: fix -min, -max. + + PAM_STRUCT_SIZE: cast pointer to ulong instead of uint. + 07.05.20 BJH Release 10.35.27 pamthreshold: fix totally bogus threshold selection with @@ -429,7 +437,7 @@ CHANGE HISTORY ppmglobe: fix bug: always says stripcount is zero because it looks at the wrong argument. Thanks Urs Enke - <urs.enke@rwth-aachen.de>. + <urs.enke@web.de>. pnmtotiffcmyk: Fix inttypes conflict on AIX. diff --git a/lib/pam.h b/lib/pam.h index 97d5b3cb..3bad05e8 100644 --- a/lib/pam.h +++ b/lib/pam.h @@ -116,8 +116,13 @@ struct pam { member named x. This is useful in conjunction with the 'len' value to determine which fields are present in the structure. */ + +/* Some compilers are really vigilant and recognize it as an error + to cast a 64 bit address to a 32 bit type. Hence the roundabout + casting in PAM_MEMBER_OFFSET. +*/ #define PAM_MEMBER_OFFSET(mbrname) \ - ((unsigned int)(char*)&((struct pam *)0)->mbrname) + ((size_t)(unsigned long)(char*)&((struct pam *)0)->mbrname) #define PAM_MEMBER_SIZE(mbrname) \ sizeof(((struct pam *)0)->mbrname) #define PAM_STRUCT_SIZE(mbrname) \ |