X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2Fvolume.hxx;h=0412c8d3895a5dc5974305d4d50e10597438f620;hb=49c71c0601fad68cadb5f01aa0c5decabc1c6495;hp=31d20f664d293874ca1ba816e970964a3cd7a0aa;hpb=e8e4b890d60b916513261617e28b9e0b06a8b0c4;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/volume.hxx b/lib/maracasVisuLib/src/kernel/volume.hxx
index 31d20f6..0412c8d 100644
--- a/lib/maracasVisuLib/src/kernel/volume.hxx
+++ b/lib/maracasVisuLib/src/kernel/volume.hxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: volume.hxx,v $
   Language:  C++
-  Date:      $Date: 2010/03/15 14:12:30 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2010/04/29 16:05:37 $
+  Version:   $Revision: 1.8 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -49,11 +49,11 @@ class creaMaracasVisu_EXPORT kVolume
     kVolume( );
 
     kVolume( Type type,
-	     uint xdim, uint ydim, uint zdim,
+	     uint32_t xdim, uint32_t ydim, uint32_t zdim,
 	     double xsize = 1, double ysize = 1, double zsize = 1,
 	     void* data = 0 );
     kVolume( Type type,
-	     const uint *dims,
+	     const uint32_t *dims,
 	     const double *sizes,
 	     void* data = 0 );
 
@@ -67,30 +67,30 @@ class creaMaracasVisu_EXPORT kVolume
 
     bool sameDimension( const kVolume& comp );
 
-    const uint* getDimensions( ) const { return( _dims ); }
-    uint getWidth( ) const { return( _dims[ CX ] ); }
-    uint getHeight( ) const { return( _dims[ CY ] ); }
-    uint getDepth( ) const { return( _dims[ CZ ] ); }
-    uint getNcols( ) const { return( _dims[ CX ] ); }
-    uint getNrows( ) const { return( _dims[ CY ] ); }
-    uint getNplanes( ) const { return( _dims[ CZ ] ); }
-    uint getXdim( ) const { return( _dims[ CX ] ); }
-    uint getYdim( ) const { return( _dims[ CY ] ); }
-    uint getZdim( ) const { return( _dims[ CZ ] ); }
-
-    void setDimensions( uint* dims )
+    const uint32_t* getDimensions( ) const { return( _dims ); }
+    uint32_t getWidth( ) const { return( _dims[ CX ] ); }
+    uint32_t getHeight( ) const { return( _dims[ CY ] ); }
+    uint32_t getDepth( ) const { return( _dims[ CZ ] ); }
+    uint32_t getNcols( ) const { return( _dims[ CX ] ); }
+    uint32_t getNrows( ) const { return( _dims[ CY ] ); }
+    uint32_t getNplanes( ) const { return( _dims[ CZ ] ); }
+    uint32_t getXdim( ) const { return( _dims[ CX ] ); }
+    uint32_t getYdim( ) const { return( _dims[ CY ] ); }
+    uint32_t getZdim( ) const { return( _dims[ CZ ] ); }
+
+    void setDimensions( uint32_t* dims )
     {
-	memcpy( _dims, dims, 3 * sizeof( uint ) );
+	memcpy( _dims, dims, 3 * sizeof( uint32_t ) );
     }
-    void setWidth( uint w ) { _dims[ CX ] = w; }
-    void setHeight( uint h ) { _dims[ CY ] = h; }
-    void setDepth( uint d ) { _dims[ CZ ] = d; }
-    void setNcols( uint c ) { _dims[ CX ] = c; }
-    void setNrows( uint r ) { _dims[ CY ] = r; }
-    void setNplanes( uint p ) { _dims[ CZ ] = p; }
-    void setXdim( uint x ) { _dims[ CX ] = x; }
-    void setYdim( uint y ) { _dims[ CY ] = y; }
-    void setZdim( uint z ) { _dims[ CZ ] = z; }
+    void setWidth( uint32_t w ) { _dims[ CX ] = w; }
+    void setHeight( uint32_t h ) { _dims[ CY ] = h; }
+    void setDepth( uint32_t d ) { _dims[ CZ ] = d; }
+    void setNcols( uint32_t c ) { _dims[ CX ] = c; }
+    void setNrows( uint32_t r ) { _dims[ CY ] = r; }
+    void setNplanes( uint32_t p ) { _dims[ CZ ] = p; }
+    void setXdim( uint32_t x ) { _dims[ CX ] = x; }
+    void setYdim( uint32_t y ) { _dims[ CY ] = y; }
+    void setZdim( uint32_t z ) { _dims[ CZ ] = z; }
 
     const double *getSizes( ) const { return( _sizes ); }
     double getXsize( ) const { return( _sizes[ CX ] ); }
@@ -154,7 +154,7 @@ class creaMaracasVisu_EXPORT kVolume
     Type _type;
     Creator _creator;
 
-    uint _dims[ 3 ];
+    uint32_t _dims[ 3 ];
     double _sizes[ 3 ];
     void* _raw;
     void** _columns;