From 92acafc4d93356ece5d2fff63b0da0380dec4fa8 Mon Sep 17 00:00:00 2001
From: OTB Bot <otbbot@orfeo-toolbox.org>
Date: Fri, 23 Mar 2012 19:56:05 +0100
Subject: [PATCH] STYLE
---
.../otbSubPixelDisparityImageFilter.h | 2 +-
.../otbSubPixelDisparityImageFilter.txx | 26 +++++++++----------
.../otbPersistentImageToOGRDataFilter.txx | 1 -
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Code/DisparityMap/otbSubPixelDisparityImageFilter.h b/Code/DisparityMap/otbSubPixelDisparityImageFilter.h
index 794895103e..2fc49e7e7d 100644
--- a/Code/DisparityMap/otbSubPixelDisparityImageFilter.h
+++ b/Code/DisparityMap/otbSubPixelDisparityImageFilter.h
@@ -26,7 +26,7 @@ namespace otb
/** \class SubPixelDisparityImageFilter
* \brief Perform sub-pixel disparity estimation from input integer disparities and the image pair that was used
*
- *
+ *
*
* \sa PixelWiseBlockMatchingImageFilter
* \sa FineRegistrationImageFilter
diff --git a/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx b/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx
index dba433d2d0..b64eeeeb97 100644
--- a/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx
+++ b/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx
@@ -465,7 +465,7 @@ SubPixelDisparityImageFilter<TInputImage,TOutputMetricImage,
TDisparityImage,TMaskImage,TBlockMatchingFunctor>
::ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId)
{
- // choose the refinement method to use
+ // choose the refinement method to use
switch(m_RefineMethod)
{
// 0 = Parabolic fit
@@ -562,7 +562,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
bool horizontalInterpolation = false;
bool verticalInterpolation = false;
- // metrics for neighbors positions : first index is x, second is y
+ // metrics for neighbors positions : first index is x, second is y
double neighborsMetric[3][3] = {{0,0,0},{0,0,0},{0,0,0}};
//int firstNeighbor = 0;
//int stepNeighbor = 4;
@@ -632,7 +632,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
rightIt.SetLocation(downIndex);
neighborsMetric[1][2] = m_Functor(leftIt,rightIt);
- // check that current position is an extrema
+ // check that current position is an extrema
if (m_Minimize)
{
if (neighborsMetric[1][1] < neighborsMetric[1][0] && neighborsMetric[1][1] < neighborsMetric[1][2])
@@ -657,14 +657,14 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
IndexType rightIndex(curRightPos);
rightIndex[0]+= 1;
if ( rightBufferedRegion.IsInside(leftIndex) && rightBufferedRegion.IsInside(rightIndex) )
- {
+ {
rightIt.SetLocation(rightIndex);
neighborsMetric[2][1] = m_Functor(leftIt,rightIt);
rightIt.SetLocation(leftIndex);
neighborsMetric[0][1] = m_Functor(leftIt,rightIt);
- // check that current position is an extrema
+ // check that current position is an extrema
if (m_Minimize)
{
if (neighborsMetric[1][1] < neighborsMetric[0][1] && neighborsMetric[1][1] < neighborsMetric[2][1])
@@ -739,7 +739,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
if (verticalInterpolation && !horizontalInterpolation)
{
//vertical only
- double deltaV = 0.5 - (1.0 /
+ double deltaV = 0.5 - (1.0 /
(1.0 + (neighborsMetric[1][0]-neighborsMetric[1][1]) / (neighborsMetric[1][2]-neighborsMetric[1][1])));
if (deltaV > (-0.5) && deltaV < 0.5)
{
@@ -753,7 +753,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
else if (!verticalInterpolation && horizontalInterpolation)
{
// horizontal only
- double deltaH = 0.5 - (1.0 /
+ double deltaH = 0.5 - (1.0 /
(1.0 + (neighborsMetric[0][1]-neighborsMetric[1][1]) / (neighborsMetric[2][1]-neighborsMetric[1][1])));
if (deltaH > (-0.5) && deltaH < 0.5)
{
@@ -925,7 +925,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
bool horizontalInterpolation = false;
bool verticalInterpolation = false;
- // metrics for neighbors positions : first index is x, second is y
+ // metrics for neighbors positions : first index is x, second is y
double neighborsMetric[3][3] = {{0,0,0},{0,0,0},{0,0,0}};
//int firstNeighbor = 0;
//int stepNeighbor = 4;
@@ -995,7 +995,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
rightIt.SetLocation(downIndex);
neighborsMetric[1][2] = m_Functor(leftIt,rightIt);
- // check that current position is an extrema
+ // check that current position is an extrema
if (m_Minimize)
{
if (neighborsMetric[1][1] < neighborsMetric[1][0] && neighborsMetric[1][1] < neighborsMetric[1][2])
@@ -1020,14 +1020,14 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
IndexType rightIndex(curRightPos);
rightIndex[0]+= 1;
if ( rightBufferedRegion.IsInside(leftIndex) && rightBufferedRegion.IsInside(rightIndex) )
- {
+ {
rightIt.SetLocation(rightIndex);
neighborsMetric[2][1] = m_Functor(leftIt,rightIt);
rightIt.SetLocation(leftIndex);
neighborsMetric[0][1] = m_Functor(leftIt,rightIt);
- // check that current position is an extrema
+ // check that current position is an extrema
if (m_Minimize)
{
if (neighborsMetric[1][1] < neighborsMetric[0][1] && neighborsMetric[1][1] < neighborsMetric[2][1])
@@ -1138,7 +1138,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
tinyShiftedRegion.SetSize(0, 1);
tinyShiftedRegion.SetSize(1, 1);
- for (unsigned int k=0 ; k<nbIterMax ; k++)
+ for (unsigned int k=0; k<nbIterMax; k++)
{
if ( (yb-ya) < (yc-yb) )
{
@@ -1210,7 +1210,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
// set the output size and start index to the center position
// then set the smaller shift in the transform
- for (unsigned int k=0 ; k<nbIterMax ; k++)
+ for (unsigned int k=0; k<nbIterMax; k++)
{
if ( (yb-ya) < (yc-yb) )
{
diff --git a/Code/OBIA/otbPersistentImageToOGRDataFilter.txx b/Code/OBIA/otbPersistentImageToOGRDataFilter.txx
index 2c63732a92..f0b38705d9 100644
--- a/Code/OBIA/otbPersistentImageToOGRDataFilter.txx
+++ b/Code/OBIA/otbPersistentImageToOGRDataFilter.txx
@@ -30,7 +30,6 @@ namespace otb
{
-
template<class TImage>
PersistentImageToOGRDataFilter<TImage>
::PersistentImageToOGRDataFilter() : m_FieldName("DN"), m_FileName(""), m_TileNum(0)
--
GitLab