Added SDL_FOURCC()

libsdl-org · Jul 8, 2010 · e3302d9b96dc701b26c4850e8aac95b003fa58cf · e3302d9
1 parent 13a96d8
commit e3302d9b96dc701b26c4850e8aac95b003fa58cf
Unified Split

Showing with 8 additions and 2 deletions.

+1 −2 include/SDL_pixels.h

+7 −0 include/SDL_stdinc.h
diff --git a/include/SDL_pixels.h b/include/SDL_pixels.h
@@ -112,8 +112,7 @@ enum
     SDL_PACKEDLAYOUT_1010102
 };
 
-#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) \
-    ((A) | ((B) << 8) | ((C) << 16) | ((D) << 24))
+#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D)
 
 #define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \
     ((1 << 31) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \

diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
@@ -101,6 +101,13 @@
 #endif
 /*@}*//*Cast operators*/
 
+/* Define a four character code as a Uint32 */
+#define SDL_FOURCC(A, B, C, D) \
+    ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24))
+
 /**
  *  \name Basic data types
  */