diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-09 00:48:45 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-09 00:48:45 +0300 |
commit | 22d3ea34f29bc11f3e5bfe491f4bc0895e1d4653 (patch) | |
tree | 6c8e4f460f9d0ab2684e21a63f9ecd921eb45024 /indra/llrender/llfontbitmapcache.h | |
parent | 69b48fd13adb129bfa56eaf81309e10eaa16a023 (diff) | |
parent | 395c1c6adf1ecb669f805d5244772b080c077cce (diff) |
Merge pull request #1613 from Ansariel/DRTVWR-600-maint-A
Fix/re-enable MSVC compiler warnings
Diffstat (limited to 'indra/llrender/llfontbitmapcache.h')
-rw-r--r-- | indra/llrender/llfontbitmapcache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h index 6b19ba2154..f2dfd87877 100644 --- a/indra/llrender/llfontbitmapcache.h +++ b/indra/llrender/llfontbitmapcache.h @@ -60,7 +60,7 @@ public: LLImageGL* getImageGL(EFontGlyphType bitmapType, U32 bitmapNum) const; S32 getMaxCharWidth() const { return mMaxCharWidth; } - U32 getNumBitmaps(EFontGlyphType bitmapType) const { return (bitmapType < EFontGlyphType::Count) ? mImageRawVec[static_cast<U32>(bitmapType)].size() : 0; } + U32 getNumBitmaps(EFontGlyphType bitmapType) const { return (bitmapType < EFontGlyphType::Count) ? static_cast<U32>(mImageRawVec[static_cast<U32>(bitmapType)].size()) : 0U; } S32 getBitmapWidth() const { return mBitmapWidth; } S32 getBitmapHeight() const { return mBitmapHeight; } |