From 329d7da4ecb00852a980ba407cf6cabd648d1e95 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 16 Jan 2009 14:39:27 +0100
Subject: [PATCH] Added some missing 'const' statements to cBitmap

---
 CONTRIBUTORS | 1 +
 HISTORY      | 1 +
 osd.c        | 4 ++--
 osd.h        | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 26674359..32f1d6af 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1315,6 +1315,7 @@ Andreas Regel <andreas.regel@gmx.de>
  for implementing palette replace mode in the OSD bitmaps
  for fixing handling numeric keys in the channel display after switching channel
  groups
+ for adding some missing 'const' statements to cBitmap
 
 Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
diff --git a/HISTORY b/HISTORY
index 55665d0b..a14dff9a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5924,3 +5924,4 @@ Video Disk Recorder Revision History
   is no longer necessary.
 - Added a typecast in cUnbufferedFile::Write() to avoid an error message when
   compiling on 64 bit systems.
+- Added some missing 'const' statements to cBitmap (thanks to Andreas Regel).
diff --git a/osd.c b/osd.c
index 47a11b21..32614d87 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.75 2007/10/12 12:38:36 kls Exp $
+ * $Id: osd.c 2.1 2009/01/16 14:34:32 kls Exp $
  */
 
 #include "osd.h"
@@ -635,7 +635,7 @@ void cBitmap::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
      }
 }
 
-const tIndex *cBitmap::Data(int x, int y)
+const tIndex *cBitmap::Data(int x, int y) const
 {
   return &bitmap[y * width + x];
 }
diff --git a/osd.h b/osd.h
index 42ebc1aa..addbf0ec 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.58 2007/10/12 14:28:44 kls Exp $
+ * $Id: osd.h 2.1 2009/01/16 14:37:03 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -231,9 +231,9 @@ public:
        ///< 5: vertical,   rising,  upper
        ///< 6: vertical,   falling, lower
        ///< 7: vertical,   falling, upper
-  const tIndex *Data(int x, int y);
+  const tIndex *Data(int x, int y) const;
        ///< Returns the address of the index byte at the given coordinates.
-  tColor GetColor(int x, int y) { return Color(*Data(x, y)); }
+  tColor GetColor(int x, int y) const { return Color(*Data(x, y)); }
        ///< Returns the color at the given coordinates.
   void ReduceBpp(const cPalette &Palette);
        ///< Reduces the color depth of the bitmap to that of the given Palette.