diff -Naupr SDL_Pango-0.1.2.orig/src/SDL_Pango.c SDL_Pango-0.1.2/src/SDL_Pango.c --- SDL_Pango-0.1.2.orig/src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100 +++ SDL_Pango-0.1.2/src/SDL_Pango.c 2008-12-22 19:12:19.501265024 +0100 @@ -286,6 +286,59 @@ typedef struct _contextImpl { } contextImpl; +const SDLPango_Matrix _MATRIX_WHITE_BACK += {{{255, 0, 0, 0}, + {255, 0, 0, 0}, + {255, 0, 0, 0}, + {255, 255, 0, 0}}}; + +/*! + Specifies white back and black letter. +*/ +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}}}; +/*! + 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}}}; +/*! + 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}}}; +/*! + 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}}}; +/*! + Specifies transparent back and transparent letter. + This is useful for KARAOKE like rendering. +*/ +const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER; + + /*! Initialize the Glib and Pango API. This must be called before using other functions in this library, diff -Naupr SDL_Pango-0.1.2.orig/src/SDL_Pango.h SDL_Pango-0.1.2/src/SDL_Pango.h --- SDL_Pango-0.1.2.orig/src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100 +++ SDL_Pango-0.1.2/src/SDL_Pango.h 2008-12-22 19:09:17.181371664 +0100 @@ -46,57 +46,27 @@ typedef struct _SDLPango_Matrix { Uint8 m[4][4]; /*! Matrix variables */ } SDLPango_Matrix; -const SDLPango_Matrix _MATRIX_WHITE_BACK - = {255, 0, 0, 0, - 255, 0, 0, 0, - 255, 0, 0, 0, - 255, 255, 0, 0,}; - /*! Specifies white back and black letter. */ -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,}; +extern const SDLPango_Matrix *MATRIX_WHITE_BACK; /*! 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,}; +extern const SDLPango_Matrix *MATRIX_BLACK_BACK; /*! 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,}; +extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER; /*! 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,}; +extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER; /*! Specifies transparent back and transparent letter. This is useful for KARAOKE like rendering. */ -const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER; +extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER; /*! Specifies direction of text. See Pango reference for detail