Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 13/12/2012
[tools/medcoupling.git]
/
src
/
MEDLoader
/
SauvMedConvertor.cxx
diff --git
a/src/MEDLoader/SauvMedConvertor.cxx
b/src/MEDLoader/SauvMedConvertor.cxx
index 800c84ab1619836b72e8e53183b193209c4249c3..75e1d0c139c8c6776fb45388a0d459ae31ed88df 100644
(file)
--- a/
src/MEDLoader/SauvMedConvertor.cxx
+++ b/
src/MEDLoader/SauvMedConvertor.cxx
@@
-39,11
+39,11
@@
#include <cstring>
#include <fcntl.h>
#include <cstring>
#include <fcntl.h>
-#ifdef W
NT
+#ifdef W
IN32
#include <io.h>
#endif
#include <io.h>
#endif
-#ifndef W
NT
+#ifndef W
IN32
#define HAS_XDR
#include <unistd.h>
#endif
#define HAS_XDR
#include <unistd.h>
#endif
@@
-259,7
+259,8
@@
unsigned SauvUtilities::getDimension( INTERP_KERNEL::NormalizedCellType type )
//================================================================================
/*!
//================================================================================
/*!
- * \brief Returns interlace array to transform a quadratic GIBI element to a MED one
+ * \brief Returns interlace array to transform a quadratic GIBI element to a MED one.
+ * i-th array item gives node index in GIBI connectivity for i-th MED node
*/
//================================================================================
*/
//================================================================================
@@
-474,7
+475,7
@@
bool ASCIIReader::isASCII() const
bool ASCIIReader::open()
{
bool ASCIIReader::open()
{
-#ifdef W
NT
+#ifdef W
IN32
_file = ::_open (_fileName.c_str(), _O_RDONLY|_O_BINARY);
#else
_file = ::open (_fileName.c_str(), O_RDONLY);
_file = ::_open (_fileName.c_str(), _O_RDONLY|_O_BINARY);
#else
_file = ::open (_fileName.c_str(), O_RDONLY);
@@
-772,9
+773,9
@@
double ASCIIReader::getDouble() const
// 7.70000000000000-100 7.70000000000000+100 7.70000000000000+100
//0123456789012345678901234567890123456789012345678901234567890123456789
const size_t posE = 18;
// 7.70000000000000-100 7.70000000000000+100 7.70000000000000+100
//0123456789012345678901234567890123456789012345678901234567890123456789
const size_t posE = 18;
- if ( _curPos[posE] != 'E' && _curPos[posE] != 'e' )
+ std::string aStr (_curPos);
+ if ( aStr.find('E') < 0 && aStr.find('e') < 0 )
{
{
- std::string aStr (_curPos);
if ( aStr.size() < posE+1 )
THROW_IK_EXCEPTION("No more doubles (line #" << lineNb() << ")");
aStr.insert( posE, "E", 1 );
if ( aStr.size() < posE+1 )
THROW_IK_EXCEPTION("No more doubles (line #" << lineNb() << ")");
aStr.insert( posE, "E", 1 );