From: guigues <guigues>
Date: Wed, 8 Apr 2009 10:32:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~113
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=84842df766da07e6efc26b8c156bbffd1efa9696;p=creaImageIO.git

*** empty log message ***
---

diff --git a/src2/creaImageIOGimmickReaderDialog.h b/src2/creaImageIOGimmickReaderDialog.h
index 26cb2ad..09a70f1 100644
--- a/src2/creaImageIOGimmickReaderDialog.h
+++ b/src2/creaImageIOGimmickReaderDialog.h
@@ -1,9 +1,11 @@
 #ifndef __creaImageIOGimmickReaderDialog_h_INCLUDED__
 #define __creaImageIOGimmickReaderDialog_h_INCLUDED__
 
+#include "creaImageIOSystem.h"
 #include <vtkImageData.h>
 #include <vector>
 
+
 namespace creaImageIO
 {
   /**
@@ -12,14 +14,15 @@ namespace creaImageIO
    * returns true if the user clicked 'Ok', false if 'Cancel'
    *  and fills the vector of images
    */
-  bool __declspec(dllexport) GimmickReaderDialog(std::vector<vtkImageData*>& images,
-			   const std::string& title = "Select images",
-			   int posx = 0, int posy = 0,
-			   int sizex = 1200, int sizey = 800,
-			   int image_min_type = 2,
-			   int image_max_type = 3,
-			   int image_out_dim = 2,
-			   int nb_threads = 1);
+  bool CREAIMAGEIO_EXPORT GimmickReaderDialog
+  (std::vector<vtkImageData*>& images,
+   const std::string& title = "Select images",
+   int posx = 0, int posy = 0,
+   int sizex = 1200, int sizey = 800,
+   int image_min_type = 2,
+   int image_max_type = 3,
+   int image_out_dim = 2,
+   int nb_threads = 1);
   
 }
 
diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp
index c4337bc..6862f61 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.cpp
+++ b/src2/creaImageIOTreeHandlerImageAdder.cpp
@@ -104,20 +104,19 @@ namespace creaImageIO
 	else 
 	  {
 	    mProgress.IncNumberScannedFiles();
-		if (IsHandledFile(itr->string()))
+	    if (IsHandledFile(itr->string()))
 	      {
 		mProgress.IncNumberHandledFiles();
 		AddFile( itr->string() );
 	      }
 	    mProgressSignal(mProgress);
 	    if (mProgress.GetStop()) 
-		{
-			itr = end_itr
-//			break;
-		}
-		}
+	      {
+		itr = end_itr;
+		//			break;
+	      }
+	  }
       }
-	 
   }
   //=======================================================================