+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+# pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+# This software is governed by the CeCILL-B license under French law and
+# abiding by the rules of distribution of free software. You can use,
+# modify and/ or redistribute the software under the terms of the CeCILL-B
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# or in the file LICENSE.txt.
+#
+# As a counterpart to the access to the source code and rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty and the software's author, the holder of the
+# economic rights, and the successive licensors have only limited
+# liability.
+#
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
/*=========================================================================
Program: wxMaracas
Module: $RCSfile: marDynData.cpp,v $
Language: C++
- Date: $Date: 2009/05/14 13:54:43 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2012/11/15 14:16:12 $
+ Version: $Revision: 1.4 $
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 );