wok-6.x view libsdl-pango/stuff/matrix_declarations.patch @ rev 14568

Up xorg-libXrender (0.9.8), xorg-libXrandr (1.4.1)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri May 24 12:00:25 2013 +0200 (2013-05-24)
parents
children
line source
1 Index: SDL_Pango-0.1.2/src/SDL_Pango.c
2 ===================================================================
3 --- SDL_Pango-0.1.2.orig/src/SDL_Pango.c 2007-09-18 15:03:10.732910311 +0200
4 +++ SDL_Pango-0.1.2/src/SDL_Pango.c 2007-09-18 15:04:41.970109622 +0200
5 @@ -286,6 +286,59 @@
6 } contextImpl;
7
8
9 +const SDLPango_Matrix _MATRIX_WHITE_BACK
10 + = {255, 0, 0, 0,
11 + 255, 0, 0, 0,
12 + 255, 0, 0, 0,
13 + 255, 255, 0, 0,};
14 +
15 +/*!
16 + Specifies white back and black letter.
17 +*/
18 +const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
19 +
20 +const SDLPango_Matrix _MATRIX_BLACK_BACK
21 + = {0, 255, 0, 0,
22 + 0, 255, 0, 0,
23 + 0, 255, 0, 0,
24 + 255, 255, 0, 0,};
25 +/*!
26 + Specifies black back and white letter.
27 +*/
28 +const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
29 +
30 +const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
31 + = {0, 0, 0, 0,
32 + 0, 0, 0, 0,
33 + 0, 0, 0, 0,
34 + 0, 255, 0, 0,};
35 +/*!
36 + Specifies transparent back and black letter.
37 +*/
38 +const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
39 +
40 +const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
41 + = {255, 255, 0, 0,
42 + 255, 255, 0, 0,
43 + 255, 255, 0, 0,
44 + 0, 255, 0, 0,};
45 +/*!
46 + Specifies transparent back and white letter.
47 +*/
48 +const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
49 +
50 +const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
51 + = {255, 255, 0, 0,
52 + 255, 255, 0, 0,
53 + 255, 255, 0, 0,
54 + 0, 0, 0, 0,};
55 +/*!
56 + Specifies transparent back and transparent letter.
57 + This is useful for KARAOKE like rendering.
58 +*/
59 +const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
60 +
61 +
62 /*!
63 Initialize the Glib and Pango API.
64 This must be called before using other functions in this library,
65 Index: SDL_Pango-0.1.2/src/SDL_Pango.h
66 ===================================================================
67 --- SDL_Pango-0.1.2.orig/src/SDL_Pango.h 2007-09-18 15:03:10.732910311 +0200
68 +++ SDL_Pango-0.1.2/src/SDL_Pango.h 2007-09-18 15:06:24.919976401 +0200
69 @@ -47,57 +47,27 @@
70 Uint8 m[4][4]; /*! Matrix variables */
71 } SDLPango_Matrix;
72
73 -const SDLPango_Matrix _MATRIX_WHITE_BACK
74 - = {255, 0, 0, 0,
75 - 255, 0, 0, 0,
76 - 255, 0, 0, 0,
77 - 255, 255, 0, 0,};
78 -
79 /*!
80 Specifies white back and black letter.
81 */
82 -const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
83 -
84 -const SDLPango_Matrix _MATRIX_BLACK_BACK
85 - = {0, 255, 0, 0,
86 - 0, 255, 0, 0,
87 - 0, 255, 0, 0,
88 - 255, 255, 0, 0,};
89 +extern const SDLPango_Matrix *MATRIX_WHITE_BACK;
90 /*!
91 Specifies black back and white letter.
92 */
93 -const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
94 -
95 -const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
96 - = {0, 0, 0, 0,
97 - 0, 0, 0, 0,
98 - 0, 0, 0, 0,
99 - 0, 255, 0, 0,};
100 +extern const SDLPango_Matrix *MATRIX_BLACK_BACK;
101 /*!
102 Specifies transparent back and black letter.
103 */
104 -const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
105 -
106 -const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
107 - = {255, 255, 0, 0,
108 - 255, 255, 0, 0,
109 - 255, 255, 0, 0,
110 - 0, 255, 0, 0,};
111 +extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
112 /*!
113 Specifies transparent back and white letter.
114 */
115 -const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
116 -
117 -const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
118 - = {255, 255, 0, 0,
119 - 255, 255, 0, 0,
120 - 255, 255, 0, 0,
121 - 0, 0, 0, 0,};
122 +extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
123 /*!
124 Specifies transparent back and transparent letter.
125 This is useful for KARAOKE like rendering.
126 */
127 -const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
128 +extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
129
130 /*!
131 Specifies direction of text. See Pango reference for detail