Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #454 from pjft/svg-resizes

Browse source 
Adjust mutex for SVG initialization and resizing
This commit is contained in:
John Rassa 2018-06-14 18:14:36 -04:00 committed by GitHub
parent 46c274ebe4 0d76ec52a5
commit 678d1af3a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-core/src/resources/TextureData.cpp
View file

@ -35,11 +35,9 @@ void TextureData::initFromPath(const std::string& path)
bool TextureData::initSVGFromMemory(const unsigned char* fileData, size_t length) bool TextureData::initSVGFromMemory(const unsigned char* fileData, size_t length)
{ {
// If already initialised then don't read again // If already initialised then don't read again
{
std::unique_lock<std::mutex> lock(mMutex); std::unique_lock<std::mutex> lock(mMutex);
if (mDataRGBA) if (mDataRGBA)
return true; return true;
}
// nsvgParse excepts a modifiable, null-terminated string // nsvgParse excepts a modifiable, null-terminated string
char* copy = (char*)malloc(length + 1); char* copy = (char*)malloc(length + 1);
@ -84,7 +82,6 @@ bool TextureData::initSVGFromMemory(const unsigned char* fileData, size_t length
ImageIO::flipPixelsVert(dataRGBA, mWidth, mHeight); ImageIO::flipPixelsVert(dataRGBA, mWidth, mHeight);
std::unique_lock<std::mutex> lock(mMutex);
mDataRGBA = dataRGBA; mDataRGBA = dataRGBA;
return true; return true;