diff --git a/Utilities/ITK/Code/Patented/CMakeLists.txt b/Utilities/ITK/Code/Patented/CMakeLists.txt
index aafd2bb34c6e057ca240887be4c7a8fd71b8da43..5bd4250570ff34b7c3e89f56e1b42a7f5cf1cdcb 100644
--- a/Utilities/ITK/Code/Patented/CMakeLists.txt
+++ b/Utilities/ITK/Code/Patented/CMakeLists.txt
@@ -1 +1 @@
-INSTALL_FILES(/include/otb/Utilities/ITK/Patented "(\\.h|\\.txx)$")
+INSTALL_FILES(/include/InsightToolkit/Patented "(\\.h|\\.txx)$")
diff --git a/Utilities/ITK/Code/Patented/itkActiveShapeModelCalculator.txx b/Utilities/ITK/Code/Patented/itkActiveShapeModelCalculator.txx
index 63bac233a6cb10b2d0c9774cbd4546760df39ace..acfb184f7234bf5e74f5e0feb4041153b5d93502 100644
--- a/Utilities/ITK/Code/Patented/itkActiveShapeModelCalculator.txx
+++ b/Utilities/ITK/Code/Patented/itkActiveShapeModelCalculator.txx
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkActiveShapeModelCalculator.txx,v $
Language: C++
- Date: $Date: 2004/10/18 21:28:47 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2006/03/19 04:37:20 $
+ Version: $Revision: 1.3 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -495,8 +495,8 @@ ActiveShapeModelCalculator<TImage>
dx = dxyRef2[ 1 ] - dxyRef1[ 1 ];
dy = dxyRef1[ 0 ] - dxyRef2[ 0 ];
- ax = abs(dx) * 2;
- ay = abs(dy) * 2;
+ ax = vcl_abs(dx) * 2;
+ ay = vcl_abs(dy) * 2;
if (dx < 0) sx = -1; else sx = 1;
if (dy < 0) sy = -1; else sy = 1;
count = 1;
diff --git a/Utilities/ITK/Code/Patented/itkActiveShapeModelGradientSearchMethod.txx b/Utilities/ITK/Code/Patented/itkActiveShapeModelGradientSearchMethod.txx
index 78f1927d40cc34e6b86760c03280be03d0bc5405..f62a55d9d63a33c0c0d7b486388bbdae0d56ba28 100644
--- a/Utilities/ITK/Code/Patented/itkActiveShapeModelGradientSearchMethod.txx
+++ b/Utilities/ITK/Code/Patented/itkActiveShapeModelGradientSearchMethod.txx
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkActiveShapeModelGradientSearchMethod.txx,v $
Language: C++
- Date: $Date: 2004/10/09 01:46:37 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2006/03/19 04:37:20 $
+ Version: $Revision: 1.2 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -154,8 +154,8 @@ ActiveShapeModelGradientSearchMethod<TImage>
dx = dxyRef2[ 1 ] - dxyRef1[ 1 ];
dy = dxyRef1[ 0 ] - dxyRef2[ 0 ];
- ax = abs(dx) * 2;
- ay = abs(dy) * 2;
+ ax = vcl_abs(dx) * 2;
+ ay = vcl_abs(dy) * 2;
if (dx < 0) sx = -1; else sx = 1;
if (dy < 0) sy = -1; else sy = 1;
unsigned int count = 0;
@@ -247,14 +247,14 @@ ActiveShapeModelGradientSearchMethod<TImage>
for(unsigned int j = 0; j < numberOfEigenValues; j++)
{
- m_Blimit[j] = 2 * sqrt(m_EigenValues[j]);
+ m_Blimit[j] = 2 * vcl_sqrt(m_EigenValues[j]);
}
for(unsigned int j = 0; j < numberOfEigenValues; j++)
{
if(fabs(m_Db[j]) > m_Blimit[j])
{
- m_Db[j] = ( m_Db[j] / fabs(m_Db[j]) ) * m_Blimit[j];
+ m_Db[j] = ( m_Db[j] / vcl_fabs(m_Db[j]) ) * m_Blimit[j];
}
}
diff --git a/Utilities/ITK/Code/Patented/itkSimpleFuzzyConnectednessRGBImageFilter.txx b/Utilities/ITK/Code/Patented/itkSimpleFuzzyConnectednessRGBImageFilter.txx
index 200d606816d4520d9c115540445f052c42b66326..ed8e9f9bab6a0ef93ef58d17a1898d9708494a29 100644
--- a/Utilities/ITK/Code/Patented/itkSimpleFuzzyConnectednessRGBImageFilter.txx
+++ b/Utilities/ITK/Code/Patented/itkSimpleFuzzyConnectednessRGBImageFilter.txx
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkSimpleFuzzyConnectednessRGBImageFilter.txx,v $
Language: C++
- Date: $Date: 2004/12/28 15:04:19 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2006/03/19 04:37:20 $
+ Version: $Revision: 1.3 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -95,8 +95,8 @@ SimpleFuzzyConnectednessRGBImageFilter<TInputImage,TOutputImage>
+ s02*(m_Diff_VarianceInverse[0][2]+m_Diff_VarianceInverse[2][0])
+ s12*(m_Diff_VarianceInverse[1][2]+m_Diff_VarianceInverse[2][1]);
- return( (NumericTraits<unsigned short>::max())*(this->GetWeight()*exp(-0.5*tmp1)
- +(1-this->GetWeight())*exp(-0.5*tmp3)) );
+ return( (NumericTraits<unsigned short>::max())*(this->GetWeight()*vcl_exp(-0.5*tmp1)
+ +(1-this->GetWeight())*vcl_exp(-0.5*tmp3)) );
}
}
diff --git a/Utilities/ITK/Code/Patented/itkSimpleFuzzyConnectednessScalarImageFilter.txx b/Utilities/ITK/Code/Patented/itkSimpleFuzzyConnectednessScalarImageFilter.txx
index 4a91e26e7764a8187fa3fac1c14f4522e79dae7a..8d6cbf45d739d9e91788552a3525b9d7de0bce2e 100644
--- a/Utilities/ITK/Code/Patented/itkSimpleFuzzyConnectednessScalarImageFilter.txx
+++ b/Utilities/ITK/Code/Patented/itkSimpleFuzzyConnectednessScalarImageFilter.txx
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkSimpleFuzzyConnectednessScalarImageFilter.txx,v $
Language: C++
- Date: $Date: 2004/12/28 15:04:19 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2006/03/19 04:37:20 $
+ Version: $Revision: 1.3 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -80,10 +80,10 @@ SimpleFuzzyConnectednessScalarImageFilter<TInputImage,TOutputImage>
(exp(-0.5 * tmp1 * tmp1 / m_Variance)));
}
else{
- double tmp2 = fabs(static_cast<double>(f1) - static_cast<double>(f2)) - m_Diff_Mean;
+ double tmp2 = vcl_fabs(static_cast<double>(f1) - static_cast<double>(f2)) - m_Diff_Mean;
return( (NumericTraits<unsigned short>::max()) *
- (this->GetWeight() * exp(-0.5 * tmp1 * tmp1 / m_Variance) +
- (1 - this->GetWeight()) * exp(-0.5 * tmp2 * tmp2 / m_Diff_Variance)));
+ (this->GetWeight() * vcl_exp(-0.5 * tmp1 * tmp1 / m_Variance) +
+ (1 - this->GetWeight()) * vcl_exp(-0.5 * tmp2 * tmp2 / m_Diff_Variance)));
}
}
diff --git a/Utilities/ITK/Code/Patented/itkVectorFuzzyConnectednessImageFilter.txx b/Utilities/ITK/Code/Patented/itkVectorFuzzyConnectednessImageFilter.txx
index f22bb681d057de0f8a0c7548b40a521813d30cc7..c20f8bb302d9bc84a0c1bb55dd8193b28ef499d4 100644
--- a/Utilities/ITK/Code/Patented/itkVectorFuzzyConnectednessImageFilter.txx
+++ b/Utilities/ITK/Code/Patented/itkVectorFuzzyConnectednessImageFilter.txx
@@ -3,8 +3,8 @@
Program: Insight Segmentation & Registration Toolkit
Module: $RCSfile: itkVectorFuzzyConnectednessImageFilter.txx,v $
Language: C++
- Date: $Date: 2005/04/30 17:02:04 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2006/03/19 04:37:20 $
+ Version: $Revision: 1.5 $
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
@@ -175,7 +175,7 @@ VectorFuzzyConnectednessImageFilter<TInputImage,TOutputImage>
{
if (ppptti1[tti1 + i][tti1 + j] == 0)
{
- tt1 = sqrt(pow(((double) i) * anisotropy_row,2.0) + pow(((double) j) * anisotropy_col, 2.0));
+ tt1 = vcl_sqrt(pow(((double) i) * anisotropy_row,2.0) + vcl_pow(((double) j) * anisotropy_col, 2.0));
if (tt1 <= ((double) k) + 0.5)
{
m_CirclePointsNum[k] = m_CirclePointsNum[k] + 1;
@@ -315,8 +315,8 @@ VectorFuzzyConnectednessImageFilter<TInputImage,TOutputImage>
{
result = result + sum_vector[xx]*value1[xx];
}
- count_obj = count_obj + exp(-0.5*result/9.0);
- count_nonobj = count_nonobj + 1.0 - exp(-0.5*result/9.0);
+ count_obj = count_obj + vcl_exp(-0.5*result/9.0);
+ count_nonobj = count_nonobj + 1.0 - vcl_exp(-0.5*result/9.0);
}
if (100.0 * count_nonobj >= Tolerance * (count_nonobj + count_obj))
@@ -370,10 +370,10 @@ VectorFuzzyConnectednessImageFilter<TInputImage,TOutputImage>
for(i = 1;i<=MAX_SCALE;i++)
{
tt1 = (double)i*0.5;
- tt2 = -0.5 / pow(tt1, 2.0);
+ tt2 = -0.5 / vcl_pow(tt1, 2.0);
for(j = 0;j<i;j++)
{
- inv_k = exp(tt2 * pow((double)j, 2.0));
+ inv_k = vcl_exp(tt2 * vcl_pow((double)j, 2.0));
weight[i-1][j] = inv_k;
}
}
@@ -461,7 +461,7 @@ VectorFuzzyConnectednessImageFilter<TInputImage,TOutputImage>
{
result = result + temp_vector[i]*(double)temp[i];
}
- homo_affinity = exp(-0.5*result);
+ homo_affinity = vcl_exp(-0.5*result);
/* Object feature-based affinity */
/* first voxel */
@@ -483,7 +483,7 @@ VectorFuzzyConnectednessImageFilter<TInputImage,TOutputImage>
{
result = result + temp_vector[i]*(double)temp[i];
}
- object_affinity1 = exp(-0.5*result);
+ object_affinity1 = vcl_exp(-0.5*result);
/* second voxel */
@@ -505,7 +505,7 @@ VectorFuzzyConnectednessImageFilter<TInputImage,TOutputImage>
{
result = result + temp_vector[i]*(double)temp[i];
}
- object_affinity2 = exp(-0.5*result);
+ object_affinity2 = vcl_exp(-0.5*result);
/* minimum one between them */
if(object_affinity1>object_affinity2)
@@ -513,7 +513,7 @@ VectorFuzzyConnectednessImageFilter<TInputImage,TOutputImage>
else
{material = object_affinity1;}
- result = sqrt(homo_affinity*material);
+ result = vcl_sqrt(homo_affinity*material);
return (result);
}