diff options
| author | Jean-Patrick Guerrero <jeanpatrick.guerrero@gmail.com> | 2021-03-16 19:55:10 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-03-16 23:27:15 +0100 |
| commit | 66b5c086644ac18845731d6f3556d9e7cde4ee28 (patch) | |
| tree | 13648e3b04ea462209eb1de6fa6a6c5b76fffb66 /src/irrlicht_changes | |
| parent | 62e3593944846c0e7395586183986e0f11ad9544 (diff) | |
| download | minetest-66b5c086644ac18845731d6f3556d9e7cde4ee28.tar.gz minetest-66b5c086644ac18845731d6f3556d9e7cde4ee28.tar.bz2 minetest-66b5c086644ac18845731d6f3556d9e7cde4ee28.zip | |
Fix deprecated calls with Irrlicht 1.9
Diffstat (limited to 'src/irrlicht_changes')
| -rw-r--r-- | src/irrlicht_changes/CGUITTFont.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp index bd4e700de..960b2320a 100644 --- a/src/irrlicht_changes/CGUITTFont.cpp +++ b/src/irrlicht_changes/CGUITTFont.cpp @@ -103,7 +103,7 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide // Load the monochrome data in. const u32 image_pitch = image->getPitch() / sizeof(u16); - u16* image_data = (u16*)image->lock(); + u16* image_data = (u16*)image->getData(); u8* glyph_data = bits.buffer; for (s32 y = 0; y < (s32)bits.rows; ++y) @@ -119,7 +119,6 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide } image_data += image_pitch; } - image->unlock(); break; } @@ -133,7 +132,7 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide // Load the grayscale data in. const float gray_count = static_cast<float>(bits.num_grays); const u32 image_pitch = image->getPitch() / sizeof(u32); - u32* image_data = (u32*)image->lock(); + u32* image_data = (u32*)image->getData(); u8* glyph_data = bits.buffer; for (s32 y = 0; y < (s32)bits.rows; ++y) { @@ -145,7 +144,6 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide } glyph_data += bits.pitch; } - image->unlock(); break; } default: |