ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix strange use of pointers in screenshot code.

This commit is contained in:
Themaister 2013-04-14 23:13:39 +02:00
parent 926707ae44
commit 8c58ff191a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/rgui.c
View File

@ -725,8 +725,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
case RGUI_SETTINGS_SCREENSHOT:
if (action == RGUI_ACTION_OK)
{
// FIXME: Forces 16-bit. Doesn't handle 32-bit.
const uint16_t *data = (const uint16_t*)g_extern.frame_cache.data;
const void *data = g_extern.frame_cache.data;
unsigned width = g_extern.frame_cache.width;
unsigned height = g_extern.frame_cache.height;
int pitch = g_extern.frame_cache.pitch;
@ -740,10 +739,11 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
// Negative pitch is needed as screenshot takes bottom-up,
// but we use top-down.
bool r = screenshot_dump(screenshot_dir,
data + (height - 1) * (pitch >> 1),
(const uint8_t*)data + (height - 1) * pitch,
width, height, -pitch, false);
msg_queue_push(g_extern.msg_queue, r ? "Screenshot saved" : "Screenshot failed to save", 1, 90);
msg_queue_push(g_extern.msg_queue,
r ? "Screenshot saved" : "Screenshot failed to save", 1, 90);
}
break;
#endif

4
retroarch.c
View File

@ -107,7 +107,7 @@ static bool take_screenshot_viewport(void)
static bool take_screenshot_raw(void)
{
const uint16_t *data = (const uint16_t*)g_extern.frame_cache.data;
const void *data = g_extern.frame_cache.data;
unsigned width = g_extern.frame_cache.width;
unsigned height = g_extern.frame_cache.height;
int pitch = g_extern.frame_cache.pitch;
@ -115,7 +115,7 @@ static bool take_screenshot_raw(void)
// Negative pitch is needed as screenshot takes bottom-up,
// but we use top-down.
return screenshot_dump(g_settings.screenshot_directory,
data + (height - 1) * (pitch >> 1),
(const uint8_t*)data + (height - 1) * pitch,
width, height, -pitch, false);
}