summaryrefslogtreecommitdiff
path: root/osd.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-02-05 13:55:58 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-02-05 13:55:58 +0100
commit7b97eb6e97d2156298bb06b0dfd13a12c68c525c (patch)
tree083314746cc5b635f0940e6da620af0620b10e28 /osd.c
parent978462168c1326ffe60a434dee9e9ee642a62695 (diff)
downloadvdr-7b97eb6e97d2156298bb06b0dfd13a12c68c525c.tar.gz
vdr-7b97eb6e97d2156298bb06b0dfd13a12c68c525c.tar.bz2
Made all font and image data 'const'
Diffstat (limited to 'osd.c')
-rw-r--r--osd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/osd.c b/osd.c
index 2ff9f2b2..e7dd9afc 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c 1.65 2005/12/30 15:42:04 kls Exp $
+ * $Id: osd.c 1.66 2006/02/05 13:46:37 kls Exp $
*/
#include "osd.h"
@@ -112,7 +112,7 @@ cBitmap::cBitmap(const char *FileName)
LoadXpm(FileName);
}
-cBitmap::cBitmap(char *Xpm[])
+cBitmap::cBitmap(const char *const Xpm[])
{
bitmap = NULL;
x0 = 0;
@@ -251,9 +251,9 @@ bool cBitmap::LoadXpm(const char *FileName)
return Result;
}
-bool cBitmap::SetXpm(char *Xpm[], bool IgnoreNone)
+bool cBitmap::SetXpm(const char *const Xpm[], bool IgnoreNone)
{
- char **p = Xpm;
+ const char *const *p = Xpm;
int w, h, n, c;
if (4 != sscanf(*p, "%d %d %d %d", &w, &h, &n, &c)) {
esyslog("ERROR: faulty 'values' line in XPM: '%s'", *p);