X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fio%2Flowlevel.cxx;h=638b0666a181034b5a0fc0dcce1aa84b0e610690;hb=c6ad744ce22fd94cdf83ff876ed31e83af94cc41;hp=dc1c389fff0806c5a26b210050f9fcc17c762deb;hpb=260dbeb3d2a8e711ae7b9d386f09e33ccaa992db;p=simgear.git

diff --git a/simgear/io/lowlevel.cxx b/simgear/io/lowlevel.cxx
index dc1c389f..638b0666 100644
--- a/simgear/io/lowlevel.cxx
+++ b/simgear/io/lowlevel.cxx
@@ -33,219 +33,450 @@ void sgClearWriteError() { write_error = false; }
 int sgReadError() { return  read_error ; }
 int sgWriteError() { return write_error ; }
 
-
+static const int sgEndianTest = 1;
+#define sgIsLittleEndian (*((char *) &sgEndianTest ) != 0)
+#define sgIsBigEndian    (*((char *) &sgEndianTest ) == 0)
+
+static inline void sgEndianSwap(unsigned short *x) {
+    *x =
+        (( *x >>  8 ) & 0x00FF ) | 
+        (( *x <<  8 ) & 0xFF00 ) ;
+}
+  
+static inline void sgEndianSwap(unsigned int *x) {
+    *x =
+        (( *x >> 24 ) & 0x000000FF ) | 
+        (( *x >>  8 ) & 0x0000FF00 ) | 
+        (( *x <<  8 ) & 0x00FF0000 ) | 
+        (( *x << 24 ) & 0xFF000000 ) ;
+}
+  
+static inline void sgEndianSwap(unsigned long long *x) {
+    *x =
+        (( *x >> 56 ) & 0x00000000000000FFULL ) | 
+        (( *x >> 40 ) & 0x000000000000FF00ULL ) | 
+        (( *x >> 24 ) & 0x0000000000FF0000ULL ) | 
+        (( *x >>  8 ) & 0x00000000FF000000ULL ) | 
+        (( *x <<  8 ) & 0x000000FF00000000ULL ) | 
+        (( *x << 24 ) & 0x0000FF0000000000ULL ) |
+        (( *x << 40 ) & 0x00FF000000000000ULL ) |
+        (( *x << 56 ) & 0xFF00000000000000ULL ) ;
+}
+  
 void sgReadChar ( gzFile fd, char *var )
 {
-    if ( gzread ( fd, var, sizeof(char) ) > 0 ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(char) ) != sizeof(char) ) {
+        read_error = true ;
+    }
 }
 
 
 void sgWriteChar ( gzFile fd, const char var )
 {
-    if ( gzwrite ( fd, (void *)(&var), sizeof(char) ) > 0 ) return ;
-    write_error = true ;
+    if ( gzwrite ( fd, (void *)(&var), sizeof(char) ) != sizeof(char) ) {
+        write_error = true ;
+    }
 }
 
 
 void sgReadFloat ( gzFile fd, float *var )
 {
-    if ( gzread ( fd, var, sizeof(float) ) > 0 ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(float) ) != sizeof(float) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned int*)var);
+    }
 }
 
 
 void sgWriteFloat ( gzFile fd, const float var )
 {
-    if ( gzwrite ( fd, (void *)(&var), sizeof(float) ) > 0 ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned int*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(float) ) != sizeof(float) ) {
+        write_error = true ;
+    }
 }
 
 
 void sgReadDouble ( gzFile fd, double *var )
 {
-    if ( gzread ( fd, var, sizeof(double) ) > 0 ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(double) ) != sizeof(double) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned long long*)var);
+    }
 }
 
 
 void sgWriteDouble ( gzFile fd, const double var )
 {
-    if ( gzwrite ( fd, (void *)(&var), sizeof(double) ) > 0 ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned long long*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(double) ) != sizeof(double) ) {
+        write_error = true ;
+    }
 }
 
 
 void sgReadUInt ( gzFile fd, unsigned int *var )
 {
-    if ( gzread ( fd, var, sizeof(unsigned int) ) > 0 ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(unsigned int) ) != sizeof(unsigned int) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned int*)var);
+    }
 }
 
 
 void sgWriteUInt ( gzFile fd, const unsigned int var )
 {
-    if ( gzwrite ( fd, (void *)(&var), sizeof(unsigned int) ) > 0 ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned int*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(unsigned int) )
+	 != sizeof(unsigned int) )
+    {
+        write_error = true ;
+    }
 }
 
 
 void sgReadInt ( gzFile fd, int *var )
 {
-    if ( gzread ( fd, var, sizeof(int) ) > 0 ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(int) ) != sizeof(int) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned int*)var);
+    }
 }
 
 
 void sgWriteInt ( gzFile fd, const int var )
 {
-    if ( gzwrite ( fd, (void *)(&var), sizeof(int) ) > 0 ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned int*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(int) ) != sizeof(int) ) {
+        write_error = true ;
+    }
 }
 
 
 void sgReadLong ( gzFile fd, long int *var )
 {
-    if ( gzread ( fd, var, sizeof(long int) ) > 0 ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(long int) ) != sizeof(long int) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned int*)var);
+    }
 }
 
 
 void sgWriteLong ( gzFile fd, const long int var )
 {
-    if ( gzwrite ( fd, (void *)(&var), sizeof(long int) ) > 0 ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned int*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(long int) )
+         != sizeof(long int) )
+    {
+        write_error = true ;
+    }
+}
+
+
+void sgReadLongLong ( gzFile fd, long long int *var )
+{
+    if ( gzread ( fd, var, sizeof(long long int) ) != sizeof(long long int) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned long long int*)var);
+    }
+}
+
+
+void sgWriteLongLong ( gzFile fd, const long long int var )
+{
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned long long*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(long long int) )
+         != sizeof(long long int) )
+    {
+        write_error = true ;
+    }
 }
 
 
 void sgReadUShort ( gzFile fd, unsigned short *var )
 {
-    if ( gzread ( fd, var, sizeof(unsigned short) ) > 0 ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(unsigned short) ) != sizeof(unsigned short) ){
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned short int*)var);
+    }
 }
 
 
 void sgWriteUShort ( gzFile fd, const unsigned short var )
 {
-    if ( gzwrite ( fd, (void *)(&var), sizeof(unsigned short) ) > 0 ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned short*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(unsigned short) )
+	 != sizeof(unsigned short) )
+    {
+        write_error = true ;
+    }
 }
 
 
 void sgReadShort ( gzFile fd, short *var )
 {
-    if ( gzread ( fd, var, sizeof(short) ) > 0 ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(short) ) != sizeof(short) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned short int*)var);
+    }
 }
 
 
 void sgWriteShort ( gzFile fd, const short var )
 {
-    if ( gzwrite ( fd, (void *)(&var), sizeof(short) ) > 0 ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        sgEndianSwap( (unsigned short*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(short) ) != sizeof(short) ) {
+        write_error = true ;
+    }
 }
 
 
 void sgReadFloat ( gzFile fd, const unsigned int n, float *var )
 {
-    if ( gzread ( fd, var, sizeof(float) * n ) == (int)n ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(float) * n ) != (int)(sizeof(float) * n) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned int*)var++);
+        }
+    }
 }
 
 
 void sgWriteFloat ( gzFile fd, const unsigned int n, const float *var )
 {
-    if ( gzwrite ( fd, (void *)var, sizeof(float) * n ) == (int)n ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        float *swab = new float[n];
+        float *ptr = swab;
+        memcpy( swab, var, sizeof(float) * n );
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned int*)ptr++);
+        }
+        var = swab;
+    }
+    if ( gzwrite ( fd, (void *)var, sizeof(float) * n )
+	 != (int)(sizeof(float) * n) )
+    {
+        write_error = true ;
+    }
 }
 
 void sgReadDouble ( gzFile fd, const unsigned int n, double *var )
 {
-    if ( gzread ( fd, var, sizeof(double) * n ) == (int)n ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(double) * n ) != (int)(sizeof(double) * n) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned long long*)var++);
+        }
+    }
 }
 
 
 void sgWriteDouble ( gzFile fd, const unsigned int n, const double *var )
 {
-    if ( gzwrite ( fd, (void *)var, sizeof(double) * n ) == (int)n ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        double *swab = new double[n];
+        double *ptr = swab;
+        memcpy( swab, var, sizeof(double) * n );
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned long long*)ptr++);
+        }
+        var = swab;
+    }
+    if ( gzwrite ( fd, (void *)var, sizeof(double) * n )
+	 != (int)(sizeof(double) * n) )
+    {
+        write_error = true ;
+    }
 }
 
