From: Miriam Ruiz <miriam@debian.org>
Date: Mon, 1 Dec 2008 13:38:55 +0000 (+0100)
Subject: Fix a bunch of compiler warnings
X-Git-Url: https://repo.or.cz/w/sdlpango.git/commitdiff_plain/5e15e99bb03e901b3fec285c80d295917592950e

Fix a bunch of compiler warnings
SDL_Pango-0.1.2-suppress-warning.patch revision 1.1 from Fedora
Obtained from http://cvs.fedoraproject.org/viewvc/devel/SDL_Pango/
---

diff --git a/src/SDL_Pango.c b/src/SDL_Pango.c
index 590924a..62adc23 100644
--- a/src/SDL_Pango.c
+++ b/src/SDL_Pango.c
@@ -287,10 +287,10 @@ typedef struct _contextImpl {
 
 
 const SDLPango_Matrix _MATRIX_WHITE_BACK
-    = {255, 0, 0, 0,
-       255, 0, 0, 0,
-       255, 0, 0, 0,
-       255, 255, 0, 0,};
+    = {{{255, 0, 0, 0},
+        {255, 0, 0, 0},
+        {255, 0, 0, 0},
+        {255, 255, 0, 0}}};
 
 /*!
     Specifies white back and black letter.
@@ -298,40 +298,40 @@ const SDLPango_Matrix _MATRIX_WHITE_BACK
 const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
 
 const SDLPango_Matrix _MATRIX_BLACK_BACK
-    = {0, 255, 0, 0,
-       0, 255, 0, 0,
-       0, 255, 0, 0,
-       255, 255, 0, 0,};
+    = {{{0, 255, 0, 0},
+        {0, 255, 0, 0},
+        {0, 255, 0, 0},
+        {255, 255, 0, 0}}};
 /*!
     Specifies black back and white letter.
 */
 const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
 
 const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
-    = {0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 255, 0, 0,};
+    = {{{0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 0, 0, 0},
+        {0, 255, 0, 0}}};
 /*!
     Specifies transparent back and black letter.
 */
 const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
 
 const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
-    = {255, 255, 0, 0,
-       255, 255, 0, 0,
-       255, 255, 0, 0,
-       0, 255, 0, 0,};
+    = {{{255, 255, 0, 0},
+        {255, 255, 0, 0},
+        {255, 255, 0, 0},
+        {0, 255, 0, 0}}};
 /*!
     Specifies transparent back and white letter.
 */
 const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
 
 const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
-    = {255, 255, 0, 0,
-       255, 255, 0, 0,
-       255, 255, 0, 0,
-       0, 0, 0, 0,};
+    = {{{255, 255, 0, 0},
+        {255, 255, 0, 0},
+        {255, 255, 0, 0},
+        {0, 0, 0, 0}}};
 /*!
     Specifies transparent back and transparent letter.
     This is useful for KARAOKE like rendering.
@@ -490,6 +490,10 @@ drawLine(
     PangoRectangle ink_rect;
     int x_off = 0;
 
+    /* only suppress warning */
+    fg_color.red = fg_color.green = fg_color.blue = 0;
+    bg_color.red = bg_color.green = bg_color.blue = 0;
+
     while (tmp_list) {
 	SDLPango_Matrix color_matrix = context->color_matrix;
 	PangoUnderline uline = PANGO_UNDERLINE_NONE;