From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Fri, 16 Nov 2012 09:38:23 +0000 (+0000)
Subject: fix linux compilation
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a47670bb6ca5a5c15f8a5eb011658167b32bda8d;p=creaImageIO.git

fix linux compilation
---

diff --git a/src/creaImageIOSimpleView.cpp b/src/creaImageIOSimpleView.cpp
index bf025e8..cfede76 100644
--- a/src/creaImageIOSimpleView.cpp
+++ b/src/creaImageIOSimpleView.cpp
@@ -32,7 +32,7 @@
 
 namespace creaImageIO
 {
-/*	bool SimpleView::readFile(std::vector<std::string> i_filenames, std::vector<vtkImageData *> &i_img)
+	bool SimpleView::readFile(std::vector<std::string> i_filenames, std::vector<vtkImageData *> &i_img)
 	{
 			bool bresult, bfinal = true;
 			ImageReader *mReader = new ImageReader();
@@ -83,6 +83,6 @@ namespace creaImageIO
 				}			
 			}
 			return bresult;
-	}*/
+	}
 }
 			
diff --git a/src/creaImageIOSimpleView.h b/src/creaImageIOSimpleView.h
index 5d658c4..d1a9886 100644
--- a/src/creaImageIOSimpleView.h
+++ b/src/creaImageIOSimpleView.h
@@ -38,7 +38,7 @@
 
 namespace creaImageIO
 {
-	class __declspec(dllexport) SimpleView
+	class SimpleView
 	{
 	public:
 		/// Ctor
@@ -48,61 +48,10 @@ namespace creaImageIO
 		~SimpleView(){}
 		
 		/// read file(s) and return a vector of vtkImageData 
-		bool readFile( std::vector<std::string> i_filenames, std::vector< vtkImageData *> &i_img){
-			bool bresult, bfinal = true;
-			ImageReader *mReader = new ImageReader();
-			std::vector<std::string>::iterator it = i_filenames.begin();
-			for (; it != i_filenames.end(); it++)
-			{
-				bresult = mReader->CanRead((*it).c_str());
-				if(bresult)
-				{
-					i_img.push_back(mReader->ReadImage((*it).c_str()));
-				}
-				else
-				{
-					bfinal = false;
-				}
-			}
-			delete mReader;
-			return bfinal;	
-	}
+		bool readFile( std::vector<std::string> i_filenames, std::vector< vtkImageData *> &i_img);
 
 		/// read a directory and return a vector of vtkImageData 
-		bool readDirectory(const std::string i_pathname, std::vector< vtkImageData *> &i_imgs)
-			{bool bresult = true;
-			ImageReader *mReader = new ImageReader();
-                        std::vector<std::string> names;
-			bresult = boost::filesystem::exists( i_pathname );
-			if (bresult)
-			{
-				boost::filesystem::directory_iterator itr(i_pathname);
-				boost::filesystem::directory_iterator end_itr; 
-				for(;itr != end_itr; ++itr)
-				{
-					if (!boost::filesystem::is_directory(itr->status()))
-					{
-						if( mReader->CanRead(itr->string()) )
-						{
-							names.push_back(itr->string()); 
-						}
-					}
-				}
-				std::sort (names.begin(), names.end()); // make sure names are in lexicographical order
-				int lgr = names.size();
-				
-				for(int i=0; i<lgr; i++)
-				{
-                    		   std::cout << names[i] << std::endl;
-				   i_imgs.push_back( mReader->ReadImage(names[i]) );  
-				}			
-			}
-			return bresult;
-	}
+		bool readDirectory(const std::string i_pathname, std::vector< vtkImageData *> &i_imgs);
 
 	};
-
-
-
-} // namespace creaImageIO
-#endif //__creaImageIOSimpleView_h_INCLUDED__
\ No newline at end of file
+}
\ No newline at end of file