From b8f90a5930001f77ceba411206b1993aa9ac4265 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 2 Oct 2015 19:23:13 +0200
Subject: [PATCH] BUG: wrong conflict resolution breaks #983 fix

---
 .../Core/Common/include/otbImageRegionAdaptativeSplitter.txx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
index 837f54be00..ef5b28192b 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
@@ -112,8 +112,8 @@ ImageRegionAdaptativeSplitter<VImageDimension>
   // First, we need to get which tiles are covered by ROI
   firstTileCovered[0] = m_ImageRegion.GetIndex()[0] / m_TileHint[0];
   firstTileCovered[1] = m_ImageRegion.GetIndex()[1] / m_TileHint[1];
-  tilesPerDim[0] = (m_ImageRegion.GetIndex()[0] + m_ImageRegion.GetSize()[0] -1 + m_TileHint[0] -1) / m_TileHint[0] - firstTileCovered[0];
-  tilesPerDim[1] = (m_ImageRegion.GetIndex()[1] + m_ImageRegion.GetSize()[1] -1 + m_TileHint[1] -1) / m_TileHint[1] - firstTileCovered[1];
+  tilesPerDim[0] = (m_ImageRegion.GetIndex()[0] + m_ImageRegion.GetSize()[0] + m_TileHint[0] -1) / m_TileHint[0] - firstTileCovered[0];
+  tilesPerDim[1] = (m_ImageRegion.GetIndex()[1] + m_ImageRegion.GetSize()[1] + m_TileHint[1] -1) / m_TileHint[1] - firstTileCovered[1];
   
   unsigned int totalTiles = tilesPerDim[0] * tilesPerDim[1];
 
-- 
GitLab