Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge branch 'fontainofdreams' into 'master'
Some checks are pending
Build and test / Ubuntu (push) Waiting to run
Details
Build and test / MacOS (push) Waiting to run
Details
Build and test / Read .env file and expose it as output (push) Waiting to run
Details
Build and test / Windows (2019) (push) Blocked by required conditions
Details
Build and test / Windows (2022) (push) Blocked by required conditions
Details

Browse source 
Allow bitmap font texture reading to end prematurely (#8378)

See merge request OpenMW/openmw!4564
This commit is contained in:
psi29a 2025-03-05 13:11:10 +00:00
commit 888415059c
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/fontloader/fontloader.cpp
View file

@ -425,7 +425,8 @@ namespace Gui
textureData.resize(width * height * 4);
bitmapFile->read(textureData.data(), width * height * 4);
if (!bitmapFile->good())
fail(*bitmapFile, bitmapFilename, "File too small to be a valid bitmap");
Log(Debug::Warning) << "Font bitmap " << bitmapFilename << " ended prematurely, using partial data ("
<< bitmapFile->gcount() << "/" << (width * height * 4) << " bytes)";
bitmapFile.reset();
MyGUI::ITexture* tex = MyGUI::RenderManager::getInstance().createTexture(bitmapFilename);