summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2010-09-07 09:33:04 +0200
committerJan Holesovsky <kendy@suse.cz>2010-09-07 09:33:04 +0200
commitad7a5ae54e8733480bd85db44681b49ad11aa051 (patch)
tree38667eed64c56ea2782353f7b462fe7b3f5c7231
parent03e9321ad26aa6893fdfb8f261e3ef1377a5155d (diff)
parent49f8905e0e115ddc2179580564f139667796a620 (diff)
Merge commit 'ooo/OOO330_m6'
-rw-r--r--[-rwxr-xr-x]graphite/graphite-2.3.1.patch.mingw9
1 files changed, 0 insertions, 9 deletions
diff --git a/graphite/graphite-2.3.1.patch.mingw b/graphite/graphite-2.3.1.patch.mingw
index ecec00da7c6e..c5fc3ecdf252 100755..100644
--- a/graphite/graphite-2.3.1.patch.mingw
+++ b/graphite/graphite-2.3.1.patch.mingw
@@ -116,15 +116,6 @@
#include <assert.h>
--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-01-29 17:33:19.000000000 +0900
+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-08-23 20:59:16.211375000 +0900
-@@ -408,7 +408,7 @@
- if (pPolyCurve->wType == TT_PRIM_QSPLINE &&
- // test if this is the last curve
- pPolyHdr->cb - (int)((byte *)(&pPolyCurve->apfx[j]) - (byte *)(pPolyHdr))
-- == sizeof POINTFX &&
-+ == sizeof(POINTFX) &&
- // and the two points are identical
- CompareFixed(pPolyCurve->apfx[j].x, pPolyHdr->pfxStart.x) &&
- CompareFixed(pPolyCurve->apfx[j].y, pPolyHdr->pfxStart.y))
@@ -846,7 +846,7 @@
} // namespace gr