summaryrefslogtreecommitdiff
path: root/osdbase.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-08-11 13:32:23 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2002-08-11 13:32:23 +0200
commit9a1a16f3d42b2f48b26eb3daef3a195fc0f2a13e (patch)
tree7d7d8667832651e37cd8de53296d0bcd32dba085 /osdbase.c
parentb9c4cb0ec9c417c483be2a40cd66f839b063015f (diff)
downloadvdr-9a1a16f3d42b2f48b26eb3daef3a195fc0f2a13e.tar.gz
vdr-9a1a16f3d42b2f48b26eb3daef3a195fc0f2a13e.tar.bz2
Consistently using malloc/free and new/delete
Diffstat (limited to 'osdbase.c')
-rw-r--r--osdbase.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/osdbase.c b/osdbase.c
index 0d6e2a3a..70e11bfa 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,11 +4,12 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osdbase.c 1.5 2002/07/13 14:42:47 kls Exp $
+ * $Id: osdbase.c 1.6 2002/08/11 11:47:21 kls Exp $
*/
#include "osdbase.h"
#include <signal.h>
+#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/unistd.h>
@@ -109,7 +110,7 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
fontType = fontOsd;
font = NULL;
if (width > 0 && height > 0) {
- bitmap = new char[width * height];
+ bitmap = MALLOC(char, width * height);
if (bitmap) {
Clean();
memset(bitmap, 0x00, width * height);
@@ -125,7 +126,7 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
cBitmap::~cBitmap()
{
delete font;
- delete bitmap;
+ free(bitmap);
}
eDvbFont cBitmap::SetFont(eDvbFont Font)