valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Rename gimp_image to splash_image

Browse source
This commit is contained in:
Patryk Obara 2020-03-21 15:29:34 +01:00 • committed by Patryk Obara
parent 6f238c0d1a
commit 5ac2567adc
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/dosbox_staging_splash.c
View file

@ -27,7 +27,7 @@ static constexpr struct {
unsigned int height;
unsigned int bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */
unsigned char rle_pixel_data[39136 + 1];
} gimp_image = {
} splash_image = {
640, 480, 3,
"\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377"
"\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000\000\000\377\000"

12
src/gui/sdlmain.cpp
View file

@ -1701,8 +1701,8 @@ static SDL_Window * SetDefaultWindowMode()
if (sdl.window)
return sdl.window;
sdl.draw.width = gimp_image.width;
sdl.draw.height = gimp_image.height;
sdl.draw.width = splash_image.width;
sdl.draw.height = splash_image.height;
if (sdl.desktop.fullscreen) {
return GFX_SetSDLWindowMode(sdl.desktop.full.width,
@ -1732,9 +1732,9 @@ static void DisplaySplash(uint32_t time_ms)
{
assert(sdl.window);
constexpr int src_w = gimp_image.width;
constexpr int src_h = gimp_image.height;
constexpr int src_bpp = gimp_image.bytes_per_pixel;
constexpr int src_w = splash_image.width;
constexpr int src_h = splash_image.height;
constexpr int src_bpp = splash_image.bytes_per_pixel;
static_assert(src_bpp == 3, "Source image expected in RGB format.");
const auto flags = GFX_SetSize(src_w, src_h, GFX_CAN_32, 1.0, 1.0, nullptr, 1.0);
@ -1754,7 +1754,7 @@ static void DisplaySplash(uint32_t time_ms)
assertm(buf_width >= src_w, "Row length needs to be big enough.");
std::array<uint8_t, (src_w * src_h * src_bpp)> splash;
GIMP_IMAGE_RUN_LENGTH_DECODE(splash.data(), gimp_image.rle_pixel_data,
GIMP_IMAGE_RUN_LENGTH_DECODE(splash.data(), splash_image.rle_pixel_data,
src_w * src_h, src_bpp);
size_t i = 0;
size_t j = 0;