From 6f818998d14ff03eb508c949f0f159e643bacbd4 Mon Sep 17 00:00:00 2001
From: Cyrille Valladeau <cyrille.valladeau@c-s.fr>
Date: Thu, 26 Nov 2009 14:38:04 +0100
Subject: [PATCH] ERR : wrong commit
---
Code/IO/otbImageFileReader.txx | 3 +--
Testing/Code/IO/otbImageKeywordlist.cxx | 3 +--
Testing/Code/Projections/otbSensorModel.cxx | 4 ++--
.../src/ossim/projection/ossimSensorModel.cpp | 20 +------------------
4 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index 4d9c376029..3974bdc9a2 100644
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -365,10 +365,9 @@ ImageFileReader<TOutputImage>
}
// Free memory
delete handler;
- std::cout<<geom_kwl<<std::endl;
+
if (!hasMetaData)
{
- std::cout<<"TU PASSES ICI?????????????????????????"<<std::endl;
// Add the plugins factory
ossimProjectionFactoryRegistry::instance()->registerFactory(ossimplugins::ossimPluginProjectionFactory::instance());
ossimProjection * projection = ossimProjectionFactoryRegistry::instance()
diff --git a/Testing/Code/IO/otbImageKeywordlist.cxx b/Testing/Code/IO/otbImageKeywordlist.cxx
index 01ab65cd6d..f9f13ced31 100644
--- a/Testing/Code/IO/otbImageKeywordlist.cxx
+++ b/Testing/Code/IO/otbImageKeywordlist.cxx
@@ -69,9 +69,8 @@ int otbImageKeywordlist( int argc, char* argv[] )
otb_kwl.SetKeywordlist( geom_kwl );
otb_kwl.convertToOSSIMKeywordlist( geom_kwl2 );
- //projection->print(std::cout);
+
hasMetaData = projection->loadState(geom_kwl2);
- //projection->print(std::cout);
hasMetaData = projection->saveState(geom_kwl3);
otb::ImageKeywordlist otb_kwl2;
otb_kwl2.SetKeywordlist( geom_kwl3 );
diff --git a/Testing/Code/Projections/otbSensorModel.cxx b/Testing/Code/Projections/otbSensorModel.cxx
index 651bd43cf1..91526c615d 100644
--- a/Testing/Code/Projections/otbSensorModel.cxx
+++ b/Testing/Code/Projections/otbSensorModel.cxx
@@ -64,8 +64,8 @@ int otbSensorModel( int argc, char* argv[] )
itk::Point<double,2> imagePoint;
imagePoint[0]=10;
imagePoint[1]=10;
- //imagePoint[0]=16271;
- // imagePoint[1]=15647;
+// imagePoint[0]=3069;
+// imagePoint[1]=1218;
itk::Point<double,2> geoPoint;
geoPoint = forwardSensorModel->TransformPoint(imagePoint);
diff --git a/Utilities/otbossim/src/ossim/projection/ossimSensorModel.cpp b/Utilities/otbossim/src/ossim/projection/ossimSensorModel.cpp
index 1d92992b7e..3dcf031692 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimSensorModel.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimSensorModel.cpp
@@ -430,7 +430,6 @@ void ossimSensorModel::worldToLineSample(const ossimGpt& worldPoint,
//*****************************************************************************
std::ostream& ossimSensorModel::print(std::ostream& out) const
{
- std::cout<<"..............................................................................."<<std::endl;
out << setprecision(15) << setiosflags(ios::fixed)
<< "\n ossimSensorModel base-class data members:\n"
<< "\n theImageID: " << theImageID
@@ -490,12 +489,9 @@ void ossimSensorModel::setGroundRect(const ossimGpt& ul,
bool ossimSensorModel::saveState(ossimKeywordlist& kwl,
const char* prefix) const
{
- print(std::cout);
if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimSensorModel::saveState: entering..." << std::endl;
kwl.add(prefix, IMAGE_ID_KW, theImageID.chars());
- //std::cout<<"====================saveStatee::theImageID : "<<theImageID<<std::endl;
- //std::cout<<"====================saveState::theImageID : "<<kwl.find(prefix, IMAGE_ID_KW)<<std::endl;
kwl.add(prefix, SENSOR_ID_KW, theSensorID.chars());
kwl.add(prefix,
@@ -553,9 +549,6 @@ bool ossimSensorModel::saveState(ossimKeywordlist& kwl,
corner.lat,
true);
- std::cout<<"====================saveStatee::UL_LAT_KW : "<< corner.lat<<std::endl;
- std::cout<<"====================saveState::UL_LAT_KW : "<<kwl.find(prefix, ossimKeywordNames::UL_LAT_KW)<<std::endl;
-
kwl.add(prefix,
ossimKeywordNames::UL_LON_KW,
corner.lon,
@@ -655,8 +648,6 @@ bool ossimSensorModel::loadState(const ossimKeywordlist& kwl,
else
theImageID = NULL_STRING;
- //std::cout<<"****************loadState::theImageID : "<<theImageID<<" "<<value<<std::endl;
-
keyword = SENSOR_ID_KW;
value = kwl.find(prefix, keyword);
if (value)
@@ -752,7 +743,6 @@ bool ossimSensorModel::loadState(const ossimKeywordlist& kwl,
{
v[1].lat = ossimString(value).toDouble();
}
- std::cout<<"****************loadState::v[1].lat : "<<value<<" , "<<v[1].lat<<" "<<value<<std::endl;
keyword = ossimKeywordNames::UR_LON_KW;
value = kwl.find(prefix, keyword);
@@ -826,18 +816,10 @@ bool ossimSensorModel::loadState(const ossimKeywordlist& kwl,
{
tmpStr = prefix;
}
-std::cout<<"++++++++++++++++--++++++++++++ : "<<kwl.find(prefix, IMAGE_ID_KW)<<std::endl;
loadAdjustments(kwl, tmpStr);
-std::cout<<"++++++++++++++++--++++++++++++ : "<<kwl.find(prefix, IMAGE_ID_KW)<<std::endl;
if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimSensorModel::loadState: returning..." << std::endl;
-
- bool res = ossimProjection::loadState(kwl, prefix);
- //std::cout<<"++++++++++++++++--++++++++++++ : "<<kwl.find(prefix, IMAGE_ID_KW)<<std::endl;
-
- print(std::cout);
-
- return res;//ossimProjection::loadState(kwl, prefix);
+ return ossimProjection::loadState(kwl, prefix);;
}
//*****************************************************************************
--
GitLab