diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:29 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:29 +0100 |
| commit | ce74a5d149f0fa2a257d52dc4bf65c23c9bb23d2 (patch) | |
| tree | 815c9a7e74453c6de5e2d14c6662f910bfdf10c4 /graphite | |
| parent | 9ffd61c43e4df7a0536ad71fc9cd61b814632e29 (diff) | |
| parent | e77a065bab11a45dc64f0277038674d25af0279a (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
graphite/makefile.mk
libxml2/makefile.mk
Diffstat (limited to 'graphite')
| -rw-r--r-- | graphite/graphite-2.3.1_debug.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/graphite/graphite-2.3.1_debug.patch b/graphite/graphite-2.3.1_debug.patch new file mode 100644 index 000000000000..583fac711e2b --- /dev/null +++ b/graphite/graphite-2.3.1_debug.patch @@ -0,0 +1,13 @@ +--- misc/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2008-08-21 16:24:32.000000000 +0200 ++++ misc/build/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2011-02-21 13:22:23.159834368 +0100 +@@ -247,7 +247,9 @@ + GlyphSetIterator::reference GlyphSetIterator::operator*() const + { + assert(m_pseg != 0); +- assert(m_vit != std::vector<int>::const_iterator()); ++ // #i116227# the check below is well meant but breaks itself when using stlport with debug facilities ++ // a valid iterator cannot be compared to an empty one in that case ++ // assert(m_vit != std::vector<int>::const_iterator()); + // in the case of a non-contiguous list + return m_pseg->m_prgginf[(*m_vit) - m_pseg->m_isloutGinf0]; + } |