summaryrefslogtreecommitdiff
path: root/osd.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2007-07-22 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2007-07-22 18:00:00 +0200
commit8849308cf9ad1e85ed1790aa832806ce7f74e565 (patch)
tree1de7a670996e00aa1572939e24193669745455e0 /osd.c
parenta9c7f0de90a44ea7c031154d47b092faed74f90b (diff)
downloadvdr-patch-lnbsharing-8849308cf9ad1e85ed1790aa832806ce7f74e565.tar.gz
vdr-patch-lnbsharing-8849308cf9ad1e85ed1790aa832806ce7f74e565.tar.bz2
Version 1.5.6vdr-1.5.6
- Fixed a buffer overflow in initializing the system character table (thanks to Marco Schlüßler). - Updated the Russian OSD texts (thanks to Oleg Roitburd). - Fixed handling single byte characters >0x7F in Utf8ToArray() (thanks to Udo Richter). - Improved numdigits(), isnumber() and strreplace() (thanks to Tobias Bratfisch). - Fixed clearing color buttons in the 'curses' skin (thanks to Udo Richter). - Fixed a typo in the function name of cOsd::SetOsdPosition() and added a range check to it (thanks to Christoph Haubrich). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Improved cControl::Launch() to keep 'control' from pointing to uninitialized memory (thanks to Rolf Ahrenberg). - Made skipspace() an inline function (suggested by Tobias Bratfisch) and changed it to handle the most common case of 'no leading space' very fast, and avoid calling isspace(), which made the whole function a lot faster. - Fixed detection of Premiere NVOD channel links (thanks to Markus Hahn). - Added a table of the used trick speed values to the description of cDevice::TrickSpeed() (suggested by Martin Dauskardt). - Added a missing 'P' to vdr.c's SHUTDOWNCANCELROMPT macro (reported by Marco Schlüßler).
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 188ee9d..c60518c 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.70 2007/06/17 13:54:34 kls Exp $
+ * $Id: osd.c 1.71 2007/07/20 14:51:36 kls Exp $
*/
#include "osd.h"
@@ -668,12 +668,12 @@ cOsd::~cOsd()
isOpen--;
}
-void cOsd::SetOsdPostion(int Left, int Top, int Width, int Height)
+void cOsd::SetOsdPosition(int Left, int Top, int Width, int Height)
{
osdLeft = Left;
osdTop = Top;
- osdWidth = Width;
- osdHeight = Height;
+ osdWidth = min(max(Width, MINOSDWIDTH), MAXOSDWIDTH);
+ osdHeight = min(max(Height, MINOSDHEIGHT), MAXOSDHEIGHT);
}
void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)