X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2Fvolume.cxx;h=8155ec3bc402e81826580337a012bb99d4cc4438;hb=acfa60fa044ebc12067c4daba555d18c7d66b2d5;hp=028e649f9f4910bd3314144ab62fe45ae7edf426;hpb=1585b16e8aa2b90ce38645293ad5d1ccea7c1023;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/volume.cxx b/lib/maracasVisuLib/src/kernel/volume.cxx
index 028e649..8155ec3 100644
--- a/lib/maracasVisuLib/src/kernel/volume.cxx
+++ b/lib/maracasVisuLib/src/kernel/volume.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: volume.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/01/26 11:22:49 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2010/03/15 14:12:30 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -99,15 +99,15 @@ template< class TYPE >
 
 // -------------------------------------------------------------------------
 kVolume::kVolume( )
-    : _type( UCHAR ), _creator( SELF ),
-#ifdef KGFO_USE_VTK
-      _vtk( NULL ),
-#endif // KGFO_USE_VTK
-//#ifdef KGFO_USE_IDO
-//      _privateIdo( NULL ),
-//#endif // KGFO_USE_IDO
-      _raw( NULL ), _columns( NULL ),
+    : _type( UCHAR ), 
+      _creator( SELF ),
+      _raw( NULL ), 
+      _columns( NULL ),
       _images( NULL )
+#ifdef KGFO_USE_VTK
+                  ,
+      _vtk( NULL )      
+#endif // KGFO_USE_VTK      
 {
     _dims[ CX ] = 1; _dims[ CY ] = 1; _dims[ CZ ] = 1;
     _sizes[ CX ] = 1; _sizes[ CY ] = 1; _sizes[ CZ ] = 1;
@@ -120,15 +120,15 @@ kVolume::kVolume( Type type,
 		  uint xdim, uint ydim, uint zdim,
 		  double xsize, double ysize, double zsize,
 		  void* data )
-    : _type( type ), _creator( SELF ),
-#ifdef KGFO_USE_VTK
-      _vtk( NULL ),
-#endif // KGFO_USE_VTK
-//#ifdef KGFO_USE_IDO
-//      _privateIdo( NULL ),
-//#endif // KGFO_USE_IDO
-      _raw( NULL ), _columns( NULL ),
+    : _type( type ), 
+      _creator( SELF ),
+      _raw( NULL ), 
+      _columns( NULL ),
       _images( NULL )
+#ifdef KGFO_USE_VTK
+                    ,
+      _vtk( NULL )
+#endif // KGFO_USE_VTK      
 {
     _dims[ CX ] = xdim; _dims[ CY ] = ydim; _dims[ CZ ] = zdim;
     _sizes[ CX ] = xsize; _sizes[ CY ] = ysize; _sizes[ CZ ] = zsize;
@@ -148,15 +148,15 @@ kVolume::kVolume( Type type,
 		  const uint *dims,
 		  const double *sizes,
 		  void* data )
-    : _type( type ), _creator( SELF ),
-#ifdef KGFO_USE_VTK
-      _vtk( NULL ),
-#endif // KGFO_USE_VTK
-//#ifdef KGFO_USE_IDO
-//      _privateIdo( NULL ),
-//#endif // KGFO_USE_IDO
+    : _type( type ), 
+      _creator( SELF ),
       _raw( NULL ), _columns( NULL ),
       _images( NULL )
+#ifdef KGFO_USE_VTK
+                   ,
+      _vtk( NULL )
+#endif // KGFO_USE_VTK      
+      
 {
     memcpy( _dims, dims, 3 * sizeof( uint ) );
     memcpy( _sizes, sizes, 3 * sizeof( double ) );
@@ -173,15 +173,16 @@ kVolume::kVolume( Type type,
 
 // -------------------------------------------------------------------------
 kVolume::kVolume( const kVolume& org )
-    : _type( UCHAR ), _creator( SELF ),
-#ifdef KGFO_USE_VTK
-      _vtk( NULL ),
-#endif // KGFO_USE_VTK
-//#ifdef KGFO_USE_IDO
-//      _privateIdo( NULL ),
-//#endif // KGFO_USE_IDO
-      _raw( NULL ), _columns( NULL ),
+    : _type( UCHAR ), 
+      _creator( SELF ),
+      _raw( NULL ), 
+      _columns( NULL ),
       _images( NULL )
+#ifdef KGFO_USE_VTK
+		    ,
+      _vtk( NULL )
+#endif // KGFO_USE_VTK      
+  
 {
     copyFrom( org );
 }
@@ -809,49 +810,32 @@ void kVolume::buildIndex( )
 void kVolume::deallocate( )
 {
 #ifdef KGFO_USE_VTK
-
     if( _vtk ) _vtk->Delete();
     _vtk = NULL;
-
 #endif // KGFO_USE_VTK
-
-//#ifdef KGFO_USE_IDO
-
-//    if( _creator == SELF || _creator == VTK ) {
-
-//	delete[] _privateIdo;
-//	_privateIdo = NULL;
-	
-//    } // fi
-
-//#else
-
     delete[] ( uchar* )_images;
-
-//#endif // KGFO_USE_IDO
-
     if( _raw && _creator == SELF )
 
 //EED purify 12/sept/2006
 //	delete[] ( uchar* )_raw;
 
-	free ( _raw );
+    free ( _raw );
 
-    _creator	= SELF;
-    _raw		= NULL;
-    _columns	= NULL;
-    _images		= NULL;
+    _creator = SELF;
+    _raw     = NULL;
+    _columns = NULL;
+    _images  = NULL;
 }
 
 #ifdef KGFO_USE_VTK
 
 // -------------------------------------------------------------------------
 kVolume::kVolume( vtkImageData* org )
-    : _raw( 0 ), _columns( 0 ), _images( 0 ),
+    :
       _creator( VTK ),
-//#ifdef KGFO_USE_IDO
-//      _privateIdo( NULL ),
-//#endif // KGFO_USE_IDO
+      _raw( 0 ), 
+      _columns( 0 ), 
+      _images( 0 ),
       _vtk( 0 )
 {
     //int i, j, k, y;
@@ -913,11 +897,11 @@ void kVolume::copyFrom( vtkImageData* org )
 
 //#endif // KGFO_USE_IDO
 
-    _vtk		= NULL;
-    _raw		= NULL;
-    _columns	= NULL;
-    _images		= NULL;
-    _creator	= SELF;
+    _vtk     = NULL;
+    _raw     = NULL;
+    _columns = NULL;
+    _images  = NULL;
+    _creator = SELF;
 
     switch( org->GetScalarType( ) ) {