Merge branch 'fontainofdreams' into 'master'

Allow bitmap font texture reading to end prematurely (#8378) See merge request OpenMW/openmw!4564
OpenMW · Mar 5, 2025 · 8884150 · 8884150
2 parents 1e0bdcc + 24468fd
commit 8884150
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
@@ -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);