diff options
| author | Matthew Hoops | 2012-06-24 09:37:53 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-06-24 09:37:53 -0400 |
| commit | 91efe792d5b231752dd16888729a94f323363fa0 (patch) | |
| tree | e7346f83d4966ff4f3cf7e593a7f0cfa16c45b20 /backends/platform/ps2/Gs2dScreen.cpp | |
| parent | 915a8399c910fb5c8e35de58857ce1577c1a0151 (diff) | |
| parent | 20b677080881580706652b17dd5a4c3ed3e36c07 (diff) | |
| download | scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.tar.gz scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.tar.bz2 scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/platform/ps2/Gs2dScreen.cpp')
| -rw-r--r-- | backends/platform/ps2/Gs2dScreen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp index 8df6198c38..f93166ef67 100644 --- a/backends/platform/ps2/Gs2dScreen.cpp +++ b/backends/platform/ps2/Gs2dScreen.cpp @@ -564,7 +564,7 @@ void Gs2dScreen::clearPrintfOverlay(void) { free(tmpBuf); } -void Gs2dScreen::copyOverlayRect(const uint16 *buf, uint16 pitch, uint16 x, uint16 y, uint16 w, uint16 h) { +void Gs2dScreen::copyOverlayRect(const byte *buf, uint16 pitch, uint16 x, uint16 y, uint16 w, uint16 h) { WaitSema(g_DmacSema); // warning("_overlayBuf [dst] = %x", _overlayBuf); @@ -601,7 +601,7 @@ void Gs2dScreen::clearOverlay(void) { SignalSema(g_DmacSema); } -void Gs2dScreen::grabOverlay(uint16 *buf, uint16 pitch) { +void Gs2dScreen::grabOverlay(byte *buf, uint16 pitch) { uint16 *src = _overlayBuf; for (uint32 cnt = 0; cnt < _height; cnt++) { memcpy(buf, src, _width * 2); |