Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Cresson Remi
LSGRM
Commits
8eceb315
Commit
8eceb315
authored
Feb 20, 2017
by
remi cresson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX: LSGRM to pass TestHeader test
parent
bca09fa5
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
29 deletions
+27
-29
include/lsgrmBaatzSegmenter.h
include/lsgrmBaatzSegmenter.h
+2
-2
include/lsgrmBaatzSegmenter.txx
include/lsgrmBaatzSegmenter.txx
+3
-5
include/lsgrmController.txx
include/lsgrmController.txx
+3
-0
include/lsgrmFullLambdaScheduleSegmenter.h
include/lsgrmFullLambdaScheduleSegmenter.h
+2
-5
include/lsgrmFullLambdaScheduleSegmenter.txx
include/lsgrmFullLambdaScheduleSegmenter.txx
+3
-12
include/lsgrmGetInternalMemory.h
include/lsgrmGetInternalMemory.h
+5
-0
include/lsgrmGraphOperations.txx
include/lsgrmGraphOperations.txx
+3
-0
include/lsgrmSegmenter.h
include/lsgrmSegmenter.h
+2
-2
include/lsgrmSplitter.txx
include/lsgrmSplitter.txx
+3
-0
include/lsgrmSpringSegmenter.txx
include/lsgrmSpringSegmenter.txx
+1
-3
No files found.
include/lsgrmBaatzSegmenter.h
View file @
8eceb315
#ifndef __LSRM_BAATZ_SEGMENTER_H
#define __LSRM_BAATZ_SEGMENTER_H
#ifndef __LS
G
RM_BAATZ_SEGMENTER_H
#define __LS
G
RM_BAATZ_SEGMENTER_H
#include "lsgrmSegmenter.h"
#include "grmBaatzSegmenter.h"
...
...
include/lsgrmBaatzSegmenter.txx
View file @
8eceb315
#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
{
...
...
include/lsgrmController.txx
View file @
8eceb315
#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
include/lsgrmFullLambdaScheduleSegmenter.h
View file @
8eceb315
#ifndef __LSRM_FLS_SEGMENTER_H
#define __LSRM_FLS_SEGMENTER_H
#ifndef __L
G
SRM_FLS_SEGMENTER_H
#define __L
G
SRM_FLS_SEGMENTER_H
#include "lsgrmSegmenter.h"
#include "grmFullLambdaScheduleSegmenter.h"
...
...
@@ -28,6 +28,3 @@ public:
}
// end of namespace lsrm
#include "lsgrmFullLambdaScheduleSegmenter.txx"
#endif
include/lsgrmFullLambdaScheduleSegmenter.txx
View file @
8eceb315
#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
include/lsgrmGetInternalMemory.h
View file @
8eceb315
...
...
@@ -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
include/lsgrmGraphOperations.txx
View file @
8eceb315
#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
include/lsgrmSegmenter.h
View file @
8eceb315
#ifndef __LSRM_SEGMENTER_H
#define __LSRM_SEGMENTER_H
#ifndef __LS
G
RM_SEGMENTER_H
#define __LS
G
RM_SEGMENTER_H
// Check windows
#if _WIN32 || _WIN64
...
...
include/lsgrmSplitter.txx
View file @
8eceb315
#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
include/lsgrmSpringSegmenter.txx
View file @
8eceb315
#ifndef __LSRM_Spring_SEGMENTER_TXX
#define __LSRM_Spring_SEGMENTER_TXX
#include <otbImageFileReader.h>
#include <itkImageRegionIterator.h>
#include "lsgrmSpringSegmenter.h"
namespace lsgrm
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment