diff options
| -rw-r--r-- | indra/llrender/llfontbitmapcache.cpp | 18 | ||||
| -rw-r--r-- | indra/llrender/llfontbitmapcache.h | 1 | ||||
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp index 052510e6ed..f01878642a 100644 --- a/indra/llrender/llfontbitmapcache.cpp +++ b/indra/llrender/llfontbitmapcache.cpp @@ -37,13 +37,13 @@ LLFontBitmapCache::LLFontBitmapCache(): mNumComponents(0), - mMaxCharWidth(0), - mMaxCharHeight(0), mBitmapWidth(0), mBitmapHeight(0), + mBitmapNum(-1), + mMaxCharWidth(0), + mMaxCharHeight(0), mCurrentOffsetX(1), - mCurrentOffsetY(1), - mCurrentBitmapNum(-1) + mCurrentOffsetY(1) { } @@ -160,10 +160,10 @@ void LLFontBitmapCache::reset() mImageRawVec.clear(); mImageGLVec.clear(); - mBitmapWidth = 0, - mBitmapHeight = 0, - mCurrentOffsetX = 0, - mCurrentOffsetY = 0, - mCurrentBitmapNum = -1; + mBitmapWidth = 0; + mBitmapHeight = 0; + mBitmapNum = -1; + mCurrentOffsetX = 1; + mCurrentOffsetY = 1; } diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h index 4a57052b91..b044ba2b16 100644 --- a/indra/llrender/llfontbitmapcache.h +++ b/indra/llrender/llfontbitmapcache.h @@ -71,7 +71,6 @@ private: S32 mMaxCharHeight; S32 mCurrentOffsetX; S32 mCurrentOffsetY; - S32 mCurrentBitmapNum; std::vector<LLPointer<LLImageRaw> > mImageRawVec; std::vector<LLPointer<LLImageGL> > mImageGLVec; }; diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 0be6bedbee..44e997340e 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -533,6 +533,7 @@ void LLFontFreetype::renderGlyph(U32 glyph_index) const void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi) { + resetBitmapCache(); if (!mIsFallback) { // This is the head of the list - need to rebuild ourself and all fallbacks. @@ -552,7 +553,6 @@ void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi) } } } - resetBitmapCache(); } void LLFontFreetype::resetBitmapCache() @@ -568,7 +568,7 @@ void LLFontFreetype::resetBitmapCache() } mFontBitmapCachep->reset(); - // Add the empty glyph`5 + // Add the empty glyph addGlyph(0, 0); } |