[vdr] [PATCH] Make font and bitmap data static const

Darren Salt linux at youmustbejoking.demon.co.uk
Fri Dec 9 00:16:36 CET 2005


The attached patch makes various data structures (fonts, bitmaps) static
const: they don't need to be exported and they don't need to be mutable.

There are a few minor ABI changes (parameter constness) as a result of this.

-- 
| Darren Salt | d youmustbejoking,demon,co,uk | nr. Ashington,
| Debian,     | s zap,tartarus,org            | Northumberland
| RISC OS     | @                             | Toon Army
|   <URL:http://www.youmustbejoking.demon.co.uk/progs.packages.html>

Troi of Borg: "Answer me... how does assimilation make you feel?"
-------------- next part --------------
diff -urNad vdr-1.3.37~/font.c vdr-1.3.37/font.c
--- vdr-1.3.37~/font.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/font.c	2005-12-05 17:10:01.807514710 +0000
@@ -37,7 +37,7 @@
 #include "fontsml-iso8859-15.c"
 // --- cFont -----------------------------------------------------------------
 
-static void *FontData[eDvbCodeSize][eDvbFontSize] = {
+static const void *const FontData[eDvbCodeSize][eDvbFontSize] = {
   { FontOsd_iso8859_1,  FontFix_iso8859_1,  FontSml_iso8859_1 },
   { FontOsd_iso8859_2,  FontFix_iso8859_2,  FontSml_iso8859_2 },
   { FontOsd_iso8859_5,  FontFix_iso8859_5,  FontSml_iso8859_5 },
@@ -58,12 +58,12 @@
 eDvbCode cFont::code = code_iso8859_1;
 cFont *cFont::fonts[eDvbFontSize] = { NULL };
 
-cFont::cFont(void *Data)
+cFont::cFont(const void *Data)
 {
   SetData(Data);
 }
 
-void cFont::SetData(void *Data)
+void cFont::SetData(const void *Data)
 {
   if (Data) {
      height = ((tCharData *)Data)->height;
@@ -112,7 +112,7 @@
      }
 }
 
-void cFont::SetFont(eDvbFont Font, void *Data)
+void cFont::SetFont(eDvbFont Font, const void *Data)
 {
   delete fonts[Font];
   fonts[Font] = new cFont(Data ? Data : FontData[code][Font]);
diff -urNad vdr-1.3.37~/font.h vdr-1.3.37/font.h
--- vdr-1.3.37~/font.h	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/font.h	2005-12-05 17:10:01.807514710 +0000
@@ -43,9 +43,9 @@
   const tCharData *data[NUMCHARS];
   int height;
 public:
-  cFont(void *Data);
+  cFont(const void *Data);
   virtual ~cFont() {}
-  void SetData(void *Data);
+  void SetData(const void *Data);
   virtual int Width(unsigned char c) const { return data[c]->width; }
       ///< Returns the width of the given character.
   virtual int Width(const char *s) const;
@@ -59,7 +59,7 @@
   const tCharData *CharData(unsigned char c) const { return data[c]; }
   static bool SetCode(const char *Code);
   static void SetCode(eDvbCode Code);
-  static void SetFont(eDvbFont Font, void *Data = NULL);
+  static void SetFont(eDvbFont Font, const void *Data = NULL);
   static const cFont *GetFont(eDvbFont Font);
   };
 
diff -urNad vdr-1.3.37~/fontfix-iso8859-1.c vdr-1.3.37/fontfix-iso8859-1.c
--- vdr-1.3.37~/fontfix-iso8859-1.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontfix-iso8859-1.c	2005-12-05 17:10:01.811514431 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 32
      15, 26,
diff -urNad vdr-1.3.37~/fontfix-iso8859-13.c vdr-1.3.37/fontfix-iso8859-13.c
--- vdr-1.3.37~/fontfix-iso8859-13.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontfix-iso8859-13.c	2005-12-05 17:10:01.815514152 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontFix_iso8859_13[][28] = {
   {             // 32
      15, 26,
diff -urNad vdr-1.3.37~/fontfix-iso8859-15.c vdr-1.3.37/fontfix-iso8859-15.c
--- vdr-1.3.37~/fontfix-iso8859-15.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontfix-iso8859-15.c	2005-12-05 17:10:01.819513873 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 32
      15, 26,
diff -urNad vdr-1.3.37~/fontfix-iso8859-2.c vdr-1.3.37/fontfix-iso8859-2.c
--- vdr-1.3.37~/fontfix-iso8859-2.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontfix-iso8859-2.c	2005-12-05 17:10:01.823513595 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 32
      15, 26,
diff -urNad vdr-1.3.37~/fontfix-iso8859-5.c vdr-1.3.37/fontfix-iso8859-5.c
--- vdr-1.3.37~/fontfix-iso8859-5.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontfix-iso8859-5.c	2005-12-05 17:10:01.827513316 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontFix_iso8859_5[][26] = {
   {             // 32
      15, 24,
diff -urNad vdr-1.3.37~/fontfix-iso8859-7.c vdr-1.3.37/fontfix-iso8859-7.c
--- vdr-1.3.37~/fontfix-iso8859-7.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontfix-iso8859-7.c	2005-12-05 17:10:01.831513037 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontFix_iso8859_7[][26] = {
   {             // 32
      11, 24,
diff -urNad vdr-1.3.37~/fontosd-iso8859-1.c vdr-1.3.37/fontosd-iso8859-1.c
--- vdr-1.3.37~/fontosd-iso8859-1.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontosd-iso8859-1.c	2005-12-05 17:10:01.835512758 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 32
      6, 27,
diff -urNad vdr-1.3.37~/fontosd-iso8859-13.c vdr-1.3.37/fontosd-iso8859-13.c
--- vdr-1.3.37~/fontosd-iso8859-13.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontosd-iso8859-13.c	2005-12-05 17:10:01.839512479 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontOsd_iso8859_13[][29] = {
   {             // 32
      6, 27,
diff -urNad vdr-1.3.37~/fontosd-iso8859-15.c vdr-1.3.37/fontosd-iso8859-15.c
--- vdr-1.3.37~/fontosd-iso8859-15.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontosd-iso8859-15.c	2005-12-05 17:10:01.843512200 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 32
      6, 27,
diff -urNad vdr-1.3.37~/fontosd-iso8859-2.c vdr-1.3.37/fontosd-iso8859-2.c
--- vdr-1.3.37~/fontosd-iso8859-2.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontosd-iso8859-2.c	2005-12-05 17:10:01.847511922 +0000
@@ -10,6 +10,7 @@
  *
  */
 
+static const
 cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 32
      6, 27,
diff -urNad vdr-1.3.37~/fontosd-iso8859-5.c vdr-1.3.37/fontosd-iso8859-5.c
--- vdr-1.3.37~/fontosd-iso8859-5.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontosd-iso8859-5.c	2005-12-05 17:10:01.851511643 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontOsd_iso8859_5[][24] = {
   {             // 32
      6, 22,
diff -urNad vdr-1.3.37~/fontosd-iso8859-7.c vdr-1.3.37/fontosd-iso8859-7.c
--- vdr-1.3.37~/fontosd-iso8859-7.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontosd-iso8859-7.c	2005-12-05 17:10:01.855511364 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontOsd_iso8859_7[][27] = {
   {             // 32
      12, 25,
diff -urNad vdr-1.3.37~/fontsml-iso8859-1.c vdr-1.3.37/fontsml-iso8859-1.c
--- vdr-1.3.37~/fontsml-iso8859-1.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontsml-iso8859-1.c	2005-12-05 17:10:01.859511085 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontSml_iso8859_1[][24] = {
   {             // 32
      5, 22,
diff -urNad vdr-1.3.37~/fontsml-iso8859-13.c vdr-1.3.37/fontsml-iso8859-13.c
--- vdr-1.3.37~/fontsml-iso8859-13.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontsml-iso8859-13.c	2005-12-05 17:10:01.863510806 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontSml_iso8859_13[][24] = {
   {             // 32
      5, 22,
diff -urNad vdr-1.3.37~/fontsml-iso8859-15.c vdr-1.3.37/fontsml-iso8859-15.c
--- vdr-1.3.37~/fontsml-iso8859-15.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontsml-iso8859-15.c	2005-12-05 17:10:01.863510806 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 32
      5, 22,
diff -urNad vdr-1.3.37~/fontsml-iso8859-2.c vdr-1.3.37/fontsml-iso8859-2.c
--- vdr-1.3.37~/fontsml-iso8859-2.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontsml-iso8859-2.c	2005-12-05 17:10:01.867510528 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 32
      5, 23,
diff -urNad vdr-1.3.37~/fontsml-iso8859-5.c vdr-1.3.37/fontsml-iso8859-5.c
--- vdr-1.3.37~/fontsml-iso8859-5.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontsml-iso8859-5.c	2005-12-05 17:10:01.871510249 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontSml_iso8859_5[][27] = {
   {             // 32
      5, 25,
diff -urNad vdr-1.3.37~/fontsml-iso8859-7.c vdr-1.3.37/fontsml-iso8859-7.c
--- vdr-1.3.37~/fontsml-iso8859-7.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/fontsml-iso8859-7.c	2005-12-05 17:10:01.875509970 +0000
@@ -1,3 +1,4 @@
+static const
 cFont::tPixelData FontSml_iso8859_7[][22] = {
   {             // 32
      9, 20,
diff -urNad vdr-1.3.37~/osd.c vdr-1.3.37/osd.c
--- vdr-1.3.37~/osd.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/osd.c	2005-12-05 17:10:29.005618694 +0000
@@ -112,7 +112,7 @@
   LoadXpm(FileName);
 }
 
-cBitmap::cBitmap(char *Xpm[])
+cBitmap::cBitmap(const char *const Xpm[])
 {
   bitmap = NULL;
   x0 = 0;
@@ -251,9 +251,9 @@
   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);
diff -urNad vdr-1.3.37~/osd.h vdr-1.3.37/osd.h
--- vdr-1.3.37~/osd.h	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/osd.h	2005-12-05 17:10:01.875509970 +0000
@@ -111,7 +111,7 @@
        ///< this offset (unless specified otherwise).
   cBitmap(const char *FileName);
        ///< Creates a bitmap and loads an XPM image from the given file.
-  cBitmap(char *Xpm[]);
+  cBitmap(const char *const Xpm[]);
        ///< Creates a bitmap from the given XPM data.
   virtual ~cBitmap();
   int X0(void) const { return x0; }
@@ -139,7 +139,7 @@
   bool LoadXpm(const char *FileName);
        ///< Calls SetXpm() with the data from the file FileName.
        ///< Returns true if the operation was successful.
-  bool SetXpm(char *Xpm[], bool IgnoreNone = false);
+  bool SetXpm(const char *const Xpm[], bool IgnoreNone = false);
        ///< Sets this bitmap to the given XPM data. Any previous bitmap or
        ///< palette data will be overwritten with the new data.
        ///< If IgnoreNone is true, a "none" color entry will be ignored.
diff -urNad vdr-1.3.37~/skinsttng.c vdr-1.3.37/skinsttng.c
--- vdr-1.3.37~/skinsttng.c	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/skinsttng.c	2005-12-05 17:10:01.879509691 +0000
@@ -723,7 +723,7 @@
   osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrReplayTitle), frameColor, cFont::GetFont(fontSml), x4 - x3 - 5);
 }
 
-static char **ReplaySymbols[2][2][5] = {
+static const char *const *ReplaySymbols[2][2][5] = {
   { { pause_xpm, srew_xpm, srew1_xpm, srew2_xpm, srew3_xpm },
     { pause_xpm, sfwd_xpm, sfwd1_xpm, sfwd2_xpm, sfwd3_xpm }, },
   { { play_xpm,  frew_xpm, frew1_xpm, frew2_xpm, frew3_xpm },
diff -urNad vdr-1.3.37~/symbols/arrowdown.xpm vdr-1.3.37/symbols/arrowdown.xpm
--- vdr-1.3.37~/symbols/arrowdown.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/arrowdown.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * arrowdown_xpm[] = {
+static const char *const arrowdown_xpm[] = {
 "12 12 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/arrowup.xpm vdr-1.3.37/symbols/arrowup.xpm
--- vdr-1.3.37~/symbols/arrowup.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/arrowup.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * arrowup_xpm[] = {
+static const char *const arrowup_xpm[] = {
 "12 12 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/audio.xpm vdr-1.3.37/symbols/audio.xpm
--- vdr-1.3.37~/symbols/audio.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/audio.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * audio_xpm[] = {
+static const char *const audio_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/audioleft.xpm vdr-1.3.37/symbols/audioleft.xpm
--- vdr-1.3.37~/symbols/audioleft.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/audioleft.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * audioleft_xpm[] = {
+static const char *const audioleft_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/audioright.xpm vdr-1.3.37/symbols/audioright.xpm
--- vdr-1.3.37~/symbols/audioright.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/audioright.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * audioright_xpm[] = {
+static const char *const audioright_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/audiostereo.xpm vdr-1.3.37/symbols/audiostereo.xpm
--- vdr-1.3.37~/symbols/audiostereo.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/audiostereo.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * audiostereo_xpm[] = {
+static const char *const audiostereo_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/dolbydigital.xpm vdr-1.3.37/symbols/dolbydigital.xpm
--- vdr-1.3.37~/symbols/dolbydigital.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/dolbydigital.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dolbydigital_xpm[] = {
+static const char *const dolbydigital_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/encrypted.xpm vdr-1.3.37/symbols/encrypted.xpm
--- vdr-1.3.37~/symbols/encrypted.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/encrypted.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * encrypted_xpm[] = {
+static const char *const encrypted_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/ffwd.xpm vdr-1.3.37/symbols/ffwd.xpm
--- vdr-1.3.37~/symbols/ffwd.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/ffwd.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ffwd_xpm[] = {
+static const char *const ffwd_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/ffwd1.xpm vdr-1.3.37/symbols/ffwd1.xpm
--- vdr-1.3.37~/symbols/ffwd1.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/ffwd1.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ffwd1_xpm[] = {
+static const char *const ffwd1_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/ffwd2.xpm vdr-1.3.37/symbols/ffwd2.xpm
--- vdr-1.3.37~/symbols/ffwd2.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/ffwd2.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ffwd2_xpm[] = {
+static const char *const ffwd2_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/ffwd3.xpm vdr-1.3.37/symbols/ffwd3.xpm
--- vdr-1.3.37~/symbols/ffwd3.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/ffwd3.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ffwd3_xpm[] = {
+static const char *const ffwd3_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/frew.xpm vdr-1.3.37/symbols/frew.xpm
--- vdr-1.3.37~/symbols/frew.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/frew.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * frew_xpm[] = {
+static const char *const frew_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/frew1.xpm vdr-1.3.37/symbols/frew1.xpm
--- vdr-1.3.37~/symbols/frew1.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/frew1.xpm	2005-12-05 17:10:01.879509691 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * frew1_xpm[] = {
+static const char *const frew1_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/frew2.xpm vdr-1.3.37/symbols/frew2.xpm
--- vdr-1.3.37~/symbols/frew2.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/frew2.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * frew2_xpm[] = {
+static const char *const frew2_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/frew3.xpm vdr-1.3.37/symbols/frew3.xpm
--- vdr-1.3.37~/symbols/frew3.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/frew3.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * frew3_xpm[] = {
+static const char *const frew3_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/mute.xpm vdr-1.3.37/symbols/mute.xpm
--- vdr-1.3.37~/symbols/mute.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/mute.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mute_xpm[] = {
+static const char *const mute_xpm[] = {
 "26 20 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/pause.xpm vdr-1.3.37/symbols/pause.xpm
--- vdr-1.3.37~/symbols/pause.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/pause.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pause_xpm[] = {
+static const char *const pause_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/play.xpm vdr-1.3.37/symbols/play.xpm
--- vdr-1.3.37~/symbols/play.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/play.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * play_xpm[] = {
+static const char *const play_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/radio.xpm vdr-1.3.37/symbols/radio.xpm
--- vdr-1.3.37~/symbols/radio.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/radio.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * radio_xpm[] = {
+static const char *const radio_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/recording.xpm vdr-1.3.37/symbols/recording.xpm
--- vdr-1.3.37~/symbols/recording.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/recording.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * recording_xpm[] = {
+static const char *const recording_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/sfwd.xpm vdr-1.3.37/symbols/sfwd.xpm
--- vdr-1.3.37~/symbols/sfwd.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/sfwd.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sfwd_xpm[] = {
+static const char *const sfwd_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/sfwd1.xpm vdr-1.3.37/symbols/sfwd1.xpm
--- vdr-1.3.37~/symbols/sfwd1.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/sfwd1.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sfwd1_xpm[] = {
+static const char *const sfwd1_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/sfwd2.xpm vdr-1.3.37/symbols/sfwd2.xpm
--- vdr-1.3.37~/symbols/sfwd2.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/sfwd2.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sfwd2_xpm[] = {
+static const char *const sfwd2_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/sfwd3.xpm vdr-1.3.37/symbols/sfwd3.xpm
--- vdr-1.3.37~/symbols/sfwd3.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/sfwd3.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sfwd3_xpm[] = {
+static const char *const sfwd3_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/srew.xpm vdr-1.3.37/symbols/srew.xpm
--- vdr-1.3.37~/symbols/srew.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/srew.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * srew_xpm[] = {
+static const char *const srew_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/srew1.xpm vdr-1.3.37/symbols/srew1.xpm
--- vdr-1.3.37~/symbols/srew1.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/srew1.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * srew1_xpm[] = {
+static const char *const srew1_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/srew2.xpm vdr-1.3.37/symbols/srew2.xpm
--- vdr-1.3.37~/symbols/srew2.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/srew2.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * srew2_xpm[] = {
+static const char *const srew2_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/srew3.xpm vdr-1.3.37/symbols/srew3.xpm
--- vdr-1.3.37~/symbols/srew3.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/srew3.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * srew3_xpm[] = {
+static const char *const srew3_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/teletext.xpm vdr-1.3.37/symbols/teletext.xpm
--- vdr-1.3.37~/symbols/teletext.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/teletext.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * teletext_xpm[] = {
+static const char *const teletext_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff -urNad vdr-1.3.37~/symbols/volume.xpm vdr-1.3.37/symbols/volume.xpm
--- vdr-1.3.37~/symbols/volume.xpm	2005-12-05 17:10:00.000000000 +0000
+++ vdr-1.3.37/symbols/volume.xpm	2005-12-05 17:10:01.883509412 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char * volume_xpm[] = {
+static const char *const volume_xpm[] = {
 "28 14 2 1",
 ".	c #FFFFFF",
 "+	c #000000",


More information about the vdr mailing list