ENH: protection against different mask and image sizes

bed47153 · Guillaume Pasero · ab25bb11 · bed47153
Commit bed47153 authored Feb 16, 2016 by Guillaume Pasero
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.txx .../ImageManipulation/include/otbMaskedIteratorDecorator.txx +13 -4

No files found.
--- a/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.txx
+++ b/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.txx
@@ -19,6 +19,7 @@
 #define otbMaskedIteratorDecorator_hxx

 #include "otbMaskedIteratorDecorator.h"
+#include "otbMacro.h"

 namespace otb
 {
@@ -36,10 +37,18 @@ MaskedIteratorDecorator<TIteratorType,TMaskIteratorType>
    }
  else
    {
-    m_UseMask = true;
-    m_ItMask = TMaskIteratorType(mask,region);
-    m_StartMask = TMaskIteratorType(mask,region);
-    m_StartImage = TIteratorType(image,region);
+    if (image->GetLargestPossibleRegion() != mask->GetLargestPossibleRegion())
+      {
+      m_UseMask = false;
+      otbWarningMacro("Input image and mask have different largest regions : mask is discarded!");
+      }
+    else
+      {
+      m_UseMask = true;
+      m_ItMask = TMaskIteratorType(mask,region);
+      m_StartMask = TMaskIteratorType(mask,region);
+      m_StartImage = TIteratorType(image,region);
+      }
    }
 }