mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix memory leak in aegisub.text_extents on Windows

Browse source 
The old object returned by SelectObject has to be made active again
before the DC is destroyed or it doesn't get deleted.
This commit is contained in:
Thomas Goyne 2014-07-11 07:11:10 -07:00
parent 06367d5cd9
commit a9019421f1
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/auto4_base.cpp
View file

@ -70,12 +70,12 @@ namespace Automation4 {
#ifdef WIN32
// This is almost copypasta from TextSub
HDC thedc = CreateCompatibleDC(0);
if (!thedc) return false;
SetMapMode(thedc, MM_TEXT);
auto dc = CreateCompatibleDC(nullptr);
if (!dc) return false;
LOGFONTW lf;
ZeroMemory(&lf, sizeof(lf));
SetMapMode(dc, MM_TEXT);
LOGFONTW lf = {0};
lf.lfHeight = (LONG)fontsize;
lf.lfWeight = style->bold ? FW_BOLD : FW_NORMAL;
lf.lfItalic = style->italic;
@ -88,33 +88,36 @@ namespace Automation4 {
lf.lfPitchAndFamily = DEFAULT_PITCH|FF_DONTCARE;
wcsncpy(lf.lfFaceName, agi::charset::ConvertW(style->font).c_str(), 31);
HFONT thefont = CreateFontIndirect(&lf);
if (!thefont) return false;
SelectObject(thedc, thefont);
auto font = CreateFontIndirect(&lf);
if (!font) return false;
auto old_font = SelectObject(dc, font);
std::wstring wtext(agi::charset::ConvertW(text));
SIZE sz;
if (spacing != 0 ) {
width = 0;
for (auto c : wtext) {
GetTextExtentPoint32(thedc, &c, 1, &sz);
SIZE sz;
GetTextExtentPoint32(dc, &c, 1, &sz);
width += sz.cx + spacing;
height = sz.cy;
}
}
else {
GetTextExtentPoint32(thedc, &wtext[0], (int)wtext.size(), &sz);
SIZE sz;
GetTextExtentPoint32(dc, &wtext[0], (int)wtext.size(), &sz);
width = sz.cx;
height = sz.cy;
}
TEXTMETRIC tm;
GetTextMetrics(thedc, &tm);
GetTextMetrics(dc, &tm);
descent = tm.tmDescent;
extlead= tm.tmExternalLeading;
extlead = tm.tmExternalLeading;
DeleteObject(thedc);
DeleteObject(thefont);
SelectObject(dc, old_font);
DeleteObject(font);
DeleteObject(dc);
#else // not WIN32
wxMemoryDC thedc;