avoid warnings / fix typo / reindent

[creaMaracasVisu.git] / lib / maracasVisuLib / src / kernel / volume.cxx

diff --git a/lib/maracasVisuLib/src/kernel/volume.cxx b/lib/maracasVisuLib/src/kernel/volume.cxx
index 8155ec3bc402e81826580337a012bb99d4cc4438..43d1364b3b8af6d52fda922c8d512433405cecb3 100644 (file)
--- 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: 2010/03/15 14:12:30 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2010/04/20 14:42:44 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -39,15 +39,6 @@ const vtkIdType kVolume::VTKTypes[] = { VTK_CHAR, VTK_FLOAT, VTK_DOUBLE,
 
 #endif // KGFO_USE_VTK
 
-//#ifdef KGFO_USE_IDO
-
-// -------------------------------------------------------------------------
-//const int kVolume::IDOTypes[] = { VOL_CHAR, VOL_FLOAT, VOL_DOUBLE, VOL_LONG,
-//                               VOL_SHORT, VOL_UCHAR, VOL_ULONG,
-//                               VOL_USHORT };
-
-//#endif // KGFO_USE_IDO
-
 // -------------------------------------------------------------------------
 const void* kVolume::BLANK   = ( void* ) 0;
 const void* kVolume::NOALLOC = ( void* )-1;
@@ -229,13 +220,13 @@ double kVolume::getPixel( uint x, uint y, uint z ) const
 
     switch( _type ) {
                
-    case CHAR:   p = ( double )(   ( char*** )_images )[ z ][ y ][ x ]; break;
-    case FLOAT:  p = ( double )(  ( float*** )_images )[ z ][ y ][ x ]; break;
+    case CHAR:   p = ( double )( ( char*** )_images )[ z ][ y ][ x ]; break;
+    case FLOAT:  p = ( double )( ( float*** )_images )[ z ][ y ][ x ]; break;
     case DOUBLE: p = ( double )( ( double*** )_images )[ z ][ y ][ x ]; break;
-    case INT:    p = ( double )(    ( int*** )_images )[ z ][ y ][ x ]; break;
-    case SHORT:  p = ( double )(  ( short*** )_images )[ z ][ y ][ x ]; break;
-    case UCHAR:  p = ( double )(  ( uchar*** )_images )[ z ][ y ][ x ]; break;
-    case UINT:   p = ( double )(   ( uint*** )_images )[ z ][ y ][ x ]; break;
+    case INT:    p = ( double )( ( int*** )_images )[ z ][ y ][ x ]; break;
+    case SHORT:  p = ( double )( ( short*** )_images )[ z ][ y ][ x ]; break;
+    case UCHAR:  p = ( double )( ( uchar*** )_images )[ z ][ y ][ x ]; break;
+    case UINT:   p = ( double )( ( uint*** )_images )[ z ][ y ][ x ]; break;
     case USHORT: p = ( double )( ( ushort*** )_images )[ z ][ y ][ x ]; break;
     default: p = 0.0; break;