[clitk-commits-list] Clitk branch master updated. v1.2.0-687-g89a7821
root
root at tux.creatis.insa-lyon.fr
Sat Feb 4 12:16:55 CET 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Clitk".
The branch, master has been updated
via 89a782167f649e3667519233c30ec11c759c23b2 (commit)
via 1d70c4971d5dd20b399252a4ea339b7c878d9b74 (commit)
via e14bc09340c3ecb3c5370ce86b5b0afa572254be (commit)
from 4aeb9af4e4ba8f56f45f5698ae39458943282ee6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=89a782167f649e3667519233c30ec11c759c23b2
commit 89a782167f649e3667519233c30ec11c759c23b2
Merge: 1d70c49 4aeb9af
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Sat Feb 4 11:42:07 2012 +0100
Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=1d70c4971d5dd20b399252a4ea339b7c878d9b74
commit 1d70c4971d5dd20b399252a4ea339b7c878d9b74
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Fri Feb 3 18:30:06 2012 +0100
Fixed MSVC issues
diff --git a/common/clitkCoeffsToDVF.h b/common/clitkCoeffsToDVF.h
index 603ca70..911e8a9 100644
--- a/common/clitkCoeffsToDVF.h
+++ b/common/clitkCoeffsToDVF.h
@@ -59,13 +59,13 @@ namespace clitk
typedef itk::ImageRegionConstIterator<typename TransformType::CoefficientImageType> Iterator;
Iterator it (coefficientImage, coefficientImage->GetLargestPossibleRegion() );
it.GoToBegin();
- unsigned int i = 0;
+ unsigned int k = 0;
while (! it.IsAtEnd()) {
for (unsigned int j = 0; j < dim; j++)
- params[i+j]=it.Get()[j];
+ params[k+j]=it.Get()[j];
++it;
- i += dim;
+ k += dim;
}
transform->SetParameters(params);
diff --git a/itk/clitkVectorBSplineInterpolateImageFunctionWithLUT.txx b/itk/clitkVectorBSplineInterpolateImageFunctionWithLUT.txx
index 4c66a2c..7fbf9ba 100644
--- a/itk/clitkVectorBSplineInterpolateImageFunctionWithLUT.txx
+++ b/itk/clitkVectorBSplineInterpolateImageFunctionWithLUT.txx
@@ -210,7 +210,7 @@ GetSampleIndexOfPixelPosition(const ContinuousIndexType & x, IndexType & Evaluat
// Compute index in precomputed weights table
TCoefficientType t2 = mSamplingFactors[l]*t1;
- index[l] = (IndexValueType)lrint(t2);
+ index[l] = (IndexValueType)itk::Math::Floor<IndexValueType,TCoefficientType>(t2);
// For even order : test if too close to 0.5 (but lower). In this
// case : take the next coefficient
@@ -258,7 +258,7 @@ EvaluateAtContinuousIndex(const ContinuousIndexType & x) const
indx = (long)vcl_floor(x[l]) - mSplineOrders[l] / 2 ; //this->m_SplineOrder / 2;
evaluateIndex[l] = indx;
} else { // Use this index calculation for even splineOrder
- if (mSplineOrders[l] == 0) evaluateIndex[l] = (long)rint(x[l]);
+ if (mSplineOrders[l] == 0) evaluateIndex[l] = itk::Math::Round<long,ContinuousIndexType::ValueType>(x[l]);
else {
indx = (long)vcl_floor((x[l]+ 0.5)) - mSplineOrders[l] / 2; //this->m_SplineOrder / 2;
evaluateIndex[l] = indx;
@@ -358,7 +358,7 @@ EvaluateWeightsAtContinuousIndex(const ContinuousIndexType& x, const TCoeffici
indx = (long)vcl_floor(x[l]) - mSplineOrders[l] / 2 ; //this->m_SplineOrder / 2;
evaluateIndex[l] = indx;
} else { // Use this index calculation for even splineOrder
- if (mSplineOrders[l] == 0) evaluateIndex[l] = (long)rint(x[l]);
+ if (mSplineOrders[l] == 0) evaluateIndex[l] = itk::Math::Round<long,ContinuousIndexType::ValueType>(x[l]);
else {
indx = (long)vcl_floor((x[l]+ 0.5)) - mSplineOrders[l] / 2; //this->m_SplineOrder / 2;
evaluateIndex[l] = indx;
diff --git a/tools/clitkCoeffsToDVF.cxx b/tools/clitkCoeffsToDVF.cxx
index 266f8ae..f92d03a 100644
--- a/tools/clitkCoeffsToDVF.cxx
+++ b/tools/clitkCoeffsToDVF.cxx
@@ -21,7 +21,7 @@ int main(int argc, char** argv)
GGO(clitkCoeffsToDVF, args_info);
CLITK_INIT;
- typename itk::ImageIOBase::Pointer image_io = itk::ImageIOFactory::CreateImageIO(args_info.input_arg, itk::ImageIOFactory::ReadMode);
+ itk::ImageIOBase::Pointer image_io = itk::ImageIOFactory::CreateImageIO(args_info.input_arg, itk::ImageIOFactory::ReadMode);
image_io->SetFileName(args_info.input_arg);
image_io->ReadImageInformation();
@@ -32,7 +32,7 @@ int main(int argc, char** argv)
unsigned const dim = 2;
typedef itk::Vector<double, dim> PixelType;
typedef itk::Image<PixelType, dim> DVFType;
- typename DVFType::Pointer dvf = clitk::BLUTCoeffsToDVF<DVFType>(args_info.input_arg, args_info.like_arg);
+ DVFType::Pointer dvf = clitk::BLUTCoeffsToDVF<DVFType>(args_info.input_arg, args_info.like_arg);
Write<DVFType>(dvf, args_info.output_arg);
}
break;
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
unsigned const dim = 3;
typedef itk::Vector<double, dim> PixelType;
typedef itk::Image<PixelType, dim> DVFType;
- typename DVFType::Pointer dvf = clitk::BLUTCoeffsToDVF<DVFType>(args_info.input_arg, args_info.like_arg);
+ DVFType::Pointer dvf = clitk::BLUTCoeffsToDVF<DVFType>(args_info.input_arg, args_info.like_arg);
Write<DVFType>(dvf, args_info.output_arg);
}
break;
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=e14bc09340c3ecb3c5370ce86b5b0afa572254be
commit e14bc09340c3ecb3c5370ce86b5b0afa572254be
Author: Simon Rit <simon.rit at creatis.insa-lyon.fr>
Date: Fri Feb 3 18:14:34 2012 +0100
Fixed issue when the package is called from another directory
diff --git a/cmake/FindGengetopt.cmake b/cmake/FindGengetopt.cmake
index aecb1fc..8d7380e 100644
--- a/cmake/FindGengetopt.cmake
+++ b/cmake/FindGengetopt.cmake
@@ -2,7 +2,7 @@
# Attempt to find gengetopt. If not found, compile it.
FIND_PROGRAM(GENGETOPT gengetopt)
IF (GENGETOPT STREQUAL "GENGETOPT-NOTFOUND")
- ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmake/gengetopt)
+ ADD_SUBDIRECTORY(${CMAKE_CURRENT_LIST_DIR}/gengetopt ${CMAKE_CURRENT_BINARY_DIR}/gengetopt)
ELSE(GENGETOPT STREQUAL "GENGETOPT-NOTFOUND")
ADD_EXECUTABLE(gengetopt IMPORTED)
SET_PROPERTY(TARGET gengetopt PROPERTY IMPORTED_LOCATION ${GENGETOPT})
-----------------------------------------------------------------------
Summary of changes:
cmake/FindGengetopt.cmake | 2 +-
common/clitkCoeffsToDVF.h | 6 +++---
...ectorBSplineInterpolateImageFunctionWithLUT.txx | 6 +++---
tools/clitkCoeffsToDVF.cxx | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
Clitk
More information about the Clitk-commits-list
mailing list