1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
--- vdrold/osdbase.c 2004-06-13 13:52:47.000000000 +0200
+++ vdr-1.2.6/osdbase.c 2004-06-13 13:49:23.000000000 +0200
@@ -116,7 +116,7 @@
fontType = fontOsd;
font = NULL;
if (width > 0 && height > 0) {
- bitmap = MALLOC(char, width * height);
+ bitmap = MALLOC(unsigned char, width * height);
if (bitmap) {
Clean();
memset(bitmap, 0x00, width * height);
@@ -188,7 +188,7 @@
dirtyY2 = -1;
}
-void cBitmap::SetIndex(int x, int y, char Index)
+void cBitmap::SetIndex(int x, int y, unsigned char Index)
{
if (bitmap) {
if (0 <= x && x < width && 0 <= y && y < height) {
@@ -269,7 +269,7 @@
Fill(0, 0, width - 1, height - 1, clrBackground);
}
-const char *cBitmap::Data(int x, int y)
+const unsigned char *cBitmap::Data(int x, int y)
{
return &bitmap[y * width + x];
}
@@ -329,7 +329,7 @@
cBitmap::Text(x, y, s, ColorFg, ColorBg);
}
-const char *cWindow::Data(int x, int y)
+const unsigned char *cWindow::Data(int x, int y)
{
return cBitmap::Data(x, y);
}
--- vdrold/osdbase.h 2004-06-13 13:52:47.000000000 +0200
+++ vdr-1.2.6/osdbase.h 2004-06-13 13:48:49.000000000 +0200
@@ -75,7 +75,7 @@
private:
cFont *font;
eDvbFont fontType;
- char *bitmap;
+ unsigned char *bitmap;
bool clearWithBackground;
protected:
int width, height;
@@ -86,7 +86,7 @@
bool ClearWithBackground(void) { return clearWithBackground; }
eDvbFont SetFont(eDvbFont Font);
bool Dirty(int &x1, int &y1, int &x2, int &y2);
- void SetIndex(int x, int y, char Index);
+ void SetIndex(int x, int y, unsigned char Index);
void SetPixel(int x, int y, eDvbColor Color);
void SetBitmap(int x, int y, const cBitmap &Bitmap);
int Width(void) { return width; }
@@ -97,7 +97,7 @@
void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
void Clean(void);
void Clear(void);
- const char *Data(int x, int y);
+ const unsigned char *Data(int x, int y);
};
#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
@@ -122,7 +122,7 @@
void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
void SetBitmap(int x, int y, const cBitmap &Bitmap);
void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
- const char *Data(int x, int y);
+ const unsigned char *Data(int x, int y);
};
typedef int tWindowHandle;
|
