From d0a467e00875761d0e8ab69f53fbf6f148066ef5 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Thu, 8 Dec 2011 19:07:48 +0100
Subject: [PATCH] COMP: fix compilation bug due to wrong macro use
---
Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.h | 4 +++-
Utilities/otbossimplugins/ossimPluginConstants.h | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.h b/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.h
index e993009410..0cef2f596d 100644
--- a/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.h
+++ b/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.h
@@ -12,6 +12,8 @@
#ifndef HermiteInterpolator_h
#define HermiteInterpolator_h
+#include <ossimPluginConstants.h>
+
namespace ossimplugins
{
@@ -21,7 +23,7 @@ namespace ossimplugins
* @brief Abstract interpolator
* @see Interpolate
*/
-class HermiteInterpolator
+class OSSIM_PLUGINS_DLL HermiteInterpolator
{
public:
/**
diff --git a/Utilities/otbossimplugins/ossimPluginConstants.h b/Utilities/otbossimplugins/ossimPluginConstants.h
index 3cbe0567dd..986f3ed10e 100644
--- a/Utilities/otbossimplugins/ossimPluginConstants.h
+++ b/Utilities/otbossimplugins/ossimPluginConstants.h
@@ -26,11 +26,11 @@
# define OSSIMPLUGINSEXPORT __declspec(dllexport)
# define OSSIMPLUGINSIMPORT __declspec(dllimport)
# ifdef OSSIMPLUGINSMAKINGDLL
-# define OSSIMPLUGINSDLLEXPORT OSSIMEXPORT
-# define OSSIM_PLUGINS_DLL OSSIMEXPORT
+# define OSSIMPLUGINSDLLEXPORT OSSIMPLUGINSEXPORT
+# define OSSIM_PLUGINS_DLL OSSIMPLUGINSEXPORT
# else
-# define OSSIMPLUGINSDLLEXPORT OSSIMIMPORT
-# define OSSIM_PLUGINS_DLL OSSIMIMPORT
+# define OSSIMPLUGINSDLLEXPORT OSSIMPLUGINSIMPORT
+# define OSSIM_PLUGINS_DLL OSSIMPLUGINSIMPORT
# endif
#else /* not #if defined(_MSC_VER) */
# define OSSIMPLUGINSEXPORT
--
GitLab