| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-13 21:01:28 (GMT) |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-13 21:09:49 (GMT) |
| commit | 39cbce553da1834f78b77f48b2f1be9578d6cc05 (patch) (side-by-side diff) | |
| tree | c9bfcb4ed0fdb1d62a52d36109136aca8a421a2b | |
| parent | e0248eb419ba923834698fd628e1c0bf34f42cc5 (diff) | |
| download | core-39cbce553da1834f78b77f48b2f1be9578d6cc05.zip core-39cbce553da1834f78b77f48b2f1be9578d6cc05.tar.gz | |
Resolves: rhbz#761009 IFSD_Equal is asymmetrical
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 89696d1..c524c08 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -148,9 +148,11 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font // NOTE: ignoring meFamily deliberately // compare with the requested width, allow default width - if( (rA.mnWidth != rB.mnWidth) - && ((rA.mnHeight != rB.mnWidth) || (rA.mnWidth != 0)) ) + int nAWidth = rA.mnWidth != 0 ? rA.mnWidth : rA.mnHeight; + int nBWidth = rB.mnWidth != 0 ? rB.mnWidth : rB.mnHeight; + if( nAWidth != nBWidth ) return false; + #ifdef ENABLE_GRAPHITE if (rA.meLanguage != rB.meLanguage) return false; |