diff options
Diffstat (limited to 'Build/source/libs/graphite/engine-2.4-PATCHES')
-rw-r--r-- | Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/graphite/engine-2.4-PATCHES/patch-13-svn_r1315_1333 | 31 |
2 files changed, 36 insertions, 0 deletions
diff --git a/Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog b/Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog index 4dc12d78dbd..065e9e2e11c 100644 --- a/Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog +++ b/Build/source/libs/graphite/engine-2.4-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2012-05-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-13-svn_r1315_1333 (new): Update from SVN r1315 -> 1333. + (svn r1333 2012-05-14 14:47:16 UTC, omitting changes in test/). + 2012-05-04 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-12-svn_r1312_1315 (new): Update from SVN r1312 -> 1315. diff --git a/Build/source/libs/graphite/engine-2.4-PATCHES/patch-13-svn_r1315_1333 b/Build/source/libs/graphite/engine-2.4-PATCHES/patch-13-svn_r1315_1333 new file mode 100644 index 00000000000..a9c5c7917f8 --- /dev/null +++ b/Build/source/libs/graphite/engine-2.4-PATCHES/patch-13-svn_r1315_1333 @@ -0,0 +1,31 @@ +diff -ur engine-2.4.orig/src/font/Font.cpp engine-2.4/src/font/Font.cpp +--- engine-2.4.orig/src/font/Font.cpp 2010-05-22 20:35:07.000000000 +0200 ++++ engine-2.4/src/font/Font.cpp 2012-05-14 16:47:16.000000000 +0200 +@@ -174,6 +174,7 @@ + if (m_pLoca == 0) return; + + size_t cContours; ++ size_t cEndPoints; + size_t cPoints; + + const size_t CONTOUR_BUF_SIZE = 16; +@@ -191,8 +192,9 @@ + rgnEndPtHeapBuf = new int[cContours] : + rgnEndPtFixedBuf; + ++ cEndPoints = cContours; + if (!TtfUtil::GlyfContourEndPoints(glyphID, m_pGlyf, m_pLoca, m_cbLocaSize, m_pHead, +- prgnEndPt, cContours)) ++ prgnEndPt, cEndPoints)) //cEndPonts will be zero on return + { + return; // should have been caught above + } +@@ -203,7 +205,7 @@ + int * prgnY = (cPoints > POINT_BUF_SIZE) ? rgnYHeapBuf= new int[cPoints] : rgnYFixedBuf; + + if (TtfUtil::GlyfPoints(glyphID, m_pGlyf, m_pLoca, m_cbLocaSize, m_pHead, 0, 0, +- prgnX, prgnY, prgfOnCurve, cPoints)) ++ prgnX, prgnY, prgfOnCurve, cPoints)) //cPoints will be zero on return + { + float nPixEmSquare; + getFontMetrics(0, 0, &nPixEmSquare); |