From f3b1326f882ac3f94ed3d95d3be989e15dbbd3d2 Mon Sep 17 00:00:00 2001
From: Victor Poughon <victor.poughon@cnes.fr>
Date: Mon, 4 Mar 2019 15:59:10 +0100
Subject: [PATCH] BUG: fix #1850 Poor error messages in otbImageFileReader.hxx
---
.../IO/ImageIO/include/otbImageFileReader.hxx | 4 +-
Modules/IO/TestKernel/include/otbTestMain.h | 50 ++++++-------------
.../src/otbWrapperCommandLineLauncher.cxx | 2 +-
.../QtWidget/src/otbWrapperQtWidgetModel.cxx | 15 +++---
Modules/Wrappers/SWIG/src/itkBase.i | 2 +-
5 files changed, 26 insertions(+), 47 deletions(-)
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.hxx b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
index 770f8b7912..09c7e0cae8 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.hxx
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
@@ -601,11 +601,11 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
// Test if the file exists.
if (!itksys::SystemTools::FileExists(fileToCheck))
{
- throw otb::ImageFileReaderException (__FILE__, __LINE__, "The file does not exist.", fileToCheck);
+ throw otb::ImageFileReaderException (__FILE__, __LINE__, std::string("Cannot open image ") + fileToCheck + std::string(". The file does not exist."), fileToCheck);
}
else
{
- throw otb::ImageFileReaderException(__FILE__, __LINE__, "Probably unsupported format or incorrect filename extension.", this->m_FileName);
+ throw otb::ImageFileReaderException(__FILE__, __LINE__, std::string("Cannot open image ") + this->m_FileName + std::string(". Probably unsupported format or incorrect filename extension."), this->m_FileName);
}
}
}
diff --git a/Modules/IO/TestKernel/include/otbTestMain.h b/Modules/IO/TestKernel/include/otbTestMain.h
index 8b9e2e9fb6..40696ad539 100644
--- a/Modules/IO/TestKernel/include/otbTestMain.h
+++ b/Modules/IO/TestKernel/include/otbTestMain.h
@@ -300,56 +300,36 @@ int main(int ac, char* av[])
return -1;
}
else
- {
+ {
otb::Logger::Instance()->LogSetupInformation();
MainFuncPointer f = j->second;
int result;
try
- {
+ {
// Invoke the test's "main" function.
result = (*f)(ac - 1, av + 1);
- if (result != EXIT_SUCCESS )
- {
+ if (result != EXIT_SUCCESS)
+ {
std::cout << "-> Test EXIT FAILURE (" << result << ")." << std::endl;
itkGenericExceptionMacro(<< "Function returns EXIT_FAILURE (not from regression, failure inside the test)");
- }
}
- catch (const otb::ImageFileReaderException& e)
- {
- std::cerr << "otbTestMain '" << testToRun << "': ImageFileReaderException:" << std::endl;
- std::cerr << e.GetFile() << ":" << e.GetLine() << ":" << std::endl;
- std::cerr << std::string("Cannot open image ") + e.m_Filename + std::string(". ") + e.GetDescription() << std::endl;
- result = EXIT_FAILURE;
}
- catch (const itk::ExceptionObject& e)
- {
- std::cerr << "otbTestMain '" << testToRun << "': ITK Exception thrown:" << std::endl;
- std::cerr << e.GetFile() << ":" << e.GetLine() << ":" << std::endl;
- std::cerr << e.GetDescription() << std::endl;
- result = EXIT_FAILURE;
- }
- catch (const std::bad_alloc& err)
- {
- std::cerr << "otbTestMain '" << testToRun << "': Exception bad_alloc thrown: " << std::endl;
- std::cerr << (char*) err.what() << std::endl;
- result = EXIT_FAILURE;
- }
catch (const std::exception& e)
- {
- std::cerr << "otbTestMain '" << testToRun << "': std::exception thrown:" << std::endl;
- std::cerr << e.what() << std::endl;
+ {
+ std::cerr << "otbTestMain '" << testToRun << "': exception caught:" << std::endl;
+ std::cerr << e.what() << std::endl;
result = EXIT_FAILURE;
- }
+ }
catch (...)
- {
- std::cerr << "otbTestMain '" << testToRun << "': Unknown exception thrown !" << std::endl;
+ {
+ std::cerr << "otbTestMain '" << testToRun << "': unknown exception caught!" << std::endl;
result = EXIT_FAILURE;
- }
+ }
- if (result != EXIT_SUCCESS )
- {
- return -1;
- }
+ if (result != EXIT_SUCCESS)
+ {
+ return -1;
+ }
result = EXIT_SUCCESS;
diff --git a/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx b/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
index 6c06362daa..bed8cd21dc 100644
--- a/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
+++ b/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
@@ -179,7 +179,7 @@ bool CommandLineLauncher::ExecuteAndWriteOutput()
{
m_Application->GetLogger()->Debug("Caught otb::ImageFileReaderException during application execution:\n");
m_Application->GetLogger()->Debug(string(err.what()) + "\n");
- m_Application->GetLogger()->Fatal(string("Cannot open image ") + err.m_Filename + string(". ") + err.GetDescription() + string("\n"));
+ m_Application->GetLogger()->Fatal(err.GetDescription() + string("\n"));
return false;
}
catch(itk::ExceptionObject& err)
diff --git a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetModel.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetModel.cxx
index 05a1d3f394..6803a55511 100644
--- a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetModel.cxx
+++ b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetModel.cxx
@@ -73,27 +73,26 @@ QtWidgetModel
{
m_Application->GetLogger()->Debug("Caught otb::ApplicationException during application update:\n");
m_Application->GetLogger()->Debug(string(err.what()) + "\n");
- emit ExceptionRaised( err.what() );
+ emit ExceptionRaised(err.what());
}
catch(otb::ImageFileReaderException& err)
{
m_Application->GetLogger()->Debug("Caught otb::ImageFileReaderException during application update:\n");
m_Application->GetLogger()->Debug(string(err.what()) + "\n");
- string message( string("Cannot open image ") + err.m_Filename + string(". ") + err.GetDescription() );
- m_Application->GetLogger()->Fatal( message + string("\n"));
- emit ExceptionRaised( message.c_str() );
+ m_Application->GetLogger()->Fatal(err.GetDescription() + string("\n"));
+ emit ExceptionRaised(err.what());
}
catch(itk::ExceptionObject& err)
{
m_Application->GetLogger()->Debug("Caught itk::ExceptionObject during application update:\n");
m_Application->GetLogger()->Debug(string(err.what()) + "\n");
m_Application->GetLogger()->Fatal(string(err.GetDescription()) + "\n");
- emit ExceptionRaised( err.GetDescription() );
+ emit ExceptionRaised(err.GetDescription());
}
catch(std::exception& err)
{
m_Application->GetLogger()->Fatal(string("Caught std::exception during application update: ") + err.what() + "\n");
- emit ExceptionRaised( err.what() );
+ emit ExceptionRaised(err.what());
}
catch(...)
{
@@ -305,8 +304,8 @@ AppliThread
{
m_Application->GetLogger()->Debug("Caught otb::ImageFileReaderException during application execution:\n");
m_Application->GetLogger()->Debug(string(err.what()) + "\n");
- m_Application->GetLogger()->Fatal(string("Cannot open image ") + err.m_Filename + string(". ") + err.GetDescription() + string("\n"));
- emit ExceptionRaised( err.what() );
+ m_Application->GetLogger()->Fatal(err.GetDescription() + string("\n"));
+ emit ExceptionRaised(err.what());
}
catch(itk::ProcessAborted& /*err*/)
{
diff --git a/Modules/Wrappers/SWIG/src/itkBase.i b/Modules/Wrappers/SWIG/src/itkBase.i
index e02857dcc7..60e352a8a8 100644
--- a/Modules/Wrappers/SWIG/src/itkBase.i
+++ b/Modules/Wrappers/SWIG/src/itkBase.i
@@ -31,7 +31,7 @@
$action
} catch(otb::ImageFileReaderException& err) {
std::ostringstream oss;
- oss << "Cannot open image " << err.m_Filename + ". " + err.GetDescription();
+ oss << err.GetDescription();
SWIG_exception( SWIG_RuntimeError, oss.str().c_str() );
} catch( itk::ExceptionObject &ex ) {
std::ostringstream oss;
--
GitLab