X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fio%2Flowlevel.cxx;h=f8c72342393e591583d2892ca321b8cd30d8f1d8;hb=bb383998bb77002a6d94e83e253de01e116f9268;hp=1439c070ab9330c34ca18460a1fdc9bcbc808be0;hpb=70f495b4e156dfa076b61f0afadbd288afbbba54;p=simgear.git

diff --git a/simgear/io/lowlevel.cxx b/simgear/io/lowlevel.cxx
index 1439c070..f8c72342 100644
--- a/simgear/io/lowlevel.cxx
+++ b/simgear/io/lowlevel.cxx
@@ -1,4 +1,4 @@
-// lowlevel.hxx -- routines to handle lowlevel compressed binary IO of
+// lowlevel.cxx -- routines to handle lowlevel compressed binary IO of
 //                 various datatypes
 //
 // Shamelessly adapted from plib (plib.sourceforge.net) January 2001
@@ -21,229 +21,436 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 // $Id$
-//
+
+
+#include <string.h>		// for memcpy()
 
 #include "lowlevel.hxx" 
 
+
 static int  read_error = false ;
 static int write_error = false ;
 
-int sgReadError  (void) { return  read_error ; }
-int sgWriteError (void) { return write_error ; }
+void sgClearReadError() { read_error = false; }
+void sgClearWriteError() { write_error = false; }
+int sgReadError() { return  read_error ; }
+int sgWriteError() { return write_error ; }
 
 
 void sgReadChar ( gzFile fd, char *var )
 {
-  if ( gzread ( fd, var, sizeof(char) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) return ;
-  read_error = true ;
+    if ( gzread ( fd, var, sizeof(double) ) != sizeof(double) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian() ) {
+        sgEndianSwap( (uint64*)var);
+    }
 }
 
 
 void sgWriteDouble ( gzFile fd, const double var )
 {
-  if ( gzwrite ( fd, (void *)(&var), sizeof(double) ) == 1 ) return ;
-  write_error = true ;
+    if ( sgIsBigEndian() ) {
+        sgEndianSwap( (uint64*)&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) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) 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, int64 *var )
+{
+    if ( gzread ( fd, var, sizeof(int64) ) != sizeof(int64) ) {
+        read_error = true ;
+    }
+    if ( sgIsBigEndian() ) {
+        sgEndianSwap( (uint64*)var);
+    }
+}
+
+
+void sgWriteLongLong ( gzFile fd, const int64 var )
+{
+    if ( sgIsBigEndian() ) {
+        sgEndianSwap( (uint64*)&var);
+    }
+    if ( gzwrite ( fd, (void *)(&var), sizeof(int64) )
+         != sizeof(int64) )
+    {
+        write_error = true ;
+    }
 }
 
 
 void sgReadUShort ( gzFile fd, unsigned short *var )
 {
-  if ( gzread ( fd, var, sizeof(unsigned short) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) 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) ) == 1 ) 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( (uint64*)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( (uint64*)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 ) == 1 ) 
-		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 ) == 1 ) 
-		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 ;
+    }
 }
 
 
@@ -252,55 +459,39 @@ void sgWriteInt ( gzFile fd, const unsigned int n, const int *var )
 
 void sgReadString ( gzFile fd, char **var )
 {
-  int i ;
-  char s [ MAX_ENTITY_NAME_LENGTH ] ;
+    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' ;
+    if ( i >= MAX_ENTITY_NAME_LENGTH-1 )
+	s [ MAX_ENTITY_NAME_LENGTH-1 ] = '\0' ;
 
 
-  if ( s[0] == '\0' )
-    *var = NULL ;
-  else
-  {
-    *var = new char [ strlen(s)+1 ] ;
-    strcpy ( *var, s ) ;
-  }
+    if ( s[0] == '\0' )
+	*var = NULL ;
+    else {
+	*var = new char [ strlen(s)+1 ] ;
+	strcpy ( *var, s ) ;
+    }
 }
 
 
 void sgWriteString ( gzFile fd, const char *var )
 {
-  if ( var != NULL ) {
-      if ( gzwrite ( fd, (void *)var, strlen(var) + 1 ) == 
-	   (int)(strlen(var) + 1) )
-	  return ;
-  } else {
-      gzputc( fd, 0 );
-  }
+    if ( var != NULL ) {
+	if ( gzwrite ( fd, (void *)var, strlen(var) + 1 ) == 
+	     (int)(strlen(var) + 1) )
+	    return ;
+    } else {
+	gzputc( fd, 0 );
+    }
 }
 
 
-void sgReadVec2  ( gzFile fd, sgVec2 var ) { sgReadFloat  ( 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 sgReaddVec3  ( gzFile fd, sgdVec3 var ) { sgReadDouble  ( 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 sgReadMat4  ( gzFile fd, sgMat4 var ) { sgReadFloat  ( fd, 16, (float *)var ) ; }
-void sgWriteMat4 ( gzFile fd, const sgMat4 var ) { sgWriteFloat ( fd, 16, (float *)var ) ; }