diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-18 20:39:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-18 20:39:55 +0000 |
| commit | 63039fc677ab3f0c0e1014b46915aac8ca995c55 (patch) | |
| tree | 3438bc3f9b3a65520c01026637d801634d331f0c /canvas | |
| parent | aecaf18615cc27764f98320f9221227dd6e01a2b (diff) | |
WaE: fix up merge
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index add009fca6c8..f800a541a9b8 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -416,14 +416,14 @@ namespace cairocanvas typedef std::pair<SystemFontData,int> FontLevel; typedef std::vector<FontLevel> FontLevelVector; FontLevelVector aFontData; - SystemGlyphDataVector::const_iterator aIter=aSysLayoutData.rGlyphData.begin(); - const SystemGlyphDataVector::const_iterator aEnd=aSysLayoutData.rGlyphData.end(); - for( ; aIter != aEnd; ++aIter ) + SystemGlyphDataVector::const_iterator aGlyphIter=aSysLayoutData.rGlyphData.begin(); + const SystemGlyphDataVector::const_iterator aGlyphEnd=aSysLayoutData.rGlyphData.end(); + for( ; aGlyphIter != aGlyphEnd; ++aGlyphIter ) { - if( aFontData.empty() || aIter->fallbacklevel != aFontData.back().second ) + if( aFontData.empty() || aGlyphIter->fallbacklevel != aFontData.back().second ) { - aFontData.push_back(FontLevel(rOutDev.GetSysFontData(aIter->fallbacklevel), - aIter->fallbacklevel)); + aFontData.push_back(FontLevel(rOutDev.GetSysFontData(aGlyphIter->fallbacklevel), + aGlyphIter->fallbacklevel)); if( !isCairoRenderable(aFontData.back().first) ) { bCairoRenderable = false; @@ -476,11 +476,10 @@ namespace cairocanvas std::vector<cairo_glyph_t> cairo_glyphs; cairo_glyphs.reserve( 256 ); - SystemGlyphDataVector::const_iterator aIter=aSysLayoutData.rGlyphData.begin(); - const SystemGlyphDataVector::const_iterator aEnd=aSysLayoutData.rGlyphData.end(); - for( ; aIter != aEnd; ++aIter ) + aGlyphIter=aSysLayoutData.rGlyphData.begin(); + for( ; aGlyphIter != aGlyphEnd; ++aGlyphIter ) { - SystemGlyphData systemGlyph = *aIter; + SystemGlyphData systemGlyph = *aGlyphIter; if( systemGlyph.fallbacklevel != aFontDataIter->second ) continue; |