gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle more errors on icon setting

This commit is contained in:
Eduardo Bart 2011-11-25 14:17:40 -02:00
parent dfb8b428eb
commit fb43f72583
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/framework/platform/win32platform.cpp
View File

@ -433,8 +433,10 @@ void Platform::setWindowIcon(const std::string& pngIcon)
std::stringstream fin; std::stringstream fin;
g_resources.loadFile(pngIcon, fin); g_resources.loadFile(pngIcon, fin);
if(load_apng(fin, &apng) == 0) { if(load_apng(fin, &apng) == 0) {
if(apng.bpp != 4) if(apng.bpp != 4) {
logError("could not set app icon, icon image must have 4 channels"); logError("could not set app icon, icon image must have 4 channels");
free_apng(&apng);
}
int n = apng.width * apng.height; int n = apng.width * apng.height;
std::vector<uint32> iconData(n); std::vector<uint32> iconData(n);
@ -462,6 +464,8 @@ void Platform::setWindowIcon(const std::string& pngIcon)
SendMessage(win32.window, WM_SETICON, ICON_SMALL, (LPARAM)icon); SendMessage(win32.window, WM_SETICON, ICON_SMALL, (LPARAM)icon);
SendMessage(win32.window, WM_SETICON, ICON_BIG, (LPARAM)icon); SendMessage(win32.window, WM_SETICON, ICON_BIG, (LPARAM)icon);
free_apng(&apng);
} else } else
logError("could not load app icon"); logError("could not load app icon");
} }

6
src/framework/platform/x11platform.cpp
View File

@ -704,8 +704,12 @@ void Platform::setWindowIcon(const std::string& pngIcon)
std::stringstream fin; std::stringstream fin;
g_resources.loadFile(pngIcon, fin); g_resources.loadFile(pngIcon, fin);
if(load_apng(fin, &apng) == 0) { if(load_apng(fin, &apng) == 0) {
if(apng.bpp != 4) if(apng.bpp != 4) {
logError("could not set app icon, icon image must have 4 channels"); logError("could not set app icon, icon image must have 4 channels");
free_apng(&apng);
return;
}
int n = apng.width * apng.height; int n = apng.width * apng.height;
std::vector<unsigned long int> iconData(n + 2); std::vector<unsigned long int> iconData(n + 2);
iconData[0] = apng.width; iconData[0] = apng.width;