use uint32_t instead of ulong, etc

[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 7fbe85cc1276d06e2b598a3bb3a4cfdf977d50bf..698133ad22050a11860cf4b24f73b7d534702a6a 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/04/20 16:11:40 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2010/04/29 16:05:37 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -220,12 +220,12 @@ double kVolume::getPixel( uint32_t x, uint32_t y, uint32_t z ) const
 
     switch( _type ) {
                
-    case CHAR:   p = ( double )( ( int8_t*** )_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 )( ( int32_t*** )_images )[ z ][ y ][ x ]; break;
-    case SHORT:  p = ( double )( ( int16_t*** )_images )[ z ][ y ][ x ]; break;
-    case UCHAR:  p = ( double )( ( uint8_t*** )_images )[ z ][ y ][ x ]; break;
+    case CHAR:   p = ( double )( ( int8_t*** )_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 )( ( int32_t*** )_images )[ z ][ y ][ x ];  break;
+    case SHORT:  p = ( double )( ( int16_t*** )_images )[ z ][ y ][ x ];  break;
+    case UCHAR:  p = ( double )( ( uint8_t*** )_images )[ z ][ y ][ x ];  break;
     case UINT:   p = ( double )( ( uint32_t*** )_images )[ z ][ y ][ x ]; break;
     case USHORT: p = ( double )( ( uint16_t*** )_images )[ z ][ y ][ x ]; break;
     default: p = 0.0; break;
@@ -269,12 +269,12 @@ void kVolume::convertCast( Type type )
        case CHAR:
            switch( type ) {
 
-           case SHORT:  convertCastT( ( char* )_raw, ( int16_t* )buffer, size ); break;
-           case INT:    convertCastT( ( char* )_raw, ( int32_t* )buffer, size ); break;
+           case SHORT:  convertCastT( ( char* )_raw, ( int16_t* )buffer, size );  break;
+           case INT:    convertCastT( ( char* )_raw, ( int32_t* )buffer, size );  break;
            case USHORT: convertCastT( ( char* )_raw, ( uint16_t* )buffer, size ); break;
            case UINT:   convertCastT( ( char* )_raw, ( uint32_t* )buffer, size ); break;
-           case FLOAT:  convertCastT( ( char* )_raw, ( float* )buffer, size ); break;
-           case DOUBLE: convertCastT( ( char* )_raw, ( double* )buffer, size ); break;
+           case FLOAT:  convertCastT( ( char* )_raw, ( float* )buffer, size );    break;
+           case DOUBLE: convertCastT( ( char* )_raw, ( double* )buffer, size );   break;
            case UCHAR:  convertCastT( ( char* )_raw, ( uint8_t* )buffer, size ); break;
            default : break;
 
@@ -284,13 +284,13 @@ void kVolume::convertCast( Type type )
        case SHORT:
            switch( type ) {
 
-           case CHAR:   convertCastT( ( int16_t* )_raw, ( uint8_t* )buffer, size ); break;
-           case INT:    convertCastT( ( int16_t* )_raw, ( int32_t* )buffer, size ); break;
+           case CHAR:   convertCastT( ( int16_t* )_raw, ( uint8_t* )buffer, size );  break;
+           case INT:    convertCastT( ( int16_t* )_raw, ( int32_t* )buffer, size );  break;
            case USHORT: convertCastT( ( int16_t* )_raw, ( uint16_t* )buffer, size ); break;
            case UINT:   convertCastT( ( int16_t* )_raw, ( uint32_t* )buffer, size ); break;
-           case FLOAT:  convertCastT( ( int16_t* )_raw, ( float* )buffer, size ); break;
-           case DOUBLE: convertCastT( ( int16_t* )_raw, ( double* )buffer, size ); break;
-           case UCHAR:  convertCastT( ( int16_t* )_raw, ( uint8_t* )buffer, size ); break;
+           case FLOAT:  convertCastT( ( int16_t* )_raw, ( float* )buffer, size );    break;
+           case DOUBLE: convertCastT( ( int16_t* )_raw, ( double* )buffer, size );   break;
+           case UCHAR:  convertCastT( ( int16_t* )_raw, ( uint8_t* )buffer, size );  break;
            default : break;
            } // fswitch
            break;