diff --git a/Code/OBIA/otbFusionOGRTileFilter.txx b/Code/OBIA/otbFusionOGRTileFilter.txx index cdf1c80c69ebf727ecfda938a8975a8b399b1a67..4d33c185f8c6ddf60349d31db689b18542bd3cff 100644 --- a/Code/OBIA/otbFusionOGRTileFilter.txx +++ b/Code/OBIA/otbFusionOGRTileFilter.txx @@ -128,7 +128,7 @@ FusionOGRTileFilter<TInputImage> inputLayer.SetSpatialFilterRect(ulCorner[0],lrCorner[1],lrCorner[0],ulCorner[1]); OGRLayerType::const_iterator featIt = inputLayer.begin(); - for(;featIt!=inputLayer.end(); ++featIt) + for(; featIt!=inputLayer.end(); ++featIt) { FeatureStruct s(inputLayer.GetLayerDefn()); s.feat = *featIt; @@ -164,7 +164,7 @@ FusionOGRTileFilter<TInputImage> inputLayer.SetSpatialFilterRect(ulCorner[0],lrCorner[1],lrCorner[0],ulCorner[1]); - for(featIt = inputLayer.begin();featIt!=inputLayer.end(); ++featIt) + for(featIt = inputLayer.begin(); featIt!=inputLayer.end(); ++featIt) { FeatureStruct s(inputLayer.GetLayerDefn()); s.feat = *featIt; diff --git a/Code/OBIA/otbLabelImageToOGRDataSourceFilter.txx b/Code/OBIA/otbLabelImageToOGRDataSourceFilter.txx index 4109ea053ee038b40dbaddc79dfc8021fbdf1b1b..a287a0e4e07ff67ee619f81b841d0e32f2502c27 100644 --- a/Code/OBIA/otbLabelImageToOGRDataSourceFilter.txx +++ b/Code/OBIA/otbLabelImageToOGRDataSourceFilter.txx @@ -33,7 +33,6 @@ namespace otb { - template <class TInputImage> LabelImageToOGRDataSourceFilter<TInputImage> ::LabelImageToOGRDataSourceFilter() : m_FieldName("DN"), m_Use8Connected(false) diff --git a/Code/OBIA/otbPersistentImageToOGRDataFilter.txx b/Code/OBIA/otbPersistentImageToOGRDataFilter.txx index 5abec263ddca6699db7dcc0e3bbb13d982d593cf..bf64cee072e0907a08ecf9431458fdd1dca76405 100644 --- a/Code/OBIA/otbPersistentImageToOGRDataFilter.txx +++ b/Code/OBIA/otbPersistentImageToOGRDataFilter.txx @@ -145,7 +145,7 @@ PersistentImageToOGRDataFilter<TImage> OGRLayerType srcLayer = currentTileVD->GetLayerChecked(0); OGRDataSourcePointerType ogrDS = this->GetOGRDataSource(); - OGRLayerType dstLayer = ogrDS->GetLayersCount() == 1 + OGRLayerType dstLayer = ogrDS->GetLayersCount() == 1 ? ogrDS->GetLayer(0) : ogrDS->GetLayer(m_LayerName); @@ -155,7 +155,7 @@ PersistentImageToOGRDataFilter<TImage> dstLayer.ogr().StartTransaction(); OGRLayerType::const_iterator featIt = srcLayer.begin(); - for(;featIt!=srcLayer.end(); ++featIt) + for(; featIt!=srcLayer.end(); ++featIt) { OGRFeatureType dstFeature(dstLayer.GetLayerDefn()); dstFeature.SetFrom( *featIt, TRUE ); diff --git a/Code/OBIA/otbStreamingVectorizedSegmentationOGR.txx b/Code/OBIA/otbStreamingVectorizedSegmentationOGR.txx index a37796b99e35a34d9591d6bdabc8ee98b83686b2..2b118fff6f781961a36f751c4ccc1ed2486fd2d9 100644 --- a/Code/OBIA/otbStreamingVectorizedSegmentationOGR.txx +++ b/Code/OBIA/otbStreamingVectorizedSegmentationOGR.txx @@ -148,7 +148,7 @@ PersistentStreamingLabelImageToOGRDataFilter<TImageType, TSegmentationFilter> unsigned int ind = 0; std::map<int,int> relabelMap; typename OGRLayerType::const_iterator featIt = tmpLayer.begin(); - for(;featIt!=tmpLayer.end(); ++featIt) + for(; featIt!=tmpLayer.end(); ++featIt) { ogr::Field field = (*featIt)[0]; int fieldValue = field.GetValue<int>(); @@ -158,7 +158,7 @@ PersistentStreamingLabelImageToOGRDataFilter<TImageType, TSegmentationFilter> ind = ind + 1; } } - for(featIt = tmpLayer.begin();featIt!=tmpLayer.end(); ++featIt) + for(featIt = tmpLayer.begin(); featIt!=tmpLayer.end(); ++featIt) { ogr::Field field = (*featIt)[0]; int fieldValue = field.GetValue<int>(); diff --git a/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx b/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx index 4a4ba0dbba73f61729dd4048708b4516ce2fa675..14607a9f707eb895a933e671f6294439c9e0eff6 100644 --- a/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx +++ b/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx @@ -123,7 +123,6 @@ int main(int argc, char *argv[]) filter->SetOGRDataSource(ogrDS); - //filter->GetStreamer()->SetNumberOfLinesStrippedStreaming(atoi(argv[3])); filter->GetStreamer()->SetAutomaticTiledStreaming(); @@ -143,7 +142,6 @@ int main(int argc, char *argv[]) - //writer->SetFileName(argv[2]); //writer->SetInput(filter->GetOutputVectorData()); //writer->Update(); diff --git a/Testing/Code/OBIA/otbStreamingVectorizedSegmentationOGR.cxx b/Testing/Code/OBIA/otbStreamingVectorizedSegmentationOGR.cxx index 2f5aebcf5400e6639d5e7523257aa26f212251c5..857f1d2cf9efdfe3fd337d8632b55fc21cd49161 100644 --- a/Testing/Code/OBIA/otbStreamingVectorizedSegmentationOGR.cxx +++ b/Testing/Code/OBIA/otbStreamingVectorizedSegmentationOGR.cxx @@ -82,7 +82,7 @@ int otbStreamingVectorizedSegmentationOGR(int argc, char * argv[]) ReaderType::Pointer reader = ReaderType::New(); MaskReaderType::Pointer maskReader = MaskReaderType::New(); - StreamingVectorizedSegmentationOGRType::Pointer filter = StreamingVectorizedSegmentationOGRType::New(); + StreamingVectorizedSegmentationOGRType::Pointer filter = StreamingVectorizedSegmentationOGRType::New(); reader->SetFileName(imageName); reader->UpdateOutputInformation();