From a7cb42575585167ca752f55d9169c942943b128d Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 14 Sep 2018 16:10:34 +0200
Subject: [PATCH] BUG: #1692: deprecate Mapnik related modules
---
.../VectorDataRendering/include/otbMapnikAdapter.h | 2 +-
.../VectorDataRendering/include/otbVectorDataStyle.h | 4 +++-
.../VectorDataRendering/include/otbVectorDataToMapFilter.h | 7 ++++---
Modules/Filtering/VectorDataRendering/otb-module.cmake | 2 ++
Modules/ThirdParty/Mapnik/otb-module.cmake | 4 +++-
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h b/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h
index c71eb4e133..4d67d5d368 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h
@@ -61,7 +61,7 @@ typedef Image32 image_32;
namespace otb
{
-namespace mapnik_otb
+namespace [[deprecated]] mapnik_otb
{
// this should be removed once mapnik support for version < 2.0 is dropped.
// should be around 01/2013.
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
index 39787388ea..c750dc4436 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
@@ -42,10 +42,12 @@ namespace otb
*
* \sa VectorDataToMapFilter
*
+ * \deprecated
+ *
* \ingroup OTBVectorDataRendering
*/
-class ITK_EXPORT VectorDataStyle : public itk::LightObject
+class [[deprecated]] VectorDataStyle : public itk::LightObject
{
public:
/** Standard class typedefs. */
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
index 4bc29e139f..67d3a2e820 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
@@ -68,12 +68,13 @@ namespace otb
* otb::Image< itk::RGBAPixel<InternalPixelType> >,
* otb::Image< itk::RGBPixel<InternalPixelType> >.
*
- *
- * \ingroup OTBVectorDataRendering
+ * \deprecated
+ *
+ * \ingroup OTBVectorDataRendering
*/
template <class TVectorData, class TImage>
-class ITK_EXPORT VectorDataToMapFilter : public itk::ImageSource<TImage>
+class [[deprecated]] VectorDataToMapFilter : public itk::ImageSource<TImage>
{
public:
/** Standard class typedefs. */
diff --git a/Modules/Filtering/VectorDataRendering/otb-module.cmake b/Modules/Filtering/VectorDataRendering/otb-module.cmake
index 4953d8191c..4251586660 100644
--- a/Modules/Filtering/VectorDataRendering/otb-module.cmake
+++ b/Modules/Filtering/VectorDataRendering/otb-module.cmake
@@ -37,6 +37,8 @@ otb_module(OTBVectorDataRendering
OTBVectorDataIO
OTBImageBase
+ DEPRECATED
+
DESCRIPTION
"${DOCUMENTATION}"
)
diff --git a/Modules/ThirdParty/Mapnik/otb-module.cmake b/Modules/ThirdParty/Mapnik/otb-module.cmake
index 34ee5c29dd..dc2bb04a0f 100644
--- a/Modules/ThirdParty/Mapnik/otb-module.cmake
+++ b/Modules/ThirdParty/Mapnik/otb-module.cmake
@@ -24,7 +24,9 @@ otb_module(OTBMapnik
DEPENDS
TEST_DEPENDS
-
+
+ DEPRECATED
+
DESCRIPTION
"${DOCUMENTATION}"
)
--
GitLab