mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-02 23:23:28 +02:00
Code Issues Projects Releases Wiki Activity

Update to v097r14 release.

Browse Source 
byuu says:

This is a few days old, but oh well.

This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.

I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
This commit is contained in:
Tim Allen
2016-02-16 20:11:58 +11:00
parent 6c83329cae
commit 0d0af39b44
67 changed files with 415 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hiro/core/widget/canvas.cpp
View File

@@ -10,8 +10,8 @@ auto mCanvas::color() const -> Color {
return state.color;
}
auto mCanvas::data() -> uint32* {
return (uint32*)state.icon.data();
auto mCanvas::data() -> uint32_t* {
return (uint32_t*)state.icon.data();
}
auto mCanvas::droppable() const -> bool {

2
hiro/extension/message-dialog.hpp
View File

@@ -15,7 +15,7 @@ struct MessageDialog {
private:
struct State {
lstring buttons;
vector<uint8> icon;
vector<uint8_t> icon;
sWindow parent;
string response;
string text;

6
hiro/gtk/widget/canvas.cpp
View File

@@ -156,7 +156,7 @@ auto pCanvas::_rasterize() -> void {
auto buffer = (uint32_t*)gdk_pixbuf_get_pixels(surface);
if(auto& icon = state().icon) {
memory::copy(buffer, state().icon.data(), width * height * sizeof(uint32));
memory::copy(buffer, state().icon.data(), width * height * sizeof(uint32_t));
} else if(auto& gradient = state().gradient) {
auto& colors = gradient.state.colors;
image fill;
@@ -164,13 +164,13 @@ auto pCanvas::_rasterize() -> void {
fill.gradient(colors[0].value(), colors[1].value(), colors[2].value(), colors[3].value());
memory::copy(buffer, fill.data(), fill.size());
} else {
uint32 color = state().color.value();
uint32_t color = state().color.value();
for(auto n : range(width * height)) buffer[n] = color;
}
//ARGB -> ABGR conversion
for(auto n : range(width * height)) {
uint32 color = *buffer;
uint32_t color = *buffer;
color = (color & 0xff00ff00) | ((color & 0xff0000) >> 16) | ((color & 0x0000ff) << 16);
*buffer++ = color;
}