[otb] 05/07: Add patch to support both ITK 4.8 and ITK 4.9.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository otb.

commit 7c6660d8c017d34e085c18b1299fe650b38d13e8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 12 17:41:20 2016 +0100

    Add patch to support both ITK 4.8 and ITK 4.9.
---
 debian/changelog                 |  1 +
 debian/patches/itk-4.8-4.9.patch | 56 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 22c8639..ddbdaa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ otb (5.2.1+dfsg-1) UNRELEASED; urgency=medium
   * Fix 'existing' typo in package description.
   * Add patch for various spelling errors.
   * Update symbols for amd64.
+  * Add patch to support both ITK 4.8 and ITK 4.9.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 11 Feb 2016 21:20:55 +0100
 
diff --git a/debian/patches/itk-4.8-4.9.patch b/debian/patches/itk-4.8-4.9.patch
new file mode 100644
index 0000000..2ed0984
--- /dev/null
+++ b/debian/patches/itk-4.8-4.9.patch
@@ -0,0 +1,56 @@
+Description: Support both ITK 4.8 and ITK 4.9.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://bugs.orfeo-toolbox.org/view.php?id=1142
+
+--- a/Modules/Core/Common/include/otbConfigurationManager.h
++++ b/Modules/Core/Common/include/otbConfigurationManager.h
+@@ -18,7 +18,11 @@
+ #ifndef _otbConfigurationManager_h
+ #define _otbConfigurationManager_h
+ 
++#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
++#include "itksys/FundamentalType.h"
++#else
+ #include "itk_kwiml.h"
++#endif
+ 
+ #include <string>
+ #include <boost/cstdint.hpp>
+@@ -38,7 +42,11 @@ namespace otb
+ class ConfigurationManager
+ {
+ public:
++#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
++  typedef ::itksysFundamentalType_UInt64 RAMValueType;
++#else
+   typedef KWIML_INT_uint64_t RAMValueType;
++#endif
+ 
+   /**
+    * DEMDirectory is a directory were DEM tiles are stored. 
+--- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
++++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+@@ -19,7 +19,11 @@
+ #define __otbPipelineMemoryPrintCalculator_h
+ 
+ #include "itkProcessObject.h"
++#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
++#include "itksys/FundamentalType.h"
++#else
+ #include "itk_kwiml.h"
++#endif
+ #include <set>
+ 
+ namespace otb
+@@ -75,7 +79,11 @@ public:
+   typedef ProcessObjectType::Pointer          ProcessObjectPointerType;
+   typedef itk::DataObject                     DataObjectType;
+   typedef DataObjectType::Pointer             DataObjectPointerType;
++#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
++  typedef ::itksysFundamentalType_UInt64      MemoryPrintType;
++#else
+   typedef KWIML_INT_uint64_t                  MemoryPrintType;
++#endif
+   typedef std::set<const ProcessObjectType *> ProcessObjectPointerSetType;
+ 
+   /** Run-time type information (and related methods). */
diff --git a/debian/patches/series b/debian/patches/series
index be86988..0b7ba31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch
 spelling-errors.patch
+itk-4.8-4.9.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git