From 335e34a11f312252fe7aa79d30ff4250289a2109 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Thu, 7 Feb 2019 11:33:17 +0100
Subject: [PATCH] ENH: move ImageFileReaderException to separate file
---
.../IO/ImageIO/include/otbImageFileReader.h | 25 +--------
.../include/otbImageFileReaderException.h | 54 +++++++++++++++++++
.../src/otbImageFileReaderException.cxx | 36 +++++++++++++
3 files changed, 91 insertions(+), 24 deletions(-)
create mode 100644 Modules/IO/ImageIO/include/otbImageFileReaderException.h
create mode 100644 Modules/IO/ImageIO/src/otbImageFileReaderException.cxx
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h
index 59f791f9a2..126aa251d8 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.h
@@ -37,35 +37,12 @@
#include "otbDefaultConvertPixelTraits.h"
#include "otbImageKeywordlist.h"
#include "otbExtendedFilenameToReaderOptions.h"
+#include "otbImageFileReaderException.h"
#include <string>
namespace otb
{
-/** \class ImageFileReaderException
- *
- * \brief Base exception class for IO conflicts.
- *
- * \ingroup OTBImageIO
- */
-class ImageFileReaderException : public itk::ExceptionObject
-{
-public:
- /** Run-time information. */
- itkTypeMacro( ImageFileReaderException, ExceptionObject );
-
- /** Constructor. */
- ImageFileReaderException(const char *file, unsigned int line,
- const std::string& desc = "",
- const std::string& filename = "") :
- ExceptionObject(file, line, desc),
- m_Filename(filename)
- {
- }
-
- std::string m_Filename;
-};
-
/** \class ImageFileReader
* \brief Reads image data.
*
diff --git a/Modules/IO/ImageIO/include/otbImageFileReaderException.h b/Modules/IO/ImageIO/include/otbImageFileReaderException.h
new file mode 100644
index 0000000000..46e8c55c3f
--- /dev/null
+++ b/Modules/IO/ImageIO/include/otbImageFileReaderException.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ * https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef otbImageFileReaderException_h
+#define otbImageFileReaderException_h
+
+#include "itkMacro.h"
+#include "OTBImageIOExport.h"
+
+namespace otb
+{
+
+/** \class ImageFileReaderException
+ *
+ * \brief Base exception class for IO conflicts.
+ *
+ * \ingroup OTBImageIO
+ */
+class OTBImageIO_EXPORT ImageFileReaderException : public itk::ExceptionObject
+{
+public:
+ /** Run-time information. */
+ itkTypeMacro( ImageFileReaderException, ExceptionObject );
+
+ /** Constructor. */
+ ImageFileReaderException(const char *file, unsigned int line,
+ const std::string& desc = "",
+ const std::string& filename = "");
+
+ /** Destructor. */
+ ~ImageFileReaderException();
+
+ std::string m_Filename;
+};
+}
+
+#endif
diff --git a/Modules/IO/ImageIO/src/otbImageFileReaderException.cxx b/Modules/IO/ImageIO/src/otbImageFileReaderException.cxx
new file mode 100644
index 0000000000..b4961600a4
--- /dev/null
+++ b/Modules/IO/ImageIO/src/otbImageFileReaderException.cxx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ * https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbImageFileReaderException.h"
+
+namespace otb {
+
+ImageFileReaderException::ImageFileReaderException(const char *file, unsigned int line,
+ const std::string& desc,
+ const std::string& filename) :
+ ExceptionObject(file, line, desc),
+ m_Filename(filename)
+{
+}
+
+ImageFileReaderException::~ImageFileReaderException()
+{
+}
+}
--
GitLab