Commit 643d275c authored by Guillaume Pasero's avatar Guillaume Pasero

BUG: fix export macros in ImageBase

parent c5957369
......@@ -24,6 +24,7 @@
#include <complex>
#include "itkObject.h"
#include "OTBImageBaseExport.h"
namespace otb
{
......@@ -46,7 +47,7 @@ template <
typename OutputPixelType,
class OutputConvertTraits
>
class ConvertPixelBuffer
class OTBImageBase_EXPORT_TEMPLATE ConvertPixelBuffer
{
public:
/** Determine the output data type. */
......
......@@ -22,13 +22,14 @@
#define otbDefaultConvertPixelTraits_h
#include "itkDefaultConvertPixelTraits.h"
#include "OTBImageBaseExport.h"
namespace otb
{
template < typename PixelType>
class DefaultConvertPixelTraits
class OTBImageBase_EXPORT_TEMPLATE DefaultConvertPixelTraits
: public itk::DefaultConvertPixelTraits < PixelType >
{
public:
......
......@@ -24,6 +24,7 @@
#include "otbExtractROIBase.h"
#include "otbImage.h"
#include "itkMacro.h"
#include "OTBImageBaseExport.h"
namespace otb
{
......@@ -39,7 +40,7 @@ namespace otb
* \ingroup OTBImageBase
*/
template <class TInputPixel, class TOutputPixel>
class ITK_EXPORT ExtractROI :
class OTBImageBase_EXPORT_TEMPLATE ExtractROI :
public ExtractROIBase<Image<TInputPixel, 2>, Image<TOutputPixel, 2> >
{
public:
......
......@@ -45,7 +45,7 @@ namespace otb
* \ingroup OTBImageBase
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ExtractROIBase :
class ExtractROIBase :
public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
......
......@@ -24,7 +24,7 @@
#include "itkImageFunction.h"
#include "otbVariableLengthVectorConverter.h"
#include "OTBImageBaseExport.h"
#include <complex>
......@@ -46,7 +46,7 @@ namespace otb
*/
template< class TInternalImageFunctionType, class TOutputPrecision = double >
class ITK_EXPORT ImageFunctionAdaptor :
class OTBImageBase_EXPORT_TEMPLATE ImageFunctionAdaptor :
public itk::ImageFunction< typename TInternalImageFunctionType::InputImageType,
itk::VariableLengthVector<TOutputPrecision>,
typename TInternalImageFunctionType::CoordRepType >
......
......@@ -24,6 +24,7 @@
#include "otbExtractROIBase.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "OTBImageBaseExport.h"
#include "itkMacro.h"
......@@ -37,7 +38,7 @@ namespace otb
* \ingroup OTBImageBase
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ImageOfVectorsToMonoChannelExtractROI :
class OTBImageBase_EXPORT_TEMPLATE ImageOfVectorsToMonoChannelExtractROI :
public ExtractROIBase<TInputImage, TOutputImage>
{
public:
......
......@@ -24,6 +24,7 @@
#include "itkFunctionBase.h"
#include "itkPoint.h"
#include "itkVariableLengthVector.h"
#include "OTBImageBaseExport.h"
#include <vector>
......@@ -44,7 +45,7 @@ namespace otb
* \ingroup OTBImageBase
*/
template <class TOutputPrecision = double, class TCoordRep = double>
class ITK_EXPORT MetaImageFunction
class OTBImageBase_EXPORT_TEMPLATE MetaImageFunction
: public itk::FunctionBase<itk::Point<TCoordRep, 2>,
itk::VariableLengthVector<TOutputPrecision> >
{
......
......@@ -23,6 +23,7 @@
#include "otbExtractROIBase.h"
#include "otbVectorImage.h"
#include "OTBImageBaseExport.h"
#include "itkMacro.h"
#include <vector>
......@@ -43,7 +44,7 @@ namespace otb
* \ingroup OTBImageBase
*/
template <class TInputPixelType, class TOutputPixelType>
class ITK_EXPORT MultiChannelExtractROI :
class OTBImageBase_EXPORT_TEMPLATE MultiChannelExtractROI :
public ExtractROIBase<VectorImage<TInputPixelType, 2>, VectorImage<TOutputPixelType, 2> >
{
public:
......
......@@ -24,6 +24,7 @@
#include "otbExtractROIBase.h"
#include "otbImage.h"
#include "otbVectorImage.h"
#include "OTBImageBaseExport.h"
#include "itkMacro.h"
......@@ -42,7 +43,7 @@ namespace otb
* \ingroup OTBImageBase
*/
template <class TInputPixelType, class TOutputPixelType>
class ITK_EXPORT MultiToMonoChannelExtractROI :
class OTBImageBase_EXPORT_TEMPLATE MultiToMonoChannelExtractROI :
// public ExtractROIBase< itk::VectorImage<TInputPixelType, 2> , itk::Image<TOutputPixelType, 2> >
public ExtractROIBase<VectorImage<TInputPixelType, 2>, Image<TOutputPixelType, 2> >
{
......
......@@ -24,7 +24,7 @@
#include <algorithm>
#include <iomanip>
#include "OTBImageBaseExport.h"
#include "otbImageKeywordlist.h"
#include "itkImageRegion.h"
#include <string>
......@@ -56,7 +56,7 @@ namespace otb
*/
template <class TType>
class ITK_EXPORT RemoteSensingRegion : public itk::Region
class OTBImageBase_EXPORT_TEMPLATE RemoteSensingRegion : public itk::Region
{
public:
/** Standard class typedefs. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment