mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 19:20:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
David Capello 2012-07-15 02:06:27 -03:00
commit cf90dbd734
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/mem_utils.cpp
View File

@ -16,7 +16,7 @@ string get_pretty_memory_size(size_t memsize)
char buf[256];
if (memsize < 1000) {
sprintf(buf, "%d bytes", memsize);
sprintf(buf, "%lu bytes", memsize);
}
else if (memsize < 1000*1000) {
sprintf(buf, "%0.1fK", memsize/1024.0f);

2
src/ui/alert.cpp
View File

@ -145,7 +145,7 @@ void Alert::processString(char* buf, std::vector<Widget*>& labels, std::vector<W
jwidget_set_min_size(button_widget, 60*jguiscale(), 0);
buttons.push_back(button_widget);
usprintf(buttonId, "button-%d", buttons.size());
usprintf(buttonId, "button-%lu", buttons.size());
button_widget->setId(buttonId);
button_widget->Click.connect(Bind<void>(&Window::closeWindow, this, button_widget));
}

2
src/widgets/button_set.cpp
View File

@ -79,7 +79,7 @@ ButtonSet::ButtonSet(int w, int h, int firstSelected, ...)
icon = va_arg(ap, int);
Item* item = new Item(c,
reinterpret_cast<int>(this),
(int)(reinterpret_cast<unsigned long>(this) & 0xffffffff),
x == 0 && y == 0 ? 2: 0,
x == w-1 && y == 0 ? 2: 0,
x == 0 && y == h-1 ? 2: 0,