...
 
Commits (2)
casacore (3.0.0-3) experimental; urgency=medium
* Fix another compile error in LatticeMath on 32 bit platforms
-- Ole Streicher <olebole@debian.org> Thu, 22 Nov 2018 08:13:35 +0100
casacore (3.0.0-2) experimental; urgency=medium
* Fix compile error in LatticeApply in 32 bit platforms
......
From: Ger van Diepen <diepen@astron.nl>
Date: Wed, 21 Nov 2018 10:15:17 +0000
Subject: Fixed compile error in LatticeApply
Subject: Fixed compile error in LatticeMath
---
lattices/LatticeMath/LatticeApply.tcc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
lattices/LatticeMath/LatticeApply.tcc | 4 ++--
lattices/LatticeMath/LatticeStatistics.tcc | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lattices/LatticeMath/LatticeApply.tcc b/lattices/LatticeMath/LatticeApply.tcc
index 675d31e..19b3221 100644
......@@ -23,3 +24,20 @@ index 675d31e..19b3221 100644
// integer division
x /= chunkShape[i];
if (x == 0) {
diff --git a/lattices/LatticeMath/LatticeStatistics.tcc b/lattices/LatticeMath/LatticeStatistics.tcc
index 7609415..9943c2c 100644
--- a/lattices/LatticeMath/LatticeStatistics.tcc
+++ b/lattices/LatticeMath/LatticeStatistics.tcc
@@ -1067,10 +1067,10 @@ IPosition LatticeStatistics<T>::_cursorShapeForArrayMethod(uInt setSize) const {
uInt curAx = cursorAxes_p[i];
cursorShape[curAx] = latShape[curAx];
}
- uInt x = nIterToAccum;
+ ssize_t x = nIterToAccum;
uInt nDisplayAxes = displayAxes_p.size();
for (uInt i=0; i<nDisplayAxes; ++i) {
- cursorShape[displayAxes_p[i]] = min(x, latShape[displayAxes_p[i]]);
+ cursorShape[displayAxes_p[i]] = std::min(x, latShape[displayAxes_p[i]]);
x /= cursorShape[displayAxes_p[i]];
if (x == 0) {
break;
......@@ -8,4 +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
Fixed-compile-error-in-LatticeMath.patch