diff options
| author | 2015-03-07 18:33:00 -0500 | |
|---|---|---|
| committer | 2015-03-07 18:33:00 -0500 | |
| commit | 89495fc888a6bba998311f5fef2d65320b49d4d8 (patch) | |
| tree | 6d3451d26c6c307ba10c70ea86955acf72e2e640 | |
| parent | Merge pull request #636 from bunnei/refactor-screen-win (diff) | |
| parent | Fixed EmuWindow typo (fixes OSX build) (diff) | |
| download | yuzu-89495fc888a6bba998311f5fef2d65320b49d4d8.tar.gz yuzu-89495fc888a6bba998311f5fef2d65320b49d4d8.tar.xz yuzu-89495fc888a6bba998311f5fef2d65320b49d4d8.zip | |
Merge pull request #638 from bunnei/osx-fix
Fixed EmuWindow typo (fixes OSX build)
| -rw-r--r-- | src/common/emu_window.cpp | 2 | ||||
| -rw-r--r-- | src/common/emu_window.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp index 1082ae26d..6459d2f32 100644 --- a/src/common/emu_window.cpp +++ b/src/common/emu_window.cpp | |||
| @@ -17,7 +17,7 @@ void EmuWindow::KeyReleased(KeyMap::HostDeviceKey key) { | |||
| 17 | Service::HID::PadButtonRelease(mapped_key); | 17 | Service::HID::PadButtonRelease(mapped_key); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(int width, int height) { | 20 | EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(unsigned width, unsigned height) { |
| 21 | ASSERT(width > 0); | 21 | ASSERT(width > 0); |
| 22 | ASSERT(height > 0); | 22 | ASSERT(height > 0); |
| 23 | 23 | ||
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index b6862030e..f6099fdb6 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h | |||
| @@ -48,7 +48,7 @@ public: | |||
| 48 | * @param height Window framebuffer height in pixels | 48 | * @param height Window framebuffer height in pixels |
| 49 | * @return Newly created FramebufferLayout object with default screen regions initialized | 49 | * @return Newly created FramebufferLayout object with default screen regions initialized |
| 50 | */ | 50 | */ |
| 51 | static FramebufferLayout DefaultScreenLayout(int width, int height); | 51 | static FramebufferLayout DefaultScreenLayout(unsigned width, unsigned height); |
| 52 | 52 | ||
| 53 | unsigned width; | 53 | unsigned width; |
| 54 | unsigned height; | 54 | unsigned height; |