diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | dvbsubtitle.c | 12 |
2 files changed, 7 insertions, 6 deletions
@@ -7042,3 +7042,4 @@ Video Disk Recorder Revision History the previous value of 25.75 MB/min is taken. - No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin. - No longer using GetFont() (which is not thread safe) in cSubtitleRegion::UpdateTextData(). +- Fixed a memory leak in cSubtitleRegion::UpdateTextData(). diff --git a/dvbsubtitle.c b/dvbsubtitle.c index a623df2f..ca3a6929 100644 --- a/dvbsubtitle.c +++ b/dvbsubtitle.c @@ -7,7 +7,7 @@ * Original author: Marco Schluessler <marco@lordzodiac.de> * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi> * - * $Id: dvbsubtitle.c 2.29 2012/03/13 15:30:47 kls Exp $ + * $Id: dvbsubtitle.c 2.30 2012/03/13 15:37:03 kls Exp $ */ @@ -492,12 +492,12 @@ void cSubtitleRegion::UpdateTextData(cSubtitleClut *Clut) for (cSubtitleObject *so = objects.First(); so && palette; so = objects.Next(so)) { if (Utf8StrLen(so->TextData()) > 0) { cFont *font = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize); - cBitmap *tmp = new cBitmap(font->Width(so->TextData()), font->Height(), Depth()); + cBitmap tmp(font->Width(so->TextData()), font->Height(), Depth()); double factor = (double)lineHeight / font->Height(); - tmp->DrawText(0, 0, so->TextData(), palette->Color(so->ForegroundPixelCode()), palette->Color(so->BackgroundPixelCode()), font); - tmp = tmp->Scaled(factor, factor, true); - DrawBitmap(so->X(), so->Y(), *tmp); - DELETENULL(tmp); + tmp.DrawText(0, 0, so->TextData(), palette->Color(so->ForegroundPixelCode()), palette->Color(so->BackgroundPixelCode()), font); + cBitmap *scaled = tmp.Scaled(factor, factor, true); + DrawBitmap(so->X(), so->Y(), *scaled); + delete scaled; delete font; } } |