summaryrefslogtreecommitdiff
path: root/graphite
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-21 13:30:27 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-21 13:30:27 +0100
commiteff28f0cd8d2875bd710ef489e5c55f66e93186e (patch)
tree10e6e3e6da3934845af500c650fd1752737af9bc /graphite
parentf8f4d2dce46e0649289ba57b42417b4a8972bf86 (diff)
vcl119: #i116227# remove an invalid assertion
Diffstat (limited to 'graphite')
-rw-r--r--graphite/graphite-2.3.1_debug.patch13
-rw-r--r--graphite/makefile.mk2
2 files changed, 14 insertions, 1 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];
+ }
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index b9ecb7aea396..f4434909bfe4 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -47,7 +47,7 @@ all:
.IF "$(ENABLE_GRAPHITE)"=="TRUE"
TARFILE_NAME=silgraphite-2.3.1
TARFILE_MD5=d35724900f6a4105550293686688bbb3
-PATCH_FILES=graphite-2.3.1.patch
+PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch
# convert line-endings to avoid problems when patching
CONVERTFILES=\