From 2a5a55cee77c35c437e9f92cbc012e4ffe223dd3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 5 Jun 2004 11:24:37 +0200
Subject: [PATCH] Fixed cBitmap::DrawPixel(), which messed with other bitmaps'
 palettes in case the pixel coordinates were outside this bitmap

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 5 ++++-
 config.h     | 6 +++---
 osd.c        | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cb59f2f8..bb7d68fd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -713,6 +713,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for suggesting to map the color name "None" to #00000000 when processing XPM data
  for suggesting to also reset the palette in cBitmap::DrawBitmap() if the entire
  bitmap area is covered
+ for reporting a bug in cBitmap::DrawPixel(), which messed with other bitmaps'
+ palettes in case the pixel coordinates were outside this bitmap
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
diff --git a/HISTORY b/HISTORY
index f9b5c86c..87e91ce9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2870,6 +2870,9 @@ Video Disk Recorder Revision History
   available by compiling VDR with DEBUG_OSD. Some things may not yet work as they
   should, but it's a starting point.
 
-2004-05-31: Version 1.3.10
+2004-06-05: Version 1.3.10
 
 - Fixed some default parameters in 'skincurses'.
+- Fixed cBitmap::DrawPixel(), which messed with other bitmaps' palettes in case
+  the pixel coordinates were outside this bitmap (thanks to Sascha Volkenandt for
+  reporting this one).
diff --git a/config.h b/config.h
index 3f62fcb5..f9d50164 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.196 2004/05/28 13:16:03 kls Exp $
+ * $Id: config.h 1.197 2004/06/05 10:06:50 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.9"
-#define VDRVERSNUM   10309  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.10"
+#define VDRVERSNUM   10310  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/osd.c b/osd.c
index a63d0e15..7feee784 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.48 2004/05/28 15:33:22 kls Exp $
+ * $Id: osd.c 1.49 2004/06/05 11:15:43 kls Exp $
  */
 
 #include "osd.h"
@@ -324,7 +324,8 @@ void cBitmap::DrawPixel(int x, int y, tColor Color)
 {
   x -= x0;
   y -= y0;
-  SetIndex(x, y, Index(Color));
+  if (0 <= x && x < width && 0 <= y && y < height)
+     SetIndex(x, y, Index(Color));
 }
 
 void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg)