Commit 8eceb315 authored by remi cresson's avatar remi cresson

FIX: LSGRM to pass TestHeader test

parent bca09fa5
#ifndef __LSRM_BAATZ_SEGMENTER_H #ifndef __LSGRM_BAATZ_SEGMENTER_H
#define __LSRM_BAATZ_SEGMENTER_H #define __LSGRM_BAATZ_SEGMENTER_H
#include "lsgrmSegmenter.h" #include "lsgrmSegmenter.h"
#include "grmBaatzSegmenter.h" #include "grmBaatzSegmenter.h"
......
#ifndef __LSRM_BAATZ_SEGMENTER_TXX #ifndef __LSGRM_BAATZ_SEGMENTER_TXX
#define __LSRM_BAATZ_SEGMENTER_TXX #define __LSGRM_BAATZ_SEGMENTER_TXX
#include <otbImageFileReader.h> #include "lsgrmBaatzSegmenter.h"
#include <itkImageRegionIterator.h>
namespace lsgrm namespace lsgrm
{ {
......
#ifndef __LSGRM_CONTROLLER_TXX
#define __LSGRM_CONTROLLER_TXX
#include "lsgrmController.h" #include "lsgrmController.h"
namespace lsgrm namespace lsgrm
...@@ -457,3 +459,4 @@ std::vector<std::string> Controller<TSegmenter>::GetTemporaryFilesList() ...@@ -457,3 +459,4 @@ std::vector<std::string> Controller<TSegmenter>::GetTemporaryFilesList()
} }
} // end of namespace lsgrm } // end of namespace lsgrm
#endif
#ifndef __LSRM_FLS_SEGMENTER_H #ifndef __LGSRM_FLS_SEGMENTER_H
#define __LSRM_FLS_SEGMENTER_H #define __LGSRM_FLS_SEGMENTER_H
#include "lsgrmSegmenter.h" #include "lsgrmSegmenter.h"
#include "grmFullLambdaScheduleSegmenter.h" #include "grmFullLambdaScheduleSegmenter.h"
...@@ -28,6 +28,3 @@ public: ...@@ -28,6 +28,3 @@ public:
} // end of namespace lsrm } // end of namespace lsrm
#include "lsgrmFullLambdaScheduleSegmenter.txx" #include "lsgrmFullLambdaScheduleSegmenter.txx"
#endif #endif
#ifndef __LSRM_FLS_SEGMENTER_TXX #ifndef __LSGRM_FLS_SEGMENTER_TXX
#define __LSRM_FLS_SEGMENTER_TXX #define __LSGRM_FLS_SEGMENTER_TXX
#include <otbImageFileReader.h> #include "lsgrmFullLambdaScheduleSegmenter.h"
#include <itkImageRegionIterator.h>
namespace lsgrm namespace lsgrm
{ {
...@@ -47,10 +45,3 @@ FullLambdaScheduleSegmenter<TImage>::GetSpecificAttributesMemory(NodePointerType ...@@ -47,10 +45,3 @@ FullLambdaScheduleSegmenter<TImage>::GetSpecificAttributesMemory(NodePointerType
} // end of namespace lsrm } // end of namespace lsrm
#endif #endif
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
* License: Creative Commons Attribution 3.0 Unported License * License: Creative Commons Attribution 3.0 Unported License
* http://creativecommons.org/licenses/by/3.0/deed.en_US * http://creativecommons.org/licenses/by/3.0/deed.en_US
*/ */
#ifndef __LSGRM_GETINTERNALMEMORY_H
#define __LSGRM_GETINTERNALMEMORY_H
#if defined(_WIN32) #if defined(_WIN32)
#include <Windows.h> #include <Windows.h>
...@@ -94,3 +97,5 @@ size_t getMemorySize( ) ...@@ -94,3 +97,5 @@ size_t getMemorySize( )
return 0L; /* Unknown OS. */ return 0L; /* Unknown OS. */
#endif #endif
} }
#endif
#ifndef __LSGRM_GRAPH_OPERATIONS_TXX
#define __LSGRM_GRAPH_OPERATIONS_TXX
//#include "lsgrmGraphOperations.h" //#include "lsgrmGraphOperations.h"
//#include <unistd.h> //#include <unistd.h>
#include <cstdio> #include <cstdio>
...@@ -1036,3 +1038,4 @@ void RescaleGraph(typename TSegmenter::GraphType& graph, ...@@ -1036,3 +1038,4 @@ void RescaleGraph(typename TSegmenter::GraphType& graph,
} }
} }
#endif
#ifndef __LSRM_SEGMENTER_H #ifndef __LSGRM_SEGMENTER_H
#define __LSRM_SEGMENTER_H #define __LSGRM_SEGMENTER_H
// Check windows // Check windows
#if _WIN32 || _WIN64 #if _WIN32 || _WIN64
......
#ifndef __LSGRM_SPLITTER_TXX
#define __LSGRM_SPLITTER_TXX
#include "lsgrmSplitter.h" #include "lsgrmSplitter.h"
namespace lsgrm namespace lsgrm
...@@ -175,3 +177,4 @@ std::vector<ProcessingTile> SplitOTBImage(TInputImage * imagePtr, // input image ...@@ -175,3 +177,4 @@ std::vector<ProcessingTile> SplitOTBImage(TInputImage * imagePtr, // input image
return tiles; return tiles;
} }
} // end of namespace lsgrm } // end of namespace lsgrm
#endif
#ifndef __LSRM_Spring_SEGMENTER_TXX #ifndef __LSRM_Spring_SEGMENTER_TXX
#define __LSRM_Spring_SEGMENTER_TXX #define __LSRM_Spring_SEGMENTER_TXX
#include <otbImageFileReader.h> #include "lsgrmSpringSegmenter.h"
#include <itkImageRegionIterator.h>
namespace lsgrm namespace lsgrm
{ {
......
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