[Libreoffice-commits] core.git: Branch 'aoo/trunk' - graphite/graphite-2.3.1.patch

[Don Lewis]

 graphite/graphite-2.3.1.patch |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 5b6c4bddf6134f377a61446d8bcf1be2f096aad1
Author: Don Lewis <truckman at apache.org>
Date:   Fri Aug 5 05:49:46 2016 +0000

    Fix --enable-debug build with clang as the compiler.
    
    Clang warns about this expression in graphite:
    if (!m_srAttachTo == 0)
    Operator precedence rules require this to be evaluated as:
    if ((!m_srAttachTo) == 0)
    but clang worries that the author might have intended this to mean:
    if (!(m_srAttachTo == 0))
    Fortunately these two are equivalent, as is:
    if (m_srAttachTo != 0)
    and the latter is much easier for humans to understand.
    
    For some reason, --enable-debug adds -Werror to the graphite CFLAGS even
    though its makefile.mk specifies:
    EXTERNAL_WARNINGS_NOT_ERRORS := TRUE

diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch
index 85a8aa3..768c139 100644
--- a/graphite/graphite-2.3.1.patch
+++ b/graphite/graphite-2.3.1.patch
@@ -2452,3 +2452,15 @@
  	bool operator!=(const GlyphSetIterator & rhs) const throw()	{ return !(*this == rhs); }
  
  	// Random access iterator requirements
+diff -ur misc/silgraphite-2.3.1/engine/src/segment/GrSlotState.h misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h
+--- misc/silgraphite-2.3.1/engine/src/segment/GrSlotState.h	2009-01-27 18:01:29.000000000 -0800
++++ misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h	2016-08-02 17:22:26.300396000 -0700
+@@ -481,7 +481,7 @@
+ 		{
+ 			Assert(false);	// Should have already been set in HandleModifiedPosition,
+ 							// but just in case.
+-			if (!m_srAttachTo == 0)
++			if (m_srAttachTo != 0)
+ 				return 0;
+ 			else
+ 				m_mAttachAtX = 0; // attach on the right