diff -ur CCfits.old/ExtHDUT.h CCfits/ExtHDUT.h
--- CCfits.old/ExtHDUT.h 2006-02-16 11:36:03.000000000 +0100
+++ CCfits/ExtHDUT.h 2006-02-16 11:35:31.000000000 +0100
@@ -145,7 +145,8 @@
long firstElement(0);
long dimSize(1);
std::vector<long> inputDimensions(naxis(),1);
- size_t n(std::min(naxis(),first.size()));
+ size_t sNaxis = static_cast<size_t>(naxis());
+ size_t n(std::min(sNaxis,first.size()));
std::copy(&first[0],&first[n],&inputDimensions[0]);
for (long i = 0; i < naxis(); ++i)
{
diff -ur CCfits.old/PHDUT.h CCfits/PHDUT.h
--- CCfits.old/PHDUT.h 2006-02-16 11:36:03.000000000 +0100
+++ CCfits/PHDUT.h 2006-02-16 11:35:31.000000000 +0100
@@ -141,7 +141,8 @@
long firstElement(0);
long dimSize(1);
std::vector<long> inputDimensions(naxis(),1);
- size_t n(std::min(naxis(),first.size()));
+ size_t sNaxis = static_cast<size_t>(naxis());
+ size_t n(std::min(sNaxis,first.size()));
std::copy(&first[0],&first[n],&inputDimensions[0]);
for (long i = 0; i < naxis(); ++i)
{
@@ -553,7 +554,7 @@
try
{
PrimaryHDU<S>& image = dynamic_cast<PrimaryHDU<S>&>(*this);
- image.writeImage(firstVertex,lastVertex,stride,data);
+ image.writeImage(firstVertex,lastVertex,data);
}
catch (std::bad_cast)
{
@@ -565,7 +566,7 @@
size_t n(data.size());
std::valarray<float> __tmp(n);
for (size_t j= 0; j < n; ++j) __tmp[j] = data[j];
- phdu.writeImage(firstVertex,lastVertex,stride,__tmp);
+ phdu.writeImage(firstVertex,lastVertex,__tmp);
}
else if (bitpix() == Idouble)
@@ -575,7 +576,7 @@
size_t n(data.size());
std::valarray<double> __tmp(n);
for (size_t j= 0; j < n; ++j) __tmp[j] = data[j];
- phdu.writeImage(firstVertex,lastVertex,stride,__tmp);
+ phdu.writeImage(firstVertex,lastVertex,__tmp);
}
else if (bitpix() == Ibyte)
{
@@ -584,7 +585,7 @@
size_t n(data.size());
std::valarray<unsigned char> __tmp(n);
for (size_t j= 0; j < n; ++j) __tmp[j] = data[j];
- phdu.writeImage(firstVertex,lastVertex,stride,__tmp);
+ phdu.writeImage(firstVertex,lastVertex,__tmp);
}
else if (bitpix() == Ilong)
{
@@ -595,7 +596,7 @@
size_t n(data.size());
std::valarray<unsigned long> __tmp(n);
for (size_t j= 0; j < n; ++j) __tmp[j] = data[j];
- phdu.writeImage(firstVertex,lastVertex,stride,__tmp);
+ phdu.writeImage(firstVertex,lastVertex,__tmp);
}
else
@@ -605,7 +606,7 @@
size_t n(data.size());
std::valarray<long> __tmp(n);
for (size_t j= 0; j < n; ++j) __tmp[j] = data[j];
- phdu.writeImage(firstVertex,lastVertex,stride,__tmp);
+ phdu.writeImage(firstVertex,lastVertex,__tmp);
}
}
else if (bitpix() == Ishort)
@@ -617,7 +618,7 @@
size_t n(data.size());
std::valarray<unsigned short> __tmp(n);
for (size_t j= 0; j < n; ++j) __tmp[j] = data[j];
- phdu.writeImage(firstVertex,lastVertex,stride,__tmp);
+ phdu.writeImage(firstVertex,lastVertex,__tmp);
}
else
@@ -627,7 +628,7 @@
size_t n(data.size());
std::valarray<short> __tmp(n);
for (size_t j= 0; j < n; ++j) __tmp[j] = data[j];
- phdu.writeImage(firstVertex,lastVertex,stride,__tmp);
+ phdu.writeImage(firstVertex,lastVertex,__tmp);
}
}
else