-void sgReadBytes   ( gzFile fd, const unsigned int n, void *var ) 
+void sgReadBytes ( gzFile fd, const unsigned int n, void *var ) 
 {
-    if ( n == 0)
-	return;
-    if ( gzread ( fd, var, n ) > 0 ) 
-	return ;
-    read_error = true ;
+    if ( n == 0) return;
+    if ( gzread ( fd, var, n ) != (int)n ) {
+        read_error = true ;
+    }
 }
 
 void sgWriteBytes ( gzFile fd, const unsigned int n, const void *var ) 
 {
-    if ( n == 0)
-	return;
-    if ( gzwrite ( fd, (void *)var, n ) > 0 ) 
-	return ;
-    write_error = true ;
+    if ( n == 0) return;
+    if ( gzwrite ( fd, (void *)var, n ) != (int)n ) {
+        write_error = true ;
+    }
 }
 
 
 void sgReadUShort ( gzFile fd, const unsigned int n, unsigned short *var )
 {
-    if ( gzread ( fd, var, sizeof(unsigned short) * n ) == (int)n ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(unsigned short) * n )
+	 != (int)(sizeof(unsigned short) * n) )
+    {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned short int*)var++);
+        }
+    }
 }
 
 
 void sgWriteUShort ( gzFile fd, const unsigned int n, const unsigned short *var )
 {
-    if ( gzwrite ( fd, (void *)var, sizeof(unsigned short) * n ) == (int)n ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        unsigned short *swab = new unsigned short[n];
+        unsigned short *ptr = swab;
+        memcpy( swab, var, sizeof(unsigned short) * n );
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned short*)ptr++);
+        }
+        var = swab;
+    }
+    if ( gzwrite ( fd, (void *)var, sizeof(unsigned short) * n )
+	 != (int)(sizeof(unsigned short) * n) )
+    {
+        write_error = true ;
+    }
 }
 
 
 
 void sgReadShort ( gzFile fd, const unsigned int n, short *var )
 {
-    if ( gzread ( fd, var, sizeof(short) * n ) == (int)n ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(short) * n )
+	 != (int)(sizeof(short) * n) )
+    {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned short int*)var++);
+        }
+    }
 }
 
 
 void sgWriteShort ( gzFile fd, const unsigned int n, const short *var )
 {
-    if ( gzwrite ( fd, (void *)var, sizeof(short) * n ) == (int)n ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        short *swab = new short[n];
+        short *ptr = swab;
+        memcpy( swab, var, sizeof(short) * n );
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned short*)ptr++);
+        }
+        var = swab;
+    }
+    if ( gzwrite ( fd, (void *)var, sizeof(short) * n )
+	 != (int)(sizeof(short) * n) )
+    {
+        write_error = true ;
+    }
 }
 
 
 void sgReadUInt ( gzFile fd, const unsigned int n, unsigned int *var )
 {
-    if ( gzread ( fd, var, sizeof(unsigned int)* n ) == (int)n ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(unsigned int) * n )
+	 != (int)(sizeof(unsigned int) * n) )
+    {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned int*)var++);
+        }
+    }
 }
 
 
 void sgWriteUInt ( gzFile fd, const unsigned int n, const unsigned int *var )
 {
-    if ( gzwrite ( fd, (void *)var, sizeof(unsigned int) * n ) == (int)n ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        unsigned int *swab = new unsigned int[n];
+        unsigned int *ptr = swab;
+        memcpy( swab, var, sizeof(unsigned int) * n );
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned int*)ptr++);
+        }
+        var = swab;
+    }
+    if ( gzwrite ( fd, (void *)var, sizeof(unsigned int) * n )
+	 != (int)(sizeof(unsigned int) * n) )
+    {
+        write_error = true ;
+    }
 }
 
 
 
 void sgReadInt ( gzFile fd, const unsigned int n, int *var )
 {
-    if ( gzread ( fd, var, sizeof(int) * n ) == (int)n ) return ;
-    read_error = true ;
+    if ( gzread ( fd, var, sizeof(int) * n )
+	 != (int)(sizeof(int) * n) )
+    {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian ) {
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned int*)var++);
+        }
+    }
 }
 
 
 void sgWriteInt ( gzFile fd, const unsigned int n, const int *var )
 {
-    if ( gzwrite ( fd, (void *)var, sizeof(int) * n ) == (int)n ) return ;
-    write_error = true ;
+    if ( sgIsBigEndian ) {
+        int *swab = new int[n];
+        int *ptr = swab;
+        memcpy( swab, var, sizeof(int) * n );
+        for ( unsigned int i = 0; i < n; ++i ) {
+            sgEndianSwap( (unsigned int*)ptr++);
+        }
+        var = swab;
+    }
+    if ( gzwrite ( fd, (void *)var, sizeof(int) * n )
+	 != (int)(sizeof(int) * n) )
+    {
+        write_error = true ;
+    }
 }
 
 
