COMP: add export macro for OTBIce

Modules/Visualization/Ice/include/otbFragmentShader.h

@@ -18,13 +18,15 @@
 #ifndef otb_FragmentShader_h
 #define otb_FragmentShader_h
 
-#include "itkObject.h"
-#include "itkPoint.h"
+#include "OTBIceExport.h"
+
+#include <itkObject.h>
+#include <itkPoint.h>
 
 namespace otb
 {
 
-class FragmentShader 
+class OTBIce_EXPORT FragmentShader
   : public itk::Object
 {
 public:

Modules/Visualization/Ice/include/otbGeoInterface.h

@@ -18,10 +18,10 @@
 #ifndef otb_GeoInterface_h
 #define otb_GeoInterface_h
 
+#include <itkFloatTypes.h>
+#include <itkPoint.h>
 
-#include "itkFloatTypes.h"
-#include "itkPoint.h"
-
+#include "OTBIceExport.h"
 
 namespace otb
 {
@@ -44,7 +44,7 @@ class ImageKeywordlist;
  * otb::GeoInterface::Point2d. Derived otb::GlActor classes must
  * implement double-prevision methods.
  */
-class GeoInterface
+class OTBIce_EXPORT GeoInterface
 {
 public:
   /**

Modules/Visualization/Ice/include/otbGlVersionChecker.h

@@ -18,10 +18,12 @@
 #ifndef otb_GlVersionChecker_h
 #define otb_GlVersionChecker_h
 
+#include "OTBIceExport.h"
+
 namespace otb
 {
 
-class GlVersionChecker
+class OTBIce_EXPORT GlVersionChecker
 {
 public:
 
@@ -44,7 +46,7 @@ public:
    * than GL_NO_ERROR.
    */
   static const char * GLVersion();
-  
+
   /**
    * \return The OpenGL Shading-Language version used at runtime. The
    * call to this method requires a valid OpenGL rendering context. An
@@ -109,7 +111,7 @@ private:
   static bool SplitVersion( const char * version,
                             int& major,
                             int& minor,
-                            int& release );  
+                            int& release );
 };
 
 } // End namespace otb

Modules/Visualization/Ice/include/otbNonOptGlImageActor.h

 #ifndef otb_NonOptGlImageActor_h
 #define otb_NonOptGlImageActor_h
 
-#include "otbGlActor.h"
-
 #include "otbVectorImage.h"
 #include "otbMultiChannelExtractROI.h"
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbGenericRSTransform.h"
 
+#include "otbGlActor.h"
 
 namespace otb
 {
 
-class NonOptGlImageActor 
+class OTBIce_EXPORT NonOptGlImageActor
   : public GlActor
 {
 public:
@@ -52,7 +51,7 @@ public:
   const SpacingType & GetSpacing() const;
 
   std::string GetWkt() const;
-  
+
   ImageKeywordlistType GetKwl() const;
 
   itkSetMacro(UseShader,bool);
@@ -71,7 +70,7 @@ public:
   itkSetMacro(MaxBlue,double);
   itkGetMacro(MaxRed,double);
   itkGetMacro(MaxGreen,double);
-  itkGetMacro(MaxBlue,double);  
+  itkGetMacro(MaxBlue,double);
 
   itkSetMacro(RedIdx,unsigned int);
   itkGetMacro(RedIdx,unsigned int);
@@ -84,7 +83,7 @@ public:
 
 protected:
   NonOptGlImageActor();
-  
+
   virtual ~NonOptGlImageActor();
 
   typedef ImageFileReader<VectorImageType>                                        ReaderType;
@@ -143,8 +142,8 @@ protected:
     double m_MaxBlue;
   };
 
-  typedef std::vector<Tile>                                                       TileVectorType;    
-  
+  typedef std::vector<Tile>                                                       TileVectorType;
+
 private:
   // prevent implementation
   NonOptGlImageActor(const Self&);
@@ -152,7 +151,7 @@ private:
 
   // Load tile to GPU
   void LoadTile(Tile& tile);
-  
+
   // Unload tile from GPU
   void UnloadTile(Tile& tile);
 
@@ -176,11 +175,11 @@ private:
   void UpdateTransforms();
 
   static void InitShaders();
- 
+
    unsigned int m_TileSize;
 
   std::string m_FileName;
-  
+
   ReaderType::Pointer m_FileReader;
 
   TileVectorType m_LoadedTiles;
@@ -208,7 +207,7 @@ private:
   unsigned int m_NumberOfComponents;
 
   bool m_UseShader;
-  
+
   static unsigned int m_StandardShader;
   static unsigned int m_StandardShaderProgram;
   static bool m_ShaderInitialized;

Modules/Visualization/Ice/include/otbStandardShader.h

@@ -18,9 +18,7 @@
 #ifndef otb_StandardShader_h
 #define otb_StandardShader_h
 
-
-#include "itkObjectFactory.h"
-
+#include <itkObjectFactory.h>
 #include "otbFragmentShader.h"
 #include "otbImageSettings.h"
 
@@ -39,7 +37,7 @@ typedef enum
 } ShaderType;
 
 
-class StandardShader 
+class OTBIce_EXPORT StandardShader
   : public FragmentShader
 {
 public:
@@ -68,10 +66,10 @@ public:
 
   itkSetMacro(ChessboardSize,double);
   itkGetConstReferenceMacro(ChessboardSize,double);
-  
+
   itkSetMacro(SliderPosition,double);
   itkGetConstReferenceMacro(SliderPosition,double);
-  
+
   itkSetMacro(VerticalSlider,bool);
   itkGetMacro(VerticalSlider,bool);