From e55c0ec595d1f171c3bea28fd4cf0c72982de5b8 Mon Sep 17 00:00:00 2001 From: OTB Bot <otbbot@orfeo-toolbox.org> Date: Wed, 14 Dec 2011 19:55:47 +0100 Subject: [PATCH] STYLE --- Applications/Utils/otbColorMapping.cxx | 14 +++++++------- Code/Projections/otbGroundSpacingImageFunction.h | 2 +- Code/Projections/otbGroundSpacingImageFunction.txx | 2 +- Code/Visualization/otbImageLayer.txx | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Applications/Utils/otbColorMapping.cxx b/Applications/Utils/otbColorMapping.cxx index 178767153d..18db3d6cb6 100644 --- a/Applications/Utils/otbColorMapping.cxx +++ b/Applications/Utils/otbColorMapping.cxx @@ -347,7 +347,7 @@ public: typedef RAMDrivenStrippedStreamingManager <FloatVectorImageType> RAMDrivenStrippedStreamingManagerType; typedef otb::StreamingShrinkImageFilter - <FloatVectorImageType,FloatVectorImageType> ImageSamplingFilterType; + <FloatVectorImageType, FloatVectorImageType> ImageSamplingFilterType; typedef itk::Statistics::DenseFrequencyContainer DFContainerType; typedef itk::NumericTraits<PixelType>::RealType RealScalarType; typedef itk::VariableLengthVector<RealScalarType> InternalPixelType; @@ -361,7 +361,7 @@ public: typedef Functor::RGBFromImageValueFunctor <LabelType, FloatVectorImageType::PixelType> RGBFromImageValueFunctorType; typedef itk::BinaryFunctorImageFilter - <LabelImageType, FloatVectorImageType, + <LabelImageType, FloatVectorImageType, LabelImageType, RGBFromImageValueFunctorType> RGBFromImageValueFilterType; // Inverse mapper for color->label operation @@ -378,7 +378,7 @@ public: // Caster to convert a FloatImageType to LabelImageType typedef itk::CastImageFilter - <FloatImageType,LabelImageType> CasterToLabelImageType; + <FloatImageType, LabelImageType> CasterToLabelImageType; private: void DoInit() @@ -387,7 +387,7 @@ private: SetDescription("Maps an input label image to 8-bits RGB using look-up tables."); SetDocName("Color Mapping"); - SetDocLongDescription("This application allows to map a label image to a 8-bits RGB image (in both ways) using different methods.\n" + SetDocLongDescription("This application allows to map a label image to a 8-bits RGB image (in both ways) using different methods.\n" "-The custom method allows to use a custom look-up table. The look-up table is loaded " "from a text file where each line describes an entry. The typical use of this method is to colorise a " "classification map.\n-The continuous method allows to map a range of values in a scalar input image " @@ -437,7 +437,7 @@ private: AddChoice("op.colortolabel","Color to label"); AddParameter(ParameterType_Int, "op.colortolabel.notfound","Not Found Label"); SetParameterDescription("op.colortolabel.notfound","Label to use for unknown colors."); - SetDefaultParameterInt("op.colortolabel.notfound",404); + SetDefaultParameterInt("op.colortolabel.notfound", 404); MandatoryOff("op.colortolabel.notfound"); // --- MAPPING METHOD --- @@ -529,7 +529,7 @@ private: if (GetParameterInt("method")==1 || GetParameterInt("method")==3) { otbAppLogWARNING("Override method : use optimal"); - SetParameterInt("method",2); + SetParameterInt("method", 2); } } } @@ -825,7 +825,7 @@ private: // iteration over stream divisions RegionType streamingRegion; - for (unsigned int index = 0;index<numberOfStreamDivisions;index++) + for (unsigned int index = 0; index<numberOfStreamDivisions; index++) { streamingRegion = splitter->GetSplit(index, numberOfStreamDivisions, largestRegion); input->SetRequestedRegion(streamingRegion); diff --git a/Code/Projections/otbGroundSpacingImageFunction.h b/Code/Projections/otbGroundSpacingImageFunction.h index 42426b5a1b..876adf90e4 100644 --- a/Code/Projections/otbGroundSpacingImageFunction.h +++ b/Code/Projections/otbGroundSpacingImageFunction.h @@ -40,7 +40,7 @@ namespace otb */ template <class TInputImage, class TCoordRep = float> class ITK_EXPORT GroundSpacingImageFunction : - public itk::ImageFunction<TInputImage, std::pair<float,float>, + public itk::ImageFunction<TInputImage, std::pair<float, float>, TCoordRep> { public: diff --git a/Code/Projections/otbGroundSpacingImageFunction.txx b/Code/Projections/otbGroundSpacingImageFunction.txx index bbd1aa05cc..ca6054c04a 100644 --- a/Code/Projections/otbGroundSpacingImageFunction.txx +++ b/Code/Projections/otbGroundSpacingImageFunction.txx @@ -63,7 +63,7 @@ GroundSpacingImageFunction<TInputImage, TCoordRep> { if (!this->GetInputImage()) { - return (std::make_pair(itk::NumericTraits<ValueType>::min(),itk::NumericTraits<ValueType>::min())); + return (std::make_pair(itk::NumericTraits<ValueType>::min(), itk::NumericTraits<ValueType>::min())); } PointType point = this->GetPixelLocation(index); diff --git a/Code/Visualization/otbImageLayer.txx b/Code/Visualization/otbImageLayer.txx index 0f5ddcced6..321ebe2e26 100644 --- a/Code/Visualization/otbImageLayer.txx +++ b/Code/Visualization/otbImageLayer.txx @@ -69,7 +69,7 @@ ImageLayer<TImage, TOutputImage> m_CountryName = ""; m_GroundSpacing = GroundSpacingImageType::New(); - m_ApproxGroundSpacing = std::make_pair(itk::NumericTraits<ValueType>::min(),itk::NumericTraits<ValueType>::min()); + m_ApproxGroundSpacing = std::make_pair(itk::NumericTraits<ValueType>::min(), itk::NumericTraits<ValueType>::min()); } template <class TImage, class TOutputImage> -- GitLab