*** empty log message ***

diff --git a/src2/creaImageIOGimmickReaderDialog.h b/src2/creaImageIOGimmickReaderDialog.h
index 26cb2ad53253e8f7f1b7c89532b3ec58a58f3d46..09a70f17d5885b692888246e2fad3aa7c3e0cea6 100644 (file)
--- 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 c4337bc0f2dfad358c0fac070070dbfe0f229016..6862f61c9b3c3fb4ed547c7c1b709c3e687627c5 100644 (file)
--- 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;
+             }
+         }
       }
-        
   }
   //=======================================================================