diff --git a/Code/Projections/otbGeometriesProjectionFilter.cxx b/Code/Projections/otbGeometriesProjectionFilter.cxx index b006e9bd73ac8531b0cd6dbf21ca8f806e864073..741c9577e63e291f941928b7bda2a58f37a5a916 100644 --- a/Code/Projections/otbGeometriesProjectionFilter.cxx +++ b/Code/Projections/otbGeometriesProjectionFilter.cxx @@ -260,7 +260,6 @@ void otb::GeometriesProjectionFilter::DoProcessLayer(ogr::Layer const& source, o m_Transform->SetInputProjectionRef(source.GetProjectionRef()); m_Transform->InstanciateTransform(); - // std::cout << "GPF::DoProcessLayer: L("<<source.GetName()<<") -> L("<<destination.GetName()<<") ...\n"; if (source != destination) { m_TransformationFunctor(source, destination); // if TransformedElementType == layer @@ -275,6 +274,5 @@ void otb::GeometriesProjectionFilter::DoProcessLayer(ogr::Layer const& source, o void otb::GeometriesProjectionFilter::DoDefineNewLayerFields(ogr::Layer const& source, ogr::Layer & dest) const { - std::cout << "otb::GeometriesProjectionFilter::DoDefineNewLayerFields\n"; m_TransformationFunctor.DefineFields(source, dest); } diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.cxx index 00adaf9e675332d54f5e1caf61ee69e3b711e1b0..5c6ad91a1e9169839455fe418cab61dc209a85d3 100644 --- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.cxx +++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.cxx @@ -151,30 +151,3 @@ void otb::GeometriesSet::PrintSelf(std::ostream& os, itk::Indent indent) const { this->apply(Printer(os, indent)); } - -#if 0 -/*===========================================================================*/ -/*=========================[ GetMetaDataDictionary ]=========================*/ -/*===========================================================================*/ -struct MetaDataDictionaryGetter : boost::static_visitor<itk::MetaDataDictionary&> -{ - itk::MetaDataDictionary& operator()(otb::ogr::Layer layer) const - { - return layer.GetMetaDataDictionary(); - } - itk::MetaDataDictionary& operator()(otb::ogr::DataSource::Pointer datasource) const - { - return datasource->GetMetaDataDictionary(); - } -}; - -itk::MetaDataDictionary & otb::GeometriesSet::GetMetaDataDictionary() -{ - return this->apply(MetaDataDictionaryGetter()); -} - -itk::MetaDataDictionary const& otb::GeometriesSet::GetMetaDataDictionary() const -{ - return const_cast <GeometriesSet *>(this)->GetMetaDataDictionary(); -} -#endif diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h index 8b2348a07742511d1185fcf0d68ad1904c0b9cad..cf26f0f9a0a5a2be736cc937b7452d72ad7e7562 100644 --- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h +++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h @@ -113,14 +113,6 @@ public: */ bool IsSet() const; -#if 0 - /**\name Meta data dictionary */ - //@{ - itk::MetaDataDictionary & GetMetaDataDictionary(); - itk::MetaDataDictionary const& GetMetaDataDictionary() const; - //@} -#endif - /**\name Image reference (spacing + origin) */ //@{ typedef ogr::ImageReference<double> ImageReference; diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h index 14c1e43072b29db9a52587ee1fdcc1181dbaddd5..eb4e1b65a726a3f4183e0bc5b46bfb57ce338c1e 100644 --- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h +++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h @@ -156,11 +156,9 @@ struct FieldCopyTransformation void DefineFields(ogr::Layer const& source, ogr::Layer & dest) const { - std::cout << " FieldCopyTransformation::DefineFields()\n"; OGRFeatureDefn & inDefinition = source.GetLayerDefn(); for (int i=0,N=inDefinition.GetFieldCount(); i!=N; ++i) { - std::cout << " - " << ogr::FieldDefn(*inDefinition.GetFieldDefn(i)) << "\n"; dest.CreateField(*inDefinition.GetFieldDefn(i)); } } diff --git a/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx b/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx index af043408918d94226772fc6a41884e7aafbd233a..7bea7af4fb3f37a6ca658ec5819a476b412faa89 100644 --- a/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx +++ b/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx @@ -104,8 +104,6 @@ BOOST_AUTO_TEST_CASE(OGRDataSource_mem_add_n_del_layer) BOOST_CHECK_THROW(ds->GetLayerChecked(1), itk::ExceptionObject); BOOST_CHECK_EQUAL(ds->Size(false), 0); BOOST_CHECK_EQUAL(ds->Size(true), 0); - - std::cout << "End of scope" << std::endl; } BOOST_AUTO_TEST_CASE(OGRDataSource_new_exceptions)