Changeset 240Tweet

Timestamp:

Nov 30, 2003, 5:34:04 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/io.c: + Removed a useless message.
• src/bitmap.c examples/view.c: + Really fixed the endianness issue.

Location:

libcaca/trunk

Files:

• examples/view.c (modified) (1 diff)
• src/bitmap.c (modified) (3 diffs)
• src/io.c (modified) (1 diff)

libcaca/trunk/examples/view.c

@@ -62 +62 @@
 #endif
     {
+        rmask = 0x0000ff00; gmask = 0x00ff0000; bmask = 0xff000000;
+    }
+    else
+    {
         rmask = 0x00ff0000; gmask = 0x0000ff00; bmask = 0x000000ff;
-    }
-    else
-    {
-        rmask = 0x0000ff00; gmask = 0x00ff0000; bmask = 0xff000000;
     }
 

libcaca/trunk/src/bitmap.c

@@ -38 +38 @@
 #endif
 
+#ifdef HAVE_ENDIAN_H
+#   include <endian.h>
+#endif
+
 #include <stdlib.h>
 
@@ -237 +241 @@
                             unsigned int *g, unsigned int *b)
 {
-    unsigned int bits;
+    uint32_t bits;
 
     pixels += (bitmap->bpp / 8) * x + bitmap->pitch * y;
@@ -244 +248 @@
     {
         case 4:
-            bits = ((uint32_t)pixels[0] << 24) |
-                   ((uint32_t)pixels[1] << 16) |
-                   ((uint32_t)pixels[2] << 8) |
-                   ((uint32_t)pixels[3]);
+            bits = *(uint32_t *)pixels;
             break;
         case 3:
-            bits = ((uint32_t)pixels[0] << 16) |
-                   ((uint32_t)pixels[1] << 8) |
-                   ((uint32_t)pixels[2]);
+        {
+#ifdef HAVE_ENDIAN_H
+            if(__BYTE_ORDER == __BIG_ENDIAN)
+#else
+            static const uint32_t rmask = 0x12345678;
+            if(*(uint8_t *)&rmask == 0x12)
+#endif
+                bits = ((uint32_t)pixels[0] << 16) |
+                       ((uint32_t)pixels[1] << 8) |
+                       ((uint32_t)pixels[2]);
+            else
+                bits = ((uint32_t)pixels[2] << 16) |
+                       ((uint32_t)pixels[1] << 8) |
+                       ((uint32_t)pixels[0]);
             break;
+        }
         case 2:
-            bits = ((uint16_t)pixels[0] << 8) |
-                   ((uint16_t)pixels[1]);
+            bits = *(uint16_t *)pixels;
             break;
         case 1:

libcaca/trunk/src/io.c

@@ -171 +171 @@
     }
 
-caca_printf(0,0, "unknown esc sequence %2x %2x %2x %2x %2x\n", '\x1b', keybuf[0], keybuf[1], keybuf[2], keybuf[3]);
     /* Unknown escape sequence: return the ESC key */
     return CACA_EVENT_KEY_PRESS | '\x1b';