#3218 creaImageIO Feature New Normal - vtk8itk4wx3-mingw64

[creaImageIO.git] / src / creaImageIOMultiThreadImageReader.h

diff --git a/src/creaImageIOMultiThreadImageReader.h b/src/creaImageIOMultiThreadImageReader.h
index a49b57fddd665c199a11991d00aedb440afe9cef..01d91c508566dcbcde755b6b182b7c9f6d57a91f 100644 (file)
--- a/src/creaImageIOMultiThreadImageReader.h
+++ b/src/creaImageIOMultiThreadImageReader.h
@@ -151,16 +151,18 @@ namespace creaImageIO
          mPriority(prio), 
          mIndex(-1), 
          mUnloadIndex(-1), 
-         mImage(0)
+         mImage(NULL)
       {}
+         
       ~ImageToLoad()
       {
-       if (mImage>0) 
-         {
-           //      std::cout << "Refs = "<<mImage->GetReferenceCount()<<std::endl;
-           mImage->Delete();
-         }
+               if (mImage != NULL) 
+               {
+                       //          std::cout << "Refs = "<<mImage->GetReferenceCount()<<std::endl;
+                       mImage->Delete();
+               } // if
       }
+         
       MultiThreadImageReaderUser* GetUser() const { return mUser; }
       void SetUser( MultiThreadImageReaderUser* u ) { mUser = u; }
       const std::string& GetFilename() const { return mFilename; }
@@ -173,17 +175,17 @@ namespace creaImageIO
 
          std::map<std::string, std::string> getAttributes(const std::vector<std::string> i_attr);
     private:
-      MultiThreadImageReaderUser* mUser;
-      std::string mFilename;
-      int mPriority;
-      int mIndex;
-      int mUnloadIndex;
-      vtkImageData* mImage;
+      MultiThreadImageReaderUser       *mUser;
+      std::string                                      mFilename;
+      int                                                      mPriority;
+      int                                                      mIndex;
+      int                                                      mUnloadIndex;
+      vtkImageData                                     *mImage;
     };
     // 
 
     /// Type of pointer on an ImageToLoad struct
-    typedef ImageToLoad* ImageToLoadPtr;
+    typedef ImageToLoad        *ImageToLoadPtr;
 
     /// ImageToLoadPtr comparator on priority (for image queue)
     struct ImageToLoadPtrPriorityComparator
@@ -228,10 +230,13 @@ namespace creaImageIO
 
     /// The callback from threaded readers when an image is read
     void SignalImageRead(ImageToLoadPtr p, bool purge);
-  
+
+       void CleanMImagesMap();
+
+
+       
     /// The type of map of images 
-    typedef std::map<ImageToLoadPtr,vtkImageData*,
-                    ImageToLoadPtrFilenameComparator> ImageMapType;
+    typedef std::map<ImageToLoadPtr,vtkImageData*,   ImageToLoadPtrFilenameComparator> ImageMapType;
     /// The map of images
     ImageMapType mImages;
     /// Comparator for the image to load queue