@@ -257,14 +488,13 @@ void sgReadString ( gzFile fd, char **var )
     int i ;
     char s [ MAX_ENTITY_NAME_LENGTH ] ;
 
-    for ( i = 0 ; i < MAX_ENTITY_NAME_LENGTH ; i++ )
-	{
-	    int c = gzgetc ( fd ) ;
-	    s [ i ] = c ;
+    for ( i = 0 ; i < MAX_ENTITY_NAME_LENGTH ; i++ ) {
+	int c = gzgetc ( fd ) ;
+	s [ i ] = c ;
 
-	    if ( c == '\0' )
-		break ;
-	}
+	if ( c == '\0' )
+	    break ;
+    }
 
     if ( i >= MAX_ENTITY_NAME_LENGTH-1 )
 	s [ MAX_ENTITY_NAME_LENGTH-1 ] = '\0' ;
@@ -272,11 +502,10 @@ void sgReadString ( gzFile fd, char **var )
 
     if ( s[0] == '\0' )
 	*var = NULL ;
-    else
-	{
-	    *var = new char [ strlen(s)+1 ] ;
-	    strcpy ( *var, s ) ;
-	}
+    else {
+	*var = new char [ strlen(s)+1 ] ;
+	strcpy ( *var, s ) ;
+    }
 }
 
 
@@ -293,16 +522,28 @@ void sgWriteString ( gzFile fd, const char *var )
 
 
 void sgReadVec2  ( gzFile fd, sgVec2 var ) { sgReadFloat  ( fd, 2, var ) ; }
-void sgWriteVec2 ( gzFile fd, const sgVec2 var ) { sgWriteFloat ( fd, 2, var ) ; }
+void sgWriteVec2 ( gzFile fd, const sgVec2 var ) {
+    sgWriteFloat ( fd, 2, var ) ;
+}
 
 void sgReadVec3  ( gzFile fd, sgVec3 var ) { sgReadFloat  ( fd, 3, var ) ; }
-void sgWriteVec3 ( gzFile fd, const sgVec3 var ) { sgWriteFloat ( fd, 3, var ) ; }
+void sgWriteVec3 ( gzFile fd, const sgVec3 var ) {
+    sgWriteFloat ( fd, 3, var ) ;
+}
 
 void sgReaddVec3  ( gzFile fd, sgdVec3 var ) { sgReadDouble  ( fd, 3, var ) ; }
-void sgWritedVec3 ( gzFile fd, const sgdVec3 var ) { sgWriteDouble ( fd, 3, var ) ; }
+void sgWritedVec3 ( gzFile fd, const sgdVec3 var ) {
+    sgWriteDouble ( fd, 3, var ) ;
+}
 
 void sgReadVec4  ( gzFile fd, sgVec4 var ) { sgReadFloat  ( fd, 4, var ) ; }
-void sgWriteVec4 ( gzFile fd, const sgVec4 var ) { sgWriteFloat ( fd, 4, var ) ; }
+void sgWriteVec4 ( gzFile fd, const sgVec4 var ) {
+    sgWriteFloat ( fd, 4, var ) ;
+}
 
-void sgReadMat4  ( gzFile fd, sgMat4 var ) { sgReadFloat  ( fd, 16, (float *)var ) ; }
-void sgWriteMat4 ( gzFile fd, const sgMat4 var ) { sgWriteFloat ( fd, 16, (float *)var ) ; }
+void sgReadMat4  ( gzFile fd, sgMat4 var ) {
+    sgReadFloat  ( fd, 16, (float *)var ) ;
+}
+void sgWriteMat4 ( gzFile fd, const sgMat4 var ) {
+    sgWriteFloat ( fd, 16, (float *)var ) ;
+}