Fixed handling transparent areas in cDvbSpuBitmap

3 files changed, 5 insertions, 1 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 22e9f6ee..ba98b1e8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1160,6 +1160,7 @@ Marco Schlüßler <marco@lordzodiac.de>
  for increasing POLLTIMEOUTS_BEFORE_DEVICECLEAR in transfer.c to 6 to avoid problems
  with the larger buffer reserve
  for adding support for setting the video display mode
+ for fixing handling transparent areas in cDvbSpuBitmap
 
 Jürgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index 9079a82c..71d0791d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3484,3 +3484,4 @@ Video Disk Recorder Revision History
 - Added missing text internationalization for "Starting EPG scan" (thanks to
   Matthias Lötzke).
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed handling transparent areas in cDvbSpuBitmap (thanks to Marco Schlüßler).
diff --git a/dvbspu.c b/dvbspu.c
index 3ca780aa..5839d705 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.12 2005/02/06 09:54:51 kls Exp $
+ * $Id: dvbspu.c 1.13 2005/05/05 13:19:03 kls Exp $
  */
 
 #include <assert.h>
@@ -143,6 +143,8 @@ bool cDvbSpuBitmap::getMinSize(const aDvbSpuPalDescr paldescr,
     if (ret)
         DEBUG("MinSize: (%d, %d) x (%d, %d)\n",
               size.x1, size.y1, size.x2, size.y2);
+    if (size.x1 > size.x2 || size.y1 > size.y2)
+       return false;
 
     return ret;
 }