From 36edd38742fe1ef726a30fd8d07583bb624f3c41 Mon Sep 17 00:00:00 2001
From: Sebastien Dinot <sebastien.dinot@c-s.fr>
Date: Wed, 27 Oct 2010 15:39:05 +0200
Subject: [PATCH] Inaccurate copyright removed.
---
Code/Radiometry/otbSarParametricMapFunction.h | 14 +++++-----
.../otbSarParametricMapFunction.txx | 27 +++++++++----------
.../otbSarRadiometricCalibrationFunction.h | 10 +++----
.../otbSarRadiometricCalibrationFunction.txx | 7 ++---
4 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/Code/Radiometry/otbSarParametricMapFunction.h b/Code/Radiometry/otbSarParametricMapFunction.h
index 3bdaaf4a27..501d329273 100644
--- a/Code/Radiometry/otbSarParametricMapFunction.h
+++ b/Code/Radiometry/otbSarParametricMapFunction.h
@@ -9,8 +9,6 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
- Copyright (c) CS Systemes d'information. All rights reserved.
- See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -35,7 +33,7 @@ namespace otb
*
* \ingroup ImageFunctions
*/
-
+
template <class TInputImage, class TCoordRep = float>
class ITK_EXPORT SarParametricMapFunction :
public itk::ImageFunction<TInputImage, typename itk::NumericTraits<typename TInputImage::PixelType>::ScalarRealType,
@@ -100,7 +98,7 @@ public:
m_PointSet = val;
EvaluateParametricCoefficient();
this->Modified();
- }
+ }
/** Get/Set the Coeff pointer*/
itkSetObjectMacro(Coeff, PointSetType);
@@ -114,14 +112,14 @@ public:
/** Get/Set the Coeff pointer*/
itkSetMacro(UsingClosestPointMethod, bool);
itkGetConstReferenceMacro(UsingClosestPointMethod, bool);
-
+
/** Get/Set the PolynomalSize pointer*/
void SetPolynomalSize(const IndexType PolynomalSize);
/** Evaluate parametric coefficent from pointset */
void EvaluateParametricCoefficient();
- /** Set constante value for evaluation*/
+ /** Set constante value for evaluation*/
void SetConstantValue(const RealType& value);
protected:
@@ -135,8 +133,8 @@ private:
PointSetPointer m_PointSet;
PointSetPointer m_Coeff;
- bool m_IsInitialize;
- bool m_UsingClosestPointMethod;
+ bool m_IsInitialize;
+ bool m_UsingClosestPointMethod;
};
} // end namespace otb
diff --git a/Code/Radiometry/otbSarParametricMapFunction.txx b/Code/Radiometry/otbSarParametricMapFunction.txx
index e70396d273..734ced7830 100644
--- a/Code/Radiometry/otbSarParametricMapFunction.txx
+++ b/Code/Radiometry/otbSarParametricMapFunction.txx
@@ -9,9 +9,6 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
- Copyright (c) CS Systemes d'information. All rights reserved.
- See CSCopyright.txt for details.
-
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -87,7 +84,7 @@ SarParametricMapFunction<TInputImage, TCoordRep>
if (m_PointSet->GetNumberOfPoints() > 0)
{
EvaluateParametricCoefficient();
- }
+ }
this->Modified();
}
@@ -98,7 +95,7 @@ SarParametricMapFunction<TInputImage, TCoordRep>
{
PointSetPointer pointSet;
pointSet = this->GetPointSet();
-
+
if (pointSet->GetNumberOfPoints() == 0)
{
itkExceptionMacro(<< "PointSet must be set before evaluating the parametric coefficient (at least one value)");
@@ -120,7 +117,7 @@ SarParametricMapFunction<TInputImage, TCoordRep>
pointSet->GetPointData(0, &pointValue);
m_Coeff->SetPointData(0,pointValue);
}
-
+
// Perform the plane least square estimation
unsigned int nbRecords = pointSet->GetNumberOfPoints();
unsigned int nbCoef = m_Coeff->GetNumberOfPoints();
@@ -134,17 +131,17 @@ SarParametricMapFunction<TInputImage, TCoordRep>
this->GetPointSet()->GetPoint(i, &point);
this->GetPointSet()->GetPointData(i, &pointValue);
b(i) = pointValue;
-
+
for(unsigned int pointId = 0; pointId < nbCoef; ++pointId)
{
PointType powerCoef;
powerCoef.Fill(0);
this->GetCoeff()->GetPoint(pointId, &powerCoef);
a(i,pointId) = vcl_pow(point[0],powerCoef[0]);
- a(i,pointId) *= vcl_pow(point[1],powerCoef[1]);
+ a(i,pointId) *= vcl_pow(point[1],powerCoef[1]);
}
}
-
+
if(this->GetCoeff()->GetNumberOfPoints()>0)
{
// Create the linear system
@@ -176,7 +173,7 @@ SarParametricMapFunction<TInputImage, TCoordRep>
RealType result;
typename PointSetType::PixelType pointValue;
pointValue = itk::NumericTraits<PixelType>::Zero;
-
+
result = itk::NumericTraits<RealType>::Zero;
if (!this->GetInputImage())
@@ -200,7 +197,7 @@ SarParametricMapFunction<TInputImage, TCoordRep>
{
PointType powerCoef;
powerCoef.Fill(0);
-
+
this->GetCoeff()->GetPoint(pointId, &powerCoef);
this->GetCoeff()->GetPointData(pointId, &pointValue);
@@ -224,16 +221,16 @@ SarParametricMapFunction<TInputImage, TCoordRep>
point.Fill(0);
PixelType pointValue;
pointValue = itk::NumericTraits<PixelType>::Zero;
-
+
this->Superclass::PrintSelf(os, indent);
-
+
for(unsigned int i = 0; i < m_Coeff->GetNumberOfPoints(); ++i)
{
m_Coeff->GetPoint(i,&point);
m_Coeff->GetPointData(i,&pointValue);
os << indent << "Polynom coefficient: " << point <<" with value : "<< pointValue << std::endl;
- }
-
+ }
+
}
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationFunction.h b/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
index 31b9642f73..20a4526b23 100644
--- a/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
+++ b/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
@@ -9,8 +9,6 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
- Copyright (c) CS Systemes d'information. All rights reserved.
- See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -33,8 +31,8 @@ namespace otb
* \class SarRadiometricCalibrationFunction
* \brief Calculate the density pixel of in the neighborhood of a pixel
*
- * Calculate the backscatter for the given pixel
- *
+ * Calculate the backscatter for the given pixel
+ *
* If called with a ContinuousIndex or Point, the calculation is performed
* at the nearest neighbor.
*
@@ -43,7 +41,7 @@ namespace otb
*
* \ingroup ImageFunctions
*/
-
+
template <class TInputImage, class TCoordRep = float>
class ITK_EXPORT SarRadiometricCalibrationFunction :
public itk::ImageFunction<TInputImage, typename itk::NumericTraits<typename TInputImage::PixelType>::AbsType,
@@ -80,7 +78,7 @@ public:
typedef typename FunctorType::RealType FunctorRealType;
typedef otb::SarParametricMapFunction<InputImageType> ParametricFunctionType;
- typedef typename ParametricFunctionType::Pointer ParametricFunctionPointer;
+ typedef typename ParametricFunctionType::Pointer ParametricFunctionPointer;
typedef typename ParametricFunctionType::ConstPointer ParametricFunctionConstPointer;
/** Evalulate the function at specified index */
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx b/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx
index 2be43224ec..9ac086f6d9 100644
--- a/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx
+++ b/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx
@@ -9,9 +9,6 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
- Copyright (c) CS Systemes d'information. All rights reserved.
- See CSCopyright.txt for details.
-
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -104,7 +101,7 @@ SarRadiometricCalibrationFunction<TInputImage, TCoordRep>
FunctorRealType Noise;
FunctorRealType AntennaPatternNewGain;
FunctorRealType AntennaPatternOldGain;
- FunctorRealType IncidenceAngle;
+ FunctorRealType IncidenceAngle;
FunctorRealType RangeSpreadLoss;
Noise = static_cast<FunctorRealType>(m_Noise->EvaluateAtIndex(index));
@@ -112,7 +109,7 @@ SarRadiometricCalibrationFunction<TInputImage, TCoordRep>
AntennaPatternOldGain = static_cast<FunctorRealType>(m_AntennaPatternOldGain->EvaluateAtIndex(index));
IncidenceAngle = static_cast<FunctorRealType>(m_IncidenceAngle->EvaluateAtIndex(index));
RangeSpreadLoss = static_cast<FunctorRealType>(m_RangeSpreadLoss->EvaluateAtIndex(index));
-
+
FunctorType functor;
functor.SetNoise(Noise);
functor.SetScale(m_Scale);
--
GitLab