git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 13:43:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

external_jpg_loader: Fix crash when loader is reloaded

Browse source 
When reload is called from tvgPicture,
clear() of external_jpg loader is called and 'data' is freed.
In the past, there was no case where reload was called until bitmap() was called after load.
Currently I have to consider reload() for a none-viewbox svg case
So change the color myself because loader can't call open() again.
This commit is contained in:
JunsuChoi 2023-03-30 16:39:59 +09:00 • committed by Hermet Park
parent f65d410b9f
commit 1e088a6a61
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/loaders/external_jpg/tvgJpgLoader.cpp
View file

@ -55,6 +55,24 @@ uint32_t convertColorSpaceType(uint32_t colorSpace)
return tjpfColorSpace; return tjpfColorSpace;
} }
static inline uint32_t CHANGE_COLORSPACE(uint32_t c)
{
return (c & 0xff000000) + ((c & 0x00ff0000)>>16) + (c & 0x0000ff00) + ((c & 0x000000ff)<<16);
}
static void _changeColorSpace(uint32_t* data, uint32_t w, uint32_t h)
{
auto buffer = data;
for (uint32_t y = 0; y < h; ++y, buffer += w) {
auto src = buffer;
for (uint32_t x = 0; x < w; ++x, ++src) {
*src = CHANGE_COLORSPACE(*src);
}
}
}
/************************************************************************/ /************************************************************************/
/* External Class Implementation */ /* External Class Implementation */
/************************************************************************/ /************************************************************************/
@ -172,7 +190,7 @@ unique_ptr<Surface> JpgLoader::bitmap(uint32_t colorSpace)
if (!image) return nullptr; if (!image) return nullptr;
if (this->colorSpace != colorSpace) { if (this->colorSpace != colorSpace) {
this->colorSpace = colorSpace; this->colorSpace = colorSpace;
read(); _changeColorSpace(reinterpret_cast<uint32_t*>(image), w, h);
} }
auto surface = static_cast<Surface*>(malloc(sizeof(Surface))); auto surface = static_cast<Surface*>(malloc(sizeof(Surface)));