From 55f0978c326a5ec42638f68fc2ed5ef9ff8c6a39 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 5 Mar 2012 10:34:49 +0100 Subject: [PATCH] Added some missing member initializations in cBitmap --- HISTORY | 3 ++- osd.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 3a48011a..ffc565d3 100644 --- a/HISTORY +++ b/HISTORY @@ -6960,7 +6960,7 @@ Video Disk Recorder Revision History which was made in version 1.1.10, so please report if this has any unwanted side effects. -2012-03-04: Version 1.7.26 +2012-03-05: Version 1.7.26 - Now checking for NULL in cOsd::AddPixmap() (suggested by Christoph Haubrich). - Fixed the German translation of "VDR will shut down in %s minutes" (thanks to @@ -6971,3 +6971,4 @@ Video Disk Recorder Revision History - Fixed a possible race condition with the SVDRP commands CLRE and PUTE, where EPG data from the transponder could be handled even though it shouldn't be handled for 10 seconds. +- Added some missing member initializations in cBitmap. diff --git a/osd.c b/osd.c index dc775231..49b7dce1 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 2.26 2012/03/03 13:20:15 kls Exp $ + * $Id: osd.c 2.27 2012/03/05 10:28:01 kls Exp $ */ #include "osd.h" @@ -254,6 +254,7 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, int X0, int Y0) bitmap = NULL; x0 = X0; y0 = Y0; + width = height = 0; SetSize(Width, Height); } @@ -262,6 +263,7 @@ cBitmap::cBitmap(const char *FileName) bitmap = NULL; x0 = 0; y0 = 0; + width = height = 0; LoadXpm(FileName); } @@ -270,6 +272,7 @@ cBitmap::cBitmap(const char *const Xpm[]) bitmap = NULL; x0 = 0; y0 = 0; + width = height = 0; SetXpm(Xpm); }