#3218 creaImageIO Feature New Normal - vtk8itk4wx3-mingw64

[creaImageIO.git] / src / creaImageIOMultiThreadImageReader.cpp

diff --git a/src/creaImageIOMultiThreadImageReader.cpp b/src/creaImageIOMultiThreadImageReader.cpp
index c4056b0e82206f6cb334a53eb8753ab8e8986e34..62eb7bdbee05a3d5fb9c5a06e6c65ad091176a64 100644 (file)
--- a/src/creaImageIOMultiThreadImageReader.cpp
+++ b/src/creaImageIOMultiThreadImageReader.cpp
@@ -119,7 +119,6 @@ namespace creaImageIO
   //=====================================================================
   bool MultiThreadImageReader::Start()
   {
-
     //    std::cout << "#### MultiThreadImageReader::Start()"
     //               <<std::endl;
          if (mNumberOfThreadedReadersRunning > 0) return true;
@@ -463,7 +462,9 @@ namespace creaImageIO
     //    std::cout << "user="<<p->GetUser() <<std::endl;
 
     if ( p->GetUser() == this ) 
+       {
       GetMultiThreadImageReaderUserMutex().Unlock();
+       }
 
     p->GetUser()->MultiThreadImageReaderSendEvent
       (p->GetFilename(),
@@ -480,9 +481,22 @@ namespace creaImageIO
     //    wxMutexLocker lock(GetMultiThreadImageReaderUserMutex());
           
     mUnloadQueue.insert(p);
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     p->GetImage()->UpdateInformation();
     p->GetImage()->PropagateUpdateExtent();
     long ImMem = p->GetImage()->GetEstimatedMemorySize();
+#else
+       int ext[6];
+       int dim[3];
+       p->GetImage()->GetExtent(ext);
+       dim[0]          = ext[1]-ext[0]+1;
+       dim[1]          = ext[3]-ext[2]+1;
+       dim[2]          = ext[5]-ext[4]+1;
+    long ImMem         = dim[0]*dim[1]*dim[2]*p->GetImage()->GetScalarSize();;
+#endif
     mTotalMem += ImMem;
 
     GimmickMessage(5,"==> Image in memory = "<<mUnloadQueue.size()<<std::endl);
@@ -517,7 +531,19 @@ namespace creaImageIO
        std::string filename = unload->GetFilename();
 
        GimmickMessage(5,"'" << filename << "'" << std::endl);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        mTotalMem -= unload->GetImage()->GetEstimatedMemorySize();
+#else
+       int ext[6];
+       int dim[3];
+       unload->GetImage()->GetExtent(ext);
+       dim[0]          = ext[1]-ext[0]+1;
+       dim[1]          = ext[3]-ext[2]+1;
+       dim[2]          = ext[5]-ext[4]+1;
+       mTotalMem -= dim[0]*dim[1]*dim[2]*unload->GetImage()->GetScalarSize();
+#endif
 
        GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl);
 
@@ -636,9 +662,7 @@ namespace creaImageIO
            //      std::cout << "### Thread "<<GetCurrentId()<<" : reading '"
            //                << i->GetFilename() << "' : DONE" << std::endl;
            
-         }
-       else 
-         {
+         }     else  {
            mMultiThreadImageReader->MultiThreadImageReaderEventUnlock();
            //mMutex.Unlock();
            // Wait a little to avoid blocking