Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
9dbefc8d
Commit
9dbefc8d
authored
Feb 12, 2016
by
Manuel Grizonnet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: OTB 5.2 not compatible with ITK 4.9 (mantis 1142)
(cherry picked from commit
c7b301d7
)
parent
38fbcee8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Modules/Core/Common/include/otbConfigurationManager.h
Modules/Core/Common/include/otbConfigurationManager.h
+2
-2
Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
...Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+2
-2
No files found.
Modules/Core/Common/include/otbConfigurationManager.h
View file @
9dbefc8d
...
...
@@ -18,7 +18,7 @@
#ifndef _otbConfigurationManager_h
#define _otbConfigurationManager_h
#include "itk
sys/FundamentalType
.h"
#include "itk
_kwiml
.h"
#include <string>
#include <boost/cstdint.hpp>
...
...
@@ -38,7 +38,7 @@ namespace otb
class
ConfigurationManager
{
public:
typedef
::
itksysFundamentalType_UI
nt64
RAMValueType
;
typedef
KWIML_INT_ui
nt64
_t
RAMValueType
;
/**
* DEMDirectory is a directory were DEM tiles are stored.
...
...
Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
View file @
9dbefc8d
...
...
@@ -19,7 +19,7 @@
#define __otbPipelineMemoryPrintCalculator_h
#include "itkProcessObject.h"
#include "itk
sys/FundamentalType
.h"
#include "itk
_kwiml
.h"
#include <set>
namespace
otb
...
...
@@ -75,7 +75,7 @@ public:
typedef
ProcessObjectType
::
Pointer
ProcessObjectPointerType
;
typedef
itk
::
DataObject
DataObjectType
;
typedef
DataObjectType
::
Pointer
DataObjectPointerType
;
typedef
::
itksysFundamentalType_UInt64
MemoryPrintType
;
typedef
KWIML_INT_uint64_t
MemoryPrintType
;
typedef
std
::
set
<
const
ProcessObjectType
*>
ProcessObjectPointerSetType
;
/** Run-time type information (and related methods). */
...
...
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