Changeset 364 for ps

Timestamp:

06/02/04 18:59:12 (21 years ago)

Author:

janwas

Message:

no message

Location:

ps/trunk/source

Files:

• graphics/ObjectEntry.cpp (modified) (1 diff)
• lib/lib.cpp (modified) (3 diffs)
• lib/lib.h (modified) (2 diffs)

ps/trunk/source/graphics/ObjectEntry.cpp

@@ -14 +14 @@
 
 // Gee's custom error handler
-#include <ps/XercesErrorHandler.h>
+#include "ps/XercesErrorHandler.h"
 
 #ifdef _MSC_VER

ps/trunk/source/lib/lib.cpp

@@ -20 +20 @@
 #include "lib.h"
 
+#include "sdl.h"    // endian functions
+
 
 // more powerful atexit, with 0 or 1 parameters.
@@ -292 +294 @@
     }
 
-    int l = round(in * 255.0);
+    int l = (int)(in * 255.0);
     assert((unsigned int)l <= 255);
     return (u8)l;
@@ -307 +309 @@
     }
 
-    long l = round(in * 65535.0);
+    long l = (long)(in * 65535.0);
     assert((unsigned long)l <= 65535);
     return (u16)l;
 }
 
+
+
+
+
+inline u16 read_le16(const void* p)
+{
+#if SDL_BYTE_ORDER == SDL_BIG_ENDIAN
+    const u8* _p = (const u8*)p;
+    return (u16)_p[0] | (u16)_p[1] << 8;
+#else
+    return *(u16*)p;
+#endif
+}
+
+
+inline u32 read_le32(const void* p)
+{
+#if SDL_BYTE_ORDER == SDL_BIG_ENDIAN
+    return SDL_Swap32(*(u32*)p);
+#else
+    return *(u32*)p;
+#endif
+}
 
 

ps/trunk/source/lib/lib.h

@@ -200 +200 @@
 inline int atexit2(void (*func)())
 {
-    atexit2((void *)func);
+    return atexit2((void *)func);
 }
 
@@ -239 +239 @@
 
 
-
-
-static inline u16 read_le16(const void* p)
-{
-#if __BYTE_ORDER == __BIG_ENDIAN
-    const u8* _p = (const u8*)p;
-    return (u16)_p[0] | (u16)_p[1] << 8;
-#else
-    return *(u16*)p;
-#endif
-}
-
-
-static inline u32 read_le32(const void* p)
-{
-#if __BYTE_ORDER == __BIG_ENDIAN
-    u32 t = 0;
-    for(int i = 0; i < 4; i++)
-    {
-        t <<= 8;
-        t |= *((const u8*)p)++;
-    }
-    return t;
-#else
-    return *(u32*)p;
-#endif
-}
+extern u16 read_le16(const void* p);
+extern u32 read_le32(const void* p);