Kaydet (Commit) 8055b03d authored tarafından David Tardon's avatar David Tardon

drop unused patches

Change-Id: I8e4dc4c6a727ecb54b1555701d19554f9766d79d
üst a17b98bc
--- 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];
}
--- misc/graphite2-1.0.2/src/GlyphFace.cpp 2011-08-23 11:37:11.971472000 +0100
+++ misc/build/graphite2-1.0.2/src/GlyphFace.cpp 2011-08-23 11:38:13.979750400 +0100
@@ -25,6 +25,7 @@
of the License or (at your option) any later version.
*/
#include <iterator>
+#include <new>
#include "GlyphFace.h"
#include "XmlTraceLog.h"
#include "GlyphFaceCache.h"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment