Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #561 from ZobyTwo/valgrind

Browse Source 
Fix some valgrind memcheck warnings. However there remains one...

... within the threaded texture cache. Once it is resized, some textures
in GetQuad(...) (WCachedResource.cpp:102/103) have uninitialized widths/heights.
This commit is contained in:
Dmitry Panin
2013-11-21 01:58:49 -08:00
parent a37af1776a e76c57d747
commit 306765c6b6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/mtg/src/GameOptions.cpp
View File

@@ -1188,10 +1188,11 @@ bool GameOptionKeyBindings::read(string input)
iss.get(*(s.rdbuf()), ','); iss.get(*(s.rdbuf()), ',');
iss.get(); iss.get();
LocalKeySym local; LocalKeySym local = 0;
char sep; char sep = 0;
u32 button; u32 button = 0;
s >> local >> sep >> button; s >> local >> sep >> button;
if (':' != sep) if (':' != sep)
return false; return false;
assoc.push_back(make_pair(local, u32_to_button(button))); assoc.push_back(make_pair(local, u32_to_button(button)));

1
projects/mtg/src/GameStateMenu.cpp
View File

@@ -65,6 +65,7 @@ GameStateMenu::GameStateMenu(GameApp* parent) :
scroller = NULL; scroller = NULL;
langChoices = false; langChoices = false;
primitivesLoadCounter = -1; primitivesLoadCounter = -1;
bgTexture = NULL;
} }
GameStateMenu::~GameStateMenu() GameStateMenu::~GameStateMenu()