Program: wxMaracas
Module: $RCSfile: marDynData.cpp,v $
Language: C++
- Date: $Date: 2009/05/14 13:54:43 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2010/04/20 16:11:40 $
+ Version: $Revision: 1.3 $
Copyright: (c) 2002, 2003
License:
bool marDynData::save( std::ofstream& os )
{
void* data = _volume->getData1D( );
- uint dims[ 3 ];
- ulong dSize = _volume->getRawSizeInBytes( );
+ uint32_t dims[ 3 ];
+ ulong dSize = _volume->getRawSizeInBytes( ); // How many bytes for a 'ulong'? // JPR
double sizes[ 3 ];
kVolume::Type type = _volume->getType( );
sizes[ 1 ] = _volume->getYsize( );
sizes[ 2 ] = _volume->getZsize( );
- os.write( ( const char* )dims, 3 * sizeof( uint ) );
+ os.write( ( const char* )dims, 3 * sizeof( uint32_t ) );
os.write( ( const char* )sizes, 3 * sizeof( double ) );
os.write( ( const char* )&type, sizeof( kVolume::Type ) );
os.write( ( const char* )&dSize, sizeof( ulong ) );
// -------------------------------------------------------------------------
bool marDynData::load( std::ifstream& is )
{
- uchar* data;
- uint dims[ 3 ];
+ uint8_t* data;
+ uint32_t dims[ 3 ];
ulong dSize;
double sizes[ 3 ];
kVolume::Type type;
reset( );
- is.read( ( char* )dims, 3 * sizeof( uint ) );
+ is.read( ( char* )dims, 3 * sizeof( uint32_t ) );
is.read( ( char* )sizes, 3 * sizeof( double ) );
is.read( ( char* )&type, sizeof( kVolume::Type ) );
is.read( ( char* )&dSize, sizeof( ulong ) );
- data = new uchar[ dSize ];
+ data = new uint8_t[ dSize ];
is.read( ( char* )data, dSize );
_volume = new kVolume( type, dims, sizes, ( void* )data );