games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge branch 'master' into 'develop'

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-27 21:15:42 +00:00
parent 319d90cbb4 dfda6d2626
commit 8f074490a7
52 changed files with 864 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/renderSDL/SDLImageScaler.cpp
View File

@@ -12,6 +12,7 @@
#include "SDL_Extensions.h"
#include "../GameEngine.h"
#include "../xBRZ/xbrz.h"
#include <tbb/parallel_for.h>
@@ -226,12 +227,19 @@ SDLImageScaler::SDLImageScaler(SDL_Surface * surf, const Rect & virtualDimension
SDL_FreeSurface(intermediate);
intermediate = SDL_ConvertSurfaceFormat(surf, SDL_PIXELFORMAT_ARGB8888, 0);
}
if (intermediate == surf)
throw std::runtime_error("Scaler uses same surface as input!");
}
SDLImageScaler::~SDLImageScaler()
{
SDL_FreeSurface(intermediate);
SDL_FreeSurface(ret);
ENGINE->dispatchMainThread([surface = intermediate]()
{
// potentially SDL bug, execute SDL_FreeSurface in main thread to avoid thread races to its internal state
// may be fixed somewhere between 2.26.5 - 2.30
SDL_FreeSurface(surface);
});
}
SDL_Surface * SDLImageScaler::acquireResultSurface()