diff --git a/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx b/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx index fe6e13f1a7a434f5b91e72a0a7a52111020d3de9..192ebcf0f257b37b86f3724e38c511369d0fdf7b 100644 --- a/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx +++ b/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx @@ -304,7 +304,7 @@ private: // Left field inversion if(IsParameterEnabled("inverse.outleft")) - { + { m_LeftDeformationFieldCaster->SetInput(m_DeformationFieldSource->GetLeftDeformationFieldOutput()); m_LeftInvertDeformationFieldFilter->SetInput(m_LeftDeformationFieldCaster->GetOutput()); diff --git a/Code/BasicFilters/otbRasterizeVectorDataFilter.h b/Code/BasicFilters/otbRasterizeVectorDataFilter.h index 8f756dd3a54224b1c2d513a5a4988f3bf91c95e5..329b05d9411cf820df36055f409c7e30692d00ea 100644 --- a/Code/BasicFilters/otbRasterizeVectorDataFilter.h +++ b/Code/BasicFilters/otbRasterizeVectorDataFilter.h @@ -35,7 +35,7 @@ namespace otb { /** \class RasterizeVectorDataFilter * \brief Burn geometries from the specified VectorData into raster - * + * * This class handles burning several input VectorDatas into the * input raster. It handles producing the output in any pixel type * supported by OTB since this class inherits itk::CastImageFilter. @@ -44,13 +44,13 @@ namespace otb { * be passed in, if not, the burn vector set by the user will be * duplicated to fit this condition. * - * The user can set an OutputPixelType as a burn vector via + * The user can set an OutputPixelType as a burn vector via * AddBurnValue(OutputImagePixelType burnValuesPix). To have a * different color for each VectorData, use this method with * differents burnValuesPix as many times as VectorDatas set. * Again, the color will be duplicated if only one burnValuesPix * is set. - * + * * Note : The VectorDatas and the input raster must be in the same * projectionRef. Nothing is done in this class to reproject the * VectorData into the image coordinate system. @@ -75,7 +75,7 @@ public: typedef TInputImage InputImageType; typedef typename InputImageType::ConstPointer InputImagePointer; - typedef typename InputImageType::RegionType InputImageRegionType; + typedef typename InputImageType::RegionType InputImageRegionType; typedef typename InputImageType::PixelType InputImagePixelType; typedef typename InputImageType::IndexType InputIndexType; typedef typename InputImageType::PointType InputPointType; @@ -101,9 +101,9 @@ public: /** Add VectorData Input */ virtual void AddVectorData(const VectorDataType* vd); - /** + /** * Set the burn values using the output pixel type; all the bands - * will be burned + * will be burned **/ void AddColor(const OutputImagePixelType& burnValuesPix) { @@ -121,7 +121,7 @@ public: } // Add the value stored in the output image pixel type to - // the burn values vector + // the burn values vector // Add all the bands to be burned and clear previous bands. m_BandsToBurn.clear(); for (int idx = 0; idx < burnValuesPix.Size(); ++idx) @@ -135,7 +135,7 @@ protected: virtual void GenerateData(); RasterizeVectorDataFilter(); - virtual ~RasterizeVectorDataFilter() + virtual ~RasterizeVectorDataFilter() { // Destroy the datasource if (m_OGRDataSource != NULL) diff --git a/Code/BasicFilters/otbRasterizeVectorDataFilter.txx b/Code/BasicFilters/otbRasterizeVectorDataFilter.txx index af09190f742dacf66d6b72ab36486f775e147fcc..8042d3aacab402079941d935af0ef6ee8c82017b 100644 --- a/Code/BasicFilters/otbRasterizeVectorDataFilter.txx +++ b/Code/BasicFilters/otbRasterizeVectorDataFilter.txx @@ -52,7 +52,7 @@ template<class TVectorData, class TInputImage, class TOutputImage> void RasterizeVectorDataFilter<TVectorData, TInputImage, TOutputImage> ::GenerateOutputInformation() -{ +{ Superclass::GenerateOutputInformation(); // Generate the OGRLayers from the input VectorDatas @@ -88,11 +88,11 @@ RasterizeVectorDataFilter<TVectorData, TInputImage, TOutputImage> // The method ConvertDataTreeNodeToOGRLayers create the // OGRDataSource but don t release it. Destruction is done in the - // desctructor + // desctructor m_OGRDataSourcePointer = NULL; ogrLayerVector = IOConversion->ConvertDataTreeNodeToOGRLayers(inputRoot, m_OGRDataSourcePointer, - ogrCurrentLayer, + ogrCurrentLayer, oSRS); // Cast OGRLayer* to OGRLayerH @@ -101,7 +101,7 @@ RasterizeVectorDataFilter<TVectorData, TInputImage, TOutputImage> m_SrcDataSetLayers.push_back( (OGRLayerH)(ogrLayerVector[idx]) ); } - // Destroy the oSRS + // Destroy the oSRS if (oSRS != NULL) { OSRRelease(oSRS); @@ -116,14 +116,14 @@ RasterizeVectorDataFilter<TVectorData, TInputImage, TOutputImage> if (m_BurnValues.size() != m_BandsToBurn.size() * m_SrcDataSetLayers.size()) { std::ostringstream oss; - oss <<"Inconsistency detected : expected burn vector size to be equal to( bandToBurn * nb layers = " - << m_BandsToBurn.size() * m_SrcDataSetLayers.size() + oss <<"Inconsistency detected : expected burn vector size to be equal to( bandToBurn * nb layers = " + << m_BandsToBurn.size() * m_SrcDataSetLayers.size() << " ), got : "<< m_BurnValues.size()<<std::endl; itkWarningMacro(<<oss.str()); } // Clone the burn values to fit the condition - for (unsigned int idx =0; idx < m_SrcDataSetLayers.size() ; ++idx) + for (unsigned int idx =0; idx < m_SrcDataSetLayers.size(); ++idx) { for (unsigned int burnidx = 0; burnidx < m_BurnValues.size(); ++burnidx) { @@ -185,10 +185,10 @@ RasterizeVectorDataFilter<TVectorData, TInputImage, TOutputImage>::GenerateData( // Burn the geometries into the dataset if (dataset != NULL) { - GDALRasterizeLayers( dataset, m_BandsToBurn.size(), - &(m_BandsToBurn[0]), - m_SrcDataSetLayers.size(), - &(m_SrcDataSetLayers[0]), + GDALRasterizeLayers( dataset, m_BandsToBurn.size(), + &(m_BandsToBurn[0]), + m_SrcDataSetLayers.size(), + &(m_SrcDataSetLayers[0]), NULL, NULL, &(m_FullBurnValues[0]), NULL, GDALDummyProgress, NULL ); diff --git a/Code/IO/otbOGRIOHelper.cxx b/Code/IO/otbOGRIOHelper.cxx index 3d720cd4f2a5741e3e6a7310dab86502603fc8af..a367ada694daba2f9c9ce66eb434a04479f9ade5 100644 --- a/Code/IO/otbOGRIOHelper.cxx +++ b/Code/IO/otbOGRIOHelper.cxx @@ -645,10 +645,10 @@ void OGRIOHelper unsigned int OGRIOHelper -::ProcessNodeWrite(InternalTreeNodeType * source, - OGRDataSource * m_DataSource, +::ProcessNodeWrite(InternalTreeNodeType * source, + OGRDataSource * m_DataSource, OGRGeometryCollection * ogrCollection, - OGRLayer * ogrCurrentLayer, + OGRLayer * ogrCurrentLayer, OGRSpatialReference * oSRS) { unsigned int kept = 0; @@ -1008,8 +1008,8 @@ unsigned int OGRIOHelper * Return a vector of OGRLayer **/ std::vector<OGRLayer*> OGRIOHelper -::ConvertDataTreeNodeToOGRLayers(InternalTreeNodeType * source, - OGRDataSource * inMemoryDataSource, +::ConvertDataTreeNodeToOGRLayers(InternalTreeNodeType * source, + OGRDataSource * inMemoryDataSource, OGRLayer* ogrCurrentLayer, OGRSpatialReference * oSRS) { @@ -1317,5 +1317,4 @@ std::vector<OGRLayer*> OGRIOHelper - } // end namespace otb diff --git a/Code/IO/otbOGRIOHelper.h b/Code/IO/otbOGRIOHelper.h index 962e2b401e13fb43a93f86d888458b51a8c66c6a..8a3d38074caf7085c0d3c1fca519001ac8b08633 100644 --- a/Code/IO/otbOGRIOHelper.h +++ b/Code/IO/otbOGRIOHelper.h @@ -67,8 +67,8 @@ public: OGRSpatialReference * oSRS); /** Return a list of OGRLayer * */ - std::vector<OGRLayer*> ConvertDataTreeNodeToOGRLayers(InternalTreeNodeType * source, - OGRDataSource * dummyDatasource, + std::vector<OGRLayer*> ConvertDataTreeNodeToOGRLayers(InternalTreeNodeType * source, + OGRDataSource * dummyDatasource, OGRLayer* ogrCurrentLayer, OGRSpatialReference * oSRS); diff --git a/Testing/Code/BasicFilters/otbVectorDataRasterizeFilter.cxx b/Testing/Code/BasicFilters/otbVectorDataRasterizeFilter.cxx index aa3a6521e9229ef807f3ad04795196dbd98e6bac..313c26e2832cf655421096d8f53b6c9232afb3cb 100644 --- a/Testing/Code/BasicFilters/otbVectorDataRasterizeFilter.cxx +++ b/Testing/Code/BasicFilters/otbVectorDataRasterizeFilter.cxx @@ -36,7 +36,7 @@ typedef otb::VectorDataProjectionFilter<VectorDataType, VectorDataType> VDProjectionType; typedef otb::StreamingImageFileWriter<ImageType> WriterType; typedef otb::RasterizeVectorDataFilter<VectorDataType, - ImageType, + ImageType, ImageType> RasterizationFilterType; int otbVectorDataRasterizeFilterNew(int argc, char* argv[])