X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOMultiThreadImageReader.cpp;h=9e4db3ced7ebd1bce3a3c987630dca2ae13adfa9;hb=152f8d6556de5c935404953ad95e392ae148374d;hp=85bbb4b06b1f374828172b1e413447430b9dab81;hpb=c6c81af149bb0f0bd9f4c14cb2e276d7eb046b7d;p=creaImageIO.git

diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index 85bbb4b..9e4db3c 100644
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -34,6 +34,7 @@ namespace creaImageIO
   private:
     ImageReader mReader;
     MultiThreadImageReader* mMultiThreadImageReader;
+	
   };
   //=====================================================================
 
@@ -43,7 +44,7 @@ namespace creaImageIO
     : //mDoNotSignal(false),
       mReader(0),
       mTotalMem(0),
-      mTotalMemMax(1500000)
+      mTotalMemMax(1000000)
   {
     //    std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
     //	      << " #threads= " << number_of_threads <<" )"<<std::endl;
@@ -114,7 +115,10 @@ namespace creaImageIO
 	 i!=mThreadedImageReaderList.end();
 	 i++)
       {
-	(*i)->Delete();
+		  if((*i)->IsAlive())
+		  {
+			(*i)->Delete();
+		  }
       }
     mThreadedImageReaderList.clear();
     // Wait a little to be sure that all threads have stopped
@@ -285,15 +289,20 @@ namespace creaImageIO
   vtkImageData* MultiThreadImageReader::GetImage(const std::string& filename)
   {
 	 // Start();
-    //    std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
-    //	      <<std::endl;
+    //       std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
+    //		 <<std::endl;
     
     do 
       {
-	wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
+	//	wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
 		
-		  if (mNumberOfThreadedReadersRunning==0)
-//	if (mThreadedImageReaderList.size()==0)
+	//     std::cout << "** MultiThreadImageReader::GetImage('"<<filename
+	//	       <<"') lock ok"
+	//		 <<std::endl;
+    
+	//		  if (mNumberOfThreadedReadersRunning==0)
+	//	if (mThreadedImageReaderList.size()==0)
+	if (true)
 	  {
 	    ImageToLoad itl(this,filename);
 	    ImageMapType::iterator i = mImages.find(&itl);
@@ -316,7 +325,8 @@ namespace creaImageIO
 				 GetMaximalPriorityWithoutLocking()+1);
 	    return pitl->GetImage();
 	  }
-	
+
+	/*	
 	mRequestedFilename = filename;
 	mRequestedImage = 0;
 	ImageToLoad itl(this,filename);
@@ -355,11 +365,13 @@ namespace creaImageIO
 	    mImages[pitl] = 0;
 	    mQueue.insert(pitl);
 	  }
+	*/
       }
     while (0);
 
     //    std::cout << "Waiting..."<<std::endl;
 
+    /*
     // Waiting that it is read
     int n = 0;
     do 
@@ -379,7 +391,7 @@ namespace creaImageIO
       }
     while (true);
     // 
-    
+    */
   }
   //=====================================================================