diff options
author | vng <viktor.govako@gmail.com> | 2011-04-06 02:30:07 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:15:16 +0300 |
commit | 58554e5fa73bd1f26f11632e31a87cdfaaa29f2e (patch) | |
tree | d42de2d4429b686faf14a8e49e0e1a5731e3f79b /yg | |
parent | b56d854663b4388a63eb0b38ed874654212e0865 (diff) |
Fix vector::iterator usage.
Diffstat (limited to 'yg')
-rw-r--r-- | yg/glyph_cache_impl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yg/glyph_cache_impl.cpp b/yg/glyph_cache_impl.cpp index 86b6d049ce..063e524bae 100644 --- a/yg/glyph_cache_impl.cpp +++ b/yg/glyph_cache_impl.cpp @@ -250,7 +250,7 @@ namespace yg vector<shared_ptr<Font> > & GlyphCacheImpl::getFonts(uint16_t sym) { - if ((m_lastUsedBlock != m_unicodeBlocks.end()) && (m_lastUsedBlock->hasSymbol(sym))) + if ((m_lastUsedBlock != m_unicodeBlocks.end()) && m_lastUsedBlock->hasSymbol(sym)) return m_lastUsedBlock->m_fonts; unicode_blocks_t::iterator it = lower_bound(m_unicodeBlocks.begin(), @@ -259,14 +259,14 @@ namespace yg sym_in_block()); if (it == m_unicodeBlocks.end()) - it = (--m_unicodeBlocks.rbegin()).base(); + it = m_unicodeBlocks.end()-1; else if (it != m_unicodeBlocks.begin()) - it = --it; + it = it-1; m_lastUsedBlock = it; - if ((it != m_unicodeBlocks.end()) && (it->hasSymbol(sym))) + if ((it != m_unicodeBlocks.end()) && it->hasSymbol(sym)) { if (it->m_fonts.empty()) { |