From f50ceba2cb9860c7cebaf8057e5c032593ef8cc6 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <mohammed.rashad-km@cnes.fr>
Date: Mon, 2 Jun 2014 16:39:59 +0200
Subject: [PATCH] COMP: MSVC and MinGW - export only static member functions
instead of class
---
.../otbWrapperElevationParametersHandler.h | 16 ++++++++--------
.../otbWrapperMapProjectionParametersHandler.h | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Code/ApplicationEngine/otbWrapperElevationParametersHandler.h b/Code/ApplicationEngine/otbWrapperElevationParametersHandler.h
index 6cede3f495..bc6ef2f57f 100644
--- a/Code/ApplicationEngine/otbWrapperElevationParametersHandler.h
+++ b/Code/ApplicationEngine/otbWrapperElevationParametersHandler.h
@@ -38,23 +38,23 @@ namespace Wrapper
*
*/
-class ITK_ABI_EXPORT ElevationParametersHandler
+class ElevationParametersHandler
{
public:
/**
* Add a Group containing several choices for map projections
*
*/
- static void AddElevationParameters(Application::Pointer app, const std::string & key);
+ static ITK_ABI_EXPORT void AddElevationParameters(Application::Pointer app, const std::string & key);
/** Method for getting the value of the elevation mode selected */
- static float GetDefaultElevation(const Application::Pointer app, const std::string& key);
- static const std::string GetGeoidFile(const Application::Pointer app, const std::string& key);
- static const std::string GetDEMDirectory(const Application::Pointer app, const std::string& key);
- static bool IsGeoidUsed(const Application::Pointer app, const std::string& key);
- static bool IsDEMUsed(const Application::Pointer app, const std::string & key);
+ static ITK_ABI_EXPORT float GetDefaultElevation(const Application::Pointer app, const std::string& key);
+ static ITK_ABI_EXPORT const std::string GetGeoidFile(const Application::Pointer app, const std::string& key);
+ static ITK_ABI_EXPORT const std::string GetDEMDirectory(const Application::Pointer app, const std::string& key);
+ static ITK_ABI_EXPORT bool IsGeoidUsed(const Application::Pointer app, const std::string& key);
+ static ITK_ABI_EXPORT bool IsDEMUsed(const Application::Pointer app, const std::string & key);
- static void SetupDEMHandlerFromElevationParameters(const Application::Pointer app, const std::string& key);
+ static ITK_ABI_EXPORT void SetupDEMHandlerFromElevationParameters(const Application::Pointer app, const std::string& key);
protected:
ElevationParametersHandler(); // not implemented
diff --git a/Code/ApplicationEngine/otbWrapperMapProjectionParametersHandler.h b/Code/ApplicationEngine/otbWrapperMapProjectionParametersHandler.h
index 198ec032ba..b2edd31736 100644
--- a/Code/ApplicationEngine/otbWrapperMapProjectionParametersHandler.h
+++ b/Code/ApplicationEngine/otbWrapperMapProjectionParametersHandler.h
@@ -43,21 +43,21 @@ enum
* This class allow creating a Group with several mapProjection
* parameters
*/
-class ITK_ABI_EXPORT MapProjectionParametersHandler
+class MapProjectionParametersHandler
{
public:
/**
* Add a Group containing several choices for map projections
*
*/
- static void AddMapProjectionParameters(Application::Pointer app, const std::string & key);
+ static ITK_ABI_EXPORT void AddMapProjectionParameters(Application::Pointer app, const std::string & key);
/**
* Helper method : Compute the ProjectionRef knowing the map
* projection picked up by the user
*
*/
- static const std::string GetProjectionRefFromChoice(const Application::Pointer app,
+ static ITK_ABI_EXPORT const std::string GetProjectionRefFromChoice(const Application::Pointer app,
const std::string & key);
@@ -67,7 +67,7 @@ public:
* The key must be totally if the InputImageParameter belongs
* to a ParamaterGroup, ie set io.in
*/
- static void InitializeUTMParameters(Application::Pointer app,
+ static ITK_ABI_EXPORT void InitializeUTMParameters(Application::Pointer app,
const std::string & imageKey,
const std::string & mapKey );
--
GitLab