summaryrefslogtreecommitdiff
path: root/external/graphite
diff options
context:
space:
mode:
authorMartin Hosken <martin_hosken@sil.org>2015-09-22 11:23:03 +0700
committerMartin Hosken <martin_hosken@sil.org>2015-09-24 02:08:41 +0000
commit69e670bee91c1c24cef184da4135d0dece33ecf6 (patch)
tree6e95e706791e11d7383ea66f94afe8cb176bb27e /external/graphite
parent2fcf8923d2c520a5a16b1b3a45877adaadd7eab4 (diff)
Fix graphite sole diacritic rendering
Change-Id: If44ab2ff8c860fbed2af3b4702fa031675e425f4 Reviewed-on: https://gerrit.libreoffice.org/18757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Martin Hosken <martin_hosken@sil.org>
Diffstat (limited to 'external/graphite')
-rw-r--r--external/graphite/graphite2.win64.patch.14
1 files changed, 3 insertions, 1 deletions
diff --git a/external/graphite/graphite2.win64.patch.1 b/external/graphite/graphite2.win64.patch.1
index 0286126975f7..e7c36c63c21b 100644
--- a/external/graphite/graphite2.win64.patch.1
+++ b/external/graphite/graphite2.win64.patch.1
@@ -1,11 +1,13 @@
diff -ur graphite.org/src/inc/Main.h graphite/src/inc/Main.h
--- graphite.org/src/inc/Main.h 2015-09-07 20:09:25.572279671 +0700
--- graphite/src/inc/Main.h 2015-09-07 20:09:25.572279671 +0700
-@@ -25,6 +25,7 @@
+@@ -25,6 +25,9 @@
of the License or (at your option) any later version.
*/
#pragma once
++#ifdef _WIN32
+#pragma warning(disable: 4510 4610)
++#endif
#include <cstdlib>
#include "graphite2/Types.h"