diff --git a/Code/BasicFilters/otbConnectedComponentMuParserFunctor.h b/Code/BasicFilters/otbConnectedComponentMuParserFunctor.h
index 12c67a301bee160ed6f81d4d39de40ece8fb0fc1..341036f277db822fb8e0704ba0660e734956df2b 100644
--- a/Code/BasicFilters/otbConnectedComponentMuParserFunctor.h
+++ b/Code/BasicFilters/otbConnectedComponentMuParserFunctor.h
@@ -200,12 +200,12 @@ public:
m_Parser = ParserType::New();
m_NbOfBands = 0;
}
- ;
+ ;
~ConnectedComponentMuParserFunctor()
{
}
- ;
+ ;
protected:
diff --git a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx b/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx
index 364d98f2fb58ba15fae94a26904aa5f835de8ceb..dbc8c0d77d797301fedc2ce5ff8bc1d995467e68 100644
--- a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx
+++ b/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx
@@ -142,7 +142,6 @@ void LabelObjectOpeningMuParserFilter<TImage, TFunction>::GenerateInputRequested
}
-
template < class TImage, class TFunction>
void LabelObjectOpeningMuParserFilter<TImage, TFunction>::GenerateData()
{
diff --git a/Code/BasicFilters/otbRelabelComponentImageFilter.h b/Code/BasicFilters/otbRelabelComponentImageFilter.h
index 04036749beea4eaa790cc301b9bca48d93dc5dc0..21ae2eb68841a9f4b3d56d9aa7b91dd5e1529fb2 100644
--- a/Code/BasicFilters/otbRelabelComponentImageFilter.h
+++ b/Code/BasicFilters/otbRelabelComponentImageFilter.h
@@ -1,7 +1,7 @@
/*=========================================================================
Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkRelabelComponentImageFilter.h,v $
+ Module: $RCSfile: itkRelabelComponentImageFilter.h, v $
Language: C++
Date: $Date: 2009-04-27 22:58:48 $
Version: $Revision: 1.17 $
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -37,7 +37,7 @@ namespace otb
* largest will have label #2, etc.
*
* Label #0 is assumed to be background is left unaltered by the
- * relabeling.
+ * relabeling.
*
* RelabelComponentImageFilter is typically used on the output of the
* ConnectedComponentImageFilter for those applications that want to
@@ -71,7 +71,7 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT RelabelComponentImageFilter :
+class ITK_EXPORT RelabelComponentImageFilter :
public itk::InPlaceImageFilter< TInputImage, TOutputImage >
{
public:
@@ -95,7 +95,7 @@ public:
typedef typename TInputImage::PixelType InputPixelType;
typedef typename TInputImage::InternalPixelType InputInternalPixelType;
itkStaticConstMacro(ImageDimension, unsigned int,
- TOutputImage::ImageDimension);
+ TOutputImage::ImageDimension);
itkStaticConstMacro(InputImageDimension, unsigned int,
TInputImage::ImageDimension);
@@ -108,8 +108,8 @@ public:
typedef typename TInputImage::SizeType SizeType;
typedef typename TOutputImage::RegionType RegionType;
- /**
- * Smart pointer typedef support
+ /**
+ * Smart pointer typedef support
*/
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -196,7 +196,7 @@ public:
* size). This information is only valid after the filter has
* executed. Size of the background (object #0) is not calculated. */
float GetSizeOfObjectInPhysicalUnits( LabelType obj ) const
- {
+ {
if (obj > 0 && obj <= m_NumberOfObjects)
{
return m_SizeOfObjectsInPhysicalUnits[obj-1];
@@ -232,7 +232,7 @@ protected:
RelabelComponentImageFilter(const Self&) {}
/**
- * Standard pipeline method.
+ * Standard pipeline method.
*/
void GenerateData();
@@ -260,7 +260,7 @@ protected:
class RelabelComponentSizeInPixelsComparator
{
public:
- bool operator()(const RelabelComponentObjectType&a,
+ bool operator()(const RelabelComponentObjectType&a,
const RelabelComponentObjectType &b)
{
if (a.m_SizeInPixels > b.m_SizeInPixels)
diff --git a/Code/BasicFilters/otbRelabelComponentImageFilter.txx b/Code/BasicFilters/otbRelabelComponentImageFilter.txx
index f106cdb35d6fb7270794c31a4a032b7602192ba4..d2a81849e7701df9daeb2532356730ee24b01783 100644
--- a/Code/BasicFilters/otbRelabelComponentImageFilter.txx
+++ b/Code/BasicFilters/otbRelabelComponentImageFilter.txx
@@ -1,7 +1,7 @@
/*=========================================================================
Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkRelabelComponentImageFilter.txx,v $
+ Module: $RCSfile: itkRelabelComponentImageFilter.txx, v $
Language: C++
Date: $Date: 2009-04-27 22:58:48 $
Version: $Revision: 1.18 $
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -200,7 +200,7 @@ RelabelComponentImageFilter< TInputImage, TOutputImage >
{
// lookup the mapped label
- outputValue = static_cast<OutputPixelType>(relabelMap[inputValue]);
+ outputValue = static_cast<OutputPixelType>(relabelMap[inputValue]);
oit.Set( outputValue );
}
else
diff --git a/Code/Common/otbParser.cxx b/Code/Common/otbParser.cxx
index 1c5cffa60c35a9b0f7aca6cf53edd40d5e9fb115..696d440921ee8ebb8104ab7232841a4457aeb2a2 100644
--- a/Code/Common/otbParser.cxx
+++ b/Code/Common/otbParser.cxx
@@ -154,7 +154,6 @@ void Parser::ExceptionHandlerDebug(ParserType::ExceptionType &e)
-
// Get the map with the variables
const std::map<std::string, Parser::ValueType*>& Parser::GetVar() const
{
diff --git a/Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.txx b/Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.txx
index 5309e0ff669953246464756bdc4633433536c4f2..267f10a79e096e0226e48e46460582a092879ef9 100644
--- a/Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.txx
+++ b/Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.txx
@@ -242,7 +242,6 @@ BandsStatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
-
template <class TImage, class TFeatureImage>
void
BandsStatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
diff --git a/Code/OBIA/otbLabelMapToLabelImageFilter.h b/Code/OBIA/otbLabelMapToLabelImageFilter.h
index d67db14f6beff389a0cd89eed37a5236099b7cbf..148ff7e545d36fad2090ea6ecd4baf606d1f4377 100644
--- a/Code/OBIA/otbLabelMapToLabelImageFilter.h
+++ b/Code/OBIA/otbLabelMapToLabelImageFilter.h
@@ -1,7 +1,7 @@
/*=========================================================================
Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkLabelMapToLabelImageFilter.h,v $
+ Module: $RCSfile: itkLabelMapToLabelImageFilter.h, v $
Language: C++
Date: $Date: 2009-07-30 22:54:24 $
Version: $Revision: 1.3 $
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -29,7 +29,7 @@ namespace otb {
* \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction, INRA de Jouy-en-Josas, France.
*
* This implementation was taken from the Insight Journal paper:
- * http://hdl.handle.net/1926/584 or
+ * http://hdl.handle.net/1926/584 or
* http://www.insight-journal.org/browse/publication/176
*
* \sa LabelMapToBinaryImageFilter, LabelMapMaskImageFilter
@@ -37,7 +37,7 @@ namespace otb {
* \ingroup LabeledImageFilters
*/
template<class TInputImage, class TOutputImage>
-class ITK_EXPORT LabelMapToLabelImageFilter :
+class ITK_EXPORT LabelMapToLabelImageFilter :
public itk::LabelMapToLabelImageFilter<TInputImage, TOutputImage>
{
public:
@@ -67,7 +67,7 @@ public:
itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** Standard New method. */
- itkNewMacro(Self);
+ itkNewMacro(Self);
/** Runtime information support. */
itkTypeMacro(LabelMapToLabelImageFilter, ImageToImageFilter);
diff --git a/Code/OBIA/otbLabelMapToLabelImageFilter.txx b/Code/OBIA/otbLabelMapToLabelImageFilter.txx
index 719438d048e7a5a6abe3cb9f163cef02ffef4aee..8eff1966a835b476a8f1264f6fd243d275027259 100644
--- a/Code/OBIA/otbLabelMapToLabelImageFilter.txx
+++ b/Code/OBIA/otbLabelMapToLabelImageFilter.txx
@@ -1,7 +1,7 @@
/*=========================================================================
Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkLabelMapToLabelImageFilter.txx,v $
+ Module: $RCSfile: itkLabelMapToLabelImageFilter.txx, v $
Language: C++
Date: $Date: 2009-05-16 22:19:31 $
Version: $Revision: 1.2 $
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -64,6 +64,5 @@ LabelMapToLabelImageFilter<TInputImage, TOutputImage>
}
-
}// end namespace otb
#endif
diff --git a/Code/OBIA/otbShapeAttributesLabelMapFilter.txx b/Code/OBIA/otbShapeAttributesLabelMapFilter.txx
index fc8615dc4976c4de4e6c46fa0a6199fed3b5e6b2..39fb90961219968d31840fc14964800171b7aab3 100644
--- a/Code/OBIA/otbShapeAttributesLabelMapFilter.txx
+++ b/Code/OBIA/otbShapeAttributesLabelMapFilter.txx
@@ -113,7 +113,6 @@ ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
-
/** Set the compute feret diameter flag */
template <class TLabelObject, class TLabelImage>
void
diff --git a/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h b/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
index ab7996d30a7f7fa72483ce8bd5dd4d3e68a3eaf6..c9e085abf5bbeda0fb70c5778bf309a97e920401 100644
--- a/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
+++ b/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
@@ -61,7 +61,7 @@ class PersistentConnectedComponentSegmentationOBIAToVectorDataFilter : public ot
public:
/** Standard Self typedef */
typedef PersistentConnectedComponentSegmentationOBIAToVectorDataFilter Self;
- typedef PersistentImageToVectorDataFilter<TVImage,TOutputVectorData > Superclass;
+ typedef PersistentImageToVectorDataFilter<TVImage, TOutputVectorData > Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbIkonosImageMetadataInterface.cxx b/Code/UtilitiesAdapters/OssimAdapters/otbIkonosImageMetadataInterface.cxx
index c46932ab61d258af1aba36720f03ec908d5b0015..07cd54b4e99f6a30c007b7691c21bb78eca4738b 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbIkonosImageMetadataInterface.cxx
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbIkonosImageMetadataInterface.cxx
@@ -66,7 +66,7 @@ IkonosImageMetadataInterface::GetSolarIrradiance() const
std::string keywordString = imageKeywordlist.GetMetadataByKey("support_data.band_name");
- // values from geoeye
+ // values from geoeye
// TODO are these the correct values ????
if (keywordString == "Pan")
{
@@ -107,7 +107,7 @@ IkonosImageMetadataInterface::GetDay() const
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
}
- if (!imageKeywordlist.HasKey("support_data.acquisition_date"))
+ if (!imageKeywordlist.HasKey("support_data.acquisition_date"))
{
return -1;
}
@@ -138,7 +138,7 @@ IkonosImageMetadataInterface::GetMonth() const
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
}
- if (!imageKeywordlist.HasKey("support_data.acquisition_date"))
+ if (!imageKeywordlist.HasKey("support_data.acquisition_date"))
{
return -1;
}
@@ -170,7 +170,7 @@ IkonosImageMetadataInterface::GetYear() const
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
}
- if (!imageKeywordlist.HasKey("support_data.acquisition_date"))
+ if (!imageKeywordlist.HasKey("support_data.acquisition_date"))
{
return -1;
}
@@ -202,7 +202,7 @@ IkonosImageMetadataInterface::GetHour() const
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
}
- if (!imageKeywordlist.HasKey("support_data.acquisition_time"))
+ if (!imageKeywordlist.HasKey("support_data.acquisition_time"))
{
return -1;
}
@@ -233,7 +233,7 @@ IkonosImageMetadataInterface::GetMinute() const
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
}
- if (!imageKeywordlist.HasKey("support_data.acquisition_time"))
+ if (!imageKeywordlist.HasKey("support_data.acquisition_time"))
{
return -1;
}
@@ -264,7 +264,7 @@ IkonosImageMetadataInterface::GetProductionDay() const
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
}
- if (!imageKeywordlist.HasKey("support_data.production_date"))
+ if (!imageKeywordlist.HasKey("support_data.production_date"))
{
return -1;
}
@@ -294,7 +294,7 @@ IkonosImageMetadataInterface::GetProductionMonth() const
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
}
- if (!imageKeywordlist.HasKey("support_data.production_date"))
+ if (!imageKeywordlist.HasKey("support_data.production_date"))
{
return -1;
}
@@ -324,7 +324,7 @@ IkonosImageMetadataInterface::GetProductionYear() const
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
}
- if (!imageKeywordlist.HasKey("support_data.production_date"))
+ if (!imageKeywordlist.HasKey("support_data.production_date"))
{
return -1;
}
diff --git a/Testing/Code/Common/otbExtractROICompareRegionsImplementations.cxx b/Testing/Code/Common/otbExtractROICompareRegionsImplementations.cxx
index 60f3cbff90277211a68c1c2e99e3a8d4bdf04ce8..f78e2474b829b1bc9ade1acc8c764ace37ddf458 100644
--- a/Testing/Code/Common/otbExtractROICompareRegionsImplementations.cxx
+++ b/Testing/Code/Common/otbExtractROICompareRegionsImplementations.cxx
@@ -94,7 +94,7 @@ int otbITKExtractImageFilterROITestRegion(int argc, char * argv[])
RegionType extractionRegion;
ExtractImageFilterType::Pointer extract;
- in = makeImage(0,0,100,100);
+ in = makeImage(0, 0, 100, 100);
extractionRegion.SetIndex(0, 50);
extractionRegion.SetIndex(1, 50);
@@ -115,7 +115,7 @@ int otbITKExtractImageFilterROITestRegion(int argc, char * argv[])
return EXIT_FAILURE;
}
- in = makeImage(20,20,100,100);
+ in = makeImage(20, 20, 100, 100);
extractionRegion.SetIndex(0, 50);
extractionRegion.SetIndex(1, 50);
@@ -146,7 +146,7 @@ int otbITKVectorIndexSelectionCastTestRegion(int argc, char * argv[])
RegionType extractionRegion;
VectorIndexSelectionCastImageFilterType::Pointer extract;
- in = makeVectorImage(0,0,100,100,3);
+ in = makeVectorImage(0, 0, 100, 100, 3);
extract = VectorIndexSelectionCastImageFilterType::New();
extract->SetInput(in);
@@ -161,7 +161,7 @@ int otbITKVectorIndexSelectionCastTestRegion(int argc, char * argv[])
return EXIT_FAILURE;
}
- in = makeVectorImage(50,50,100,100,3);
+ in = makeVectorImage(50, 50, 100, 100, 3);
extract = VectorIndexSelectionCastImageFilterType::New();
extract->SetInput(in);
@@ -186,7 +186,7 @@ int otbMultiToMonoChannelExtractROITestRegion(int argc, char * argv[])
RegionType extractionRegion;
MultiToMonoChannelExtractROIType::Pointer extract;
- in = makeVectorImage(0,0,100,100,3);
+ in = makeVectorImage(0, 0, 100, 100, 3);
extractionRegion.SetIndex(0, 50);
extractionRegion.SetIndex(1, 50);
@@ -207,7 +207,7 @@ int otbMultiToMonoChannelExtractROITestRegion(int argc, char * argv[])
return EXIT_FAILURE;
}
- in = makeVectorImage(20,20,100,100,3);
+ in = makeVectorImage(20, 20, 100, 100, 3);
extractionRegion.SetIndex(0, 50);
extractionRegion.SetIndex(1, 50);
@@ -239,7 +239,7 @@ int otbMultiChannelExtractROITestRegion(int argc, char * argv[])
RegionType extractionRegion;
MultiChannelExtractROIType::Pointer extract;
- in = makeVectorImage(0,0,100,100,3);
+ in = makeVectorImage(0, 0, 100, 100, 3);
extractionRegion.SetIndex(0, 50);
extractionRegion.SetIndex(1, 50);
@@ -260,7 +260,7 @@ int otbMultiChannelExtractROITestRegion(int argc, char * argv[])
return EXIT_FAILURE;
}
- in = makeVectorImage(20,20,100,100,3);
+ in = makeVectorImage(20, 20, 100, 100, 3);
extractionRegion.SetIndex(0, 50);
extractionRegion.SetIndex(1, 50);
@@ -291,7 +291,7 @@ int otbExtractROITestRegion(int argc, char * argv[])
RegionType extractionRegion;
ExtractROIType::Pointer extract;
- in = makeImage(0,0,100,100);
+ in = makeImage(0, 0, 100, 100);
extractionRegion.SetIndex(0, 50);
extractionRegion.SetIndex(1, 50);
@@ -312,7 +312,7 @@ int otbExtractROITestRegion(int argc, char * argv[])
return EXIT_FAILURE;
}
- in = makeImage(20,20,100,100);
+ in = makeImage(20, 20, 100, 100);
extractionRegion.SetIndex(0, 50);
extractionRegion.SetIndex(1, 50);