...
 
Commits (3)
casacore (3.0.0-2) experimental; urgency=medium
* Fix compile error in LatticeApply in 32 bit platforms
* Fix another kfreebsd64 problem
-- Ole Streicher <olebole@debian.org> Wed, 21 Nov 2018 13:56:28 +0100
casacore (3.0.0-1) experimental; urgency=medium
* New upstream version 3.0.0 Rediff patches
......
......@@ -3,9 +3,23 @@ Date: Sun, 27 Nov 2016 15:26:25 +0100
Subject: Enable hostinfo for kFreeBSD
---
casa/aipsenv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
casa/BasicMath/Math.h | 2 +-
casa/aipsenv.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/casa/BasicMath/Math.h b/casa/BasicMath/Math.h
index 3af2fa5..06e4552 100644
--- a/casa/BasicMath/Math.h
+++ b/casa/BasicMath/Math.h
@@ -179,7 +179,7 @@ inline Float min(Float a, Float b) { if (a > b) return b; else return a; }
// for integers in <src><stdlib.h></src>. Define it for uInts so that certain
// compilers can resolve the ambiguity when used in a templated class.
// <group>
-#if defined(AIPS_BSD)
+#if defined(__FreeBSD_kernel__)
inline Int64 abs(Int64 Val) {return Val;}
#else
inline uInt abs(uInt Val) {return Val;}
diff --git a/casa/aipsenv.h b/casa/aipsenv.h
index 64139ec..8cd6ac0 100644
--- a/casa/aipsenv.h
......
From: Ger van Diepen <diepen@astron.nl>
Date: Wed, 21 Nov 2018 10:15:17 +0000
Subject: Fixed compile error in LatticeApply
---
lattices/LatticeMath/LatticeApply.tcc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lattices/LatticeMath/LatticeApply.tcc b/lattices/LatticeMath/LatticeApply.tcc
index 675d31e..19b3221 100644
--- a/lattices/LatticeMath/LatticeApply.tcc
+++ b/lattices/LatticeMath/LatticeApply.tcc
@@ -355,10 +355,10 @@ IPosition LatticeApply<T,U>::_chunkShape(
// can only go row by row
return chunkShape;
}
- uInt x = maxChunkSize;
+ ssize_t x = maxChunkSize;
for (uInt i=0; i<ndim; ++i) {
if (i != axis) {
- chunkShape[i] = min(x, latShape[i]);
+ chunkShape[i] = std::min(x, latShape[i]);
// integer division
x /= chunkShape[i];
if (x == 0) {
......@@ -8,3 +8,4 @@ Enable-hostinfo-for-kFreeBSD.patch
Fix-compilation-for-GNU-Hurd.patch
Add-support-for-python3.6.patch
new-boost-python-soname.patch
Fixed-compile-error-in-LatticeApply.patch