[vlc-commits] commit: cdg: clean up preprocessor constants ( =?UTF-8?Q?R=C3=A9mi=20Denis=2DCourmont=20?=)

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jan 11 20:16:17 2011 +0200| [20be71aeb123e241cec6d361bc38b171ab150217] | committer: Rémi Denis-Courmont 

cdg: clean up preprocessor constants

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=20be71aeb123e241cec6d361bc38b171ab150217
---

 modules/codec/cdg.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c
index fe7b62d..dc8af43 100644
--- a/modules/codec/cdg.c
+++ b/modules/codec/cdg.c
@@ -37,18 +37,18 @@
  *****************************************************************************/
 
 /* The screen size */
-#define CDG_SCREEN_WIDTH (300)
-#define CDG_SCREEN_HEIGHT (216)
+#define CDG_SCREEN_WIDTH 300u
+#define CDG_SCREEN_HEIGHT 216u
 
 /* The border of the screen size */
-#define CDG_SCREEN_BORDER_WIDTH (6)
-#define CDG_SCREEN_BORDER_HEIGHT (12)
+#define CDG_SCREEN_BORDER_WIDTH 6u
+#define CDG_SCREEN_BORDER_HEIGHT 12u
 
 /* The display part */
 #define CDG_DISPLAY_WIDTH  (CDG_SCREEN_WIDTH-2*CDG_SCREEN_BORDER_WIDTH)
 #define CDG_DISPLAY_HEIGHT (CDG_SCREEN_HEIGHT-2*CDG_SCREEN_BORDER_HEIGHT)
 
-#define CDG_SCREEN_PITCH (CDG_SCREEN_WIDTH)
+#define CDG_SCREEN_PITCH CDG_SCREEN_WIDTH
 
 struct decoder_sys_t
 {
@@ -61,11 +61,11 @@ struct decoder_sys_t
     int     i_packet;
 };
 
-#define CDG_PACKET_SIZE (24)
+#define CDG_PACKET_SIZE 24u
 
-#define CDG_COLOR_R_SHIFT ( 0)
-#define CDG_COLOR_G_SHIFT ( 8)
-#define CDG_COLOR_B_SHIFT (16)
+#define CDG_COLOR_R_SHIFT  0
+#define CDG_COLOR_G_SHIFT  8
+#define CDG_COLOR_B_SHIFT 16
 
 /*****************************************************************************
  * Local prototypes