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

FIX: LSGRM to pass TestHeader test

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