X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkImageStatisticsGenericFilter.cxx;h=931e1bfe7c12b8002cc2e18eeb5ba5181fb044e8;hb=d7f456d86ca398a89ccf9de43ab68a2b50b8ca1f;hp=23cf4df06eb75901590f2f7b9603960b9696ad8f;hpb=b96634936966a5da8c3d6ebb72b8954fb53b800a;p=clitk.git

diff --git a/tools/clitkImageStatisticsGenericFilter.cxx b/tools/clitkImageStatisticsGenericFilter.cxx
index 23cf4df..931e1bf 100644
--- a/tools/clitkImageStatisticsGenericFilter.cxx
+++ b/tools/clitkImageStatisticsGenericFilter.cxx
@@ -18,18 +18,8 @@
 #ifndef clitkImageStatisticsGenericFilter_cxx
 #define clitkImageStatisticsGenericFilter_cxx
 
-/* =================================================
- * @file   clitkImageStatisticsGenericFilter.cxx
- * @author 
- * @date   
- * 
- * @brief 
- * 
- ===================================================*/
-
 #include "clitkImageStatisticsGenericFilter.h"
 
-
 namespace clitk
 {
 
@@ -42,7 +32,8 @@ namespace clitk
     m_Verbose=false;
     m_InputFileName="";
   }
-
+  //-----------------------------------------------------------
+  
 
   //-----------------------------------------------------------
   // Update
@@ -54,10 +45,20 @@ namespace clitk
     std::string PixelType;
     ReadImageDimensionAndPixelType(m_InputFileName, Dimension, PixelType, Components);
     
-    if (m_ArgsInfo.channel_arg != -1 && m_ArgsInfo.channel_arg >= Components) {
+    if (m_ArgsInfo.channel_arg < -1 || m_ArgsInfo.channel_arg >= Components) {
       std::cout << "Invalid image channel" << std::endl;
       return;
     }
+    
+    if (m_ArgsInfo.mask_given) {
+      int maskDimension, maskComponents;
+      std::string maskPixelType;
+      ReadImageDimensionAndPixelType(m_ArgsInfo.mask_arg, maskDimension, maskPixelType, maskComponents);
+      if (!(maskDimension == Dimension || maskDimension == (Dimension - 1))) {
+        std::cout << "Dimension of label mask must be equal to the (d)imension of the input image or d-1." << std::endl;
+        return;
+      }
+    }
 
     
     // Call UpdateWithDim