svn commit: r389370 - in head/graphics/silgraphite: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sat Jun 13 13:52:05 UTC 2015
Author: sunpoet
Date: Sat Jun 13 13:52:03 2015
New Revision: 389370
URL: https://svnweb.freebsd.org/changeset/ports/389370
Log:
- Add LICENSE
- Convert to new options helper
- Use USES=pathfix
- Strip shared library
- Regenerate patch file with makepatch:
- Sort PLIST
- Reformat pkg-descr
- Bump PORTREVISION for package change
- Take maintainership
Modified:
head/graphics/silgraphite/Makefile
head/graphics/silgraphite/files/patch-openoffice-silgraphite
head/graphics/silgraphite/pkg-descr
head/graphics/silgraphite/pkg-plist
Modified: head/graphics/silgraphite/Makefile
==============================================================================
--- head/graphics/silgraphite/Makefile Sat Jun 13 13:51:59 2015 (r389369)
+++ head/graphics/silgraphite/Makefile Sat Jun 13 13:52:03 2015 (r389370)
@@ -3,35 +3,25 @@
PORTNAME= silgraphite
PORTVERSION= 2.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel
MASTER_SITES= SF
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= sunpoet at FreeBSD.org
COMMENT= Font engine for complex non-Roman writing systems
OPTIONS_DEFINE= FREETYPE
-OPTIONS_DEFAULT= FREETYPE
+OPTIONS_DEFAULT=FREETYPE
+OPTIONS_SUB= yes
-USES= libtool pkgconfig
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-xft --without-pangographite
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+USE_LDCONFIG= yes
+USES= libtool pathfix pkgconfig
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2
-USES+= iconv
-CONFIGURE_ARGS+= --with-freetype
-PLIST_SUB+= WITH_FREETYPE=""
-.else
-CONFIGURE_ARGS+= --without-freetype
-PLIST_SUB+= WITH_FREETYPE="@comment "
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/engine/Makefile.in
+FREETYPE_CONFIGURE_WITH=freetype
+FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_USES= iconv
.include <bsd.port.mk>
Modified: head/graphics/silgraphite/files/patch-openoffice-silgraphite
==============================================================================
--- head/graphics/silgraphite/files/patch-openoffice-silgraphite Sat Jun 13 13:51:59 2015 (r389369)
+++ head/graphics/silgraphite/files/patch-openoffice-silgraphite Sat Jun 13 13:52:03 2015 (r389370)
@@ -1,7 +1,6 @@
-diff -ru ../silgraphite-2.3.1.orig/engine/include/graphite/GrCommon.h ./engine/include/graphite/GrCommon.h
---- ../silgraphite-2.3.1.orig/engine/include/graphite/GrCommon.h 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/include/graphite/GrCommon.h 2012-02-27 21:40:30.000000000 -0500
-@@ -18,6 +18,8 @@
+--- engine/include/graphite/GrCommon.h.orig 2009-01-21 22:36:40 UTC
++++ engine/include/graphite/GrCommon.h
+@@ -18,6 +18,8 @@ Last reviewed:
#ifndef GRCOMMON_INCLUDED
#define GRCOMMON_INCLUDED
@@ -10,7 +9,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
// Standard Headers.
-@@ -33,6 +35,7 @@
+@@ -33,6 +35,7 @@ Last reviewed:
#include <vector>
#include <algorithm>
#include <string>
@@ -18,7 +17,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
// Uncomment this to allow multiple versions of gr to coexist
// in the same program e.g. pangographite with gtk uses namespace gr
-@@ -41,7 +44,7 @@
+@@ -41,7 +44,7 @@ Last reviewed:
// Provided the client includes GrClient.h first this #define is
// picked up by all files.
@@ -27,10 +26,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
// Project headers
#include "GrPlatform.h"
-diff -ru ../silgraphite-2.3.1.orig/engine/include/graphite/GrMstypes.h ./engine/include/graphite/GrMstypes.h
---- ../silgraphite-2.3.1.orig/engine/include/graphite/GrMstypes.h 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/include/graphite/GrMstypes.h 2012-02-27 21:40:30.000000000 -0500
-@@ -24,11 +24,11 @@
+--- engine/include/graphite/GrMstypes.h.orig 2009-01-21 22:36:40 UTC
++++ engine/include/graphite/GrMstypes.h
+@@ -24,11 +24,11 @@ typedef wchar_t OLECHAR;
typedef signed long HRESULT;
@@ -44,10 +42,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
return --*intr_lck;
}
-diff -ru ../silgraphite-2.3.1.orig/engine/makefile.vc7 ./engine/makefile.vc7
---- ../silgraphite-2.3.1.orig/engine/makefile.vc7 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/makefile.vc7 2012-02-27 21:40:30.000000000 -0500
-@@ -48,11 +48,7 @@
+--- engine/makefile.vc7.orig 2008-08-21 14:24:32 UTC
++++ engine/makefile.vc7
+@@ -48,11 +48,7 @@ all : lib lib_dll
CPP_DEBUG=/D "TRACING" $(CPP_DEBUG)
!ENDIF
@@ -59,12 +56,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
clean :
@- rd /s/q .\release_temp
-Only in ./engine: makefile.vc8.orig
-Only in ./engine: makefile.vc8.rej
-diff -ru ../silgraphite-2.3.1.orig/engine/src/font/FileFont.cpp ./engine/src/font/FileFont.cpp
---- ../silgraphite-2.3.1.orig/engine/src/font/FileFont.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/font/FileFont.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -207,11 +207,11 @@
+--- engine/src/font/FileFont.cpp.orig 2009-01-21 22:36:42 UTC
++++ engine/src/font/FileFont.cpp
+@@ -207,11 +207,11 @@ FileFont::initializeFromFace()
cch16 += cch16Used;
}
// }
@@ -80,7 +74,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
#endif
pTable = readTable(ktiHead, lSize);
if (!m_fIsValid || !pTable)
-@@ -233,7 +233,7 @@
+@@ -233,7 +233,7 @@ byte *
FileFont::readTable(int /*TableId*/ tid, size_t & size)
{
const TableId tableId = TableId(tid);
@@ -89,7 +83,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
size_t lOffset = 0, lSize = 0;
if (!m_pTableCache)
{
-@@ -245,9 +245,9 @@
+@@ -245,9 +245,9 @@ FileFont::readTable(int /*TableId*/ tid,
size = m_pTableCache->getTableSize(tableId);
// check whether it is already in the cache
if (pTable) return pTable;
@@ -101,7 +95,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
return NULL;
fseek(m_pfile, lOffset, SEEK_SET);
// only allocate if needed
-@@ -255,16 +255,16 @@
+@@ -255,16 +255,16 @@ FileFont::readTable(int /*TableId*/ tid,
if (!pTable)
{
@@ -123,10 +117,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
return 0;
}
-diff -ru ../silgraphite-2.3.1.orig/engine/src/font/Font.cpp ./engine/src/font/Font.cpp
---- ../silgraphite-2.3.1.orig/engine/src/font/Font.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/font/Font.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -626,7 +626,7 @@
+--- engine/src/font/Font.cpp.orig 2008-05-20 06:04:16 UTC
++++ engine/src/font/Font.cpp
+@@ -626,7 +626,7 @@ FeatureIterator FeatureIterator::operato
Assert(false);
m_ifeat = m_cfeat;
}
@@ -135,7 +128,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// Can't decrement.
Assert(false);
-@@ -727,7 +727,7 @@
+@@ -727,7 +727,7 @@ FeatureSettingIterator FeatureSettingIte
Assert(false);
m_ifset = m_cfset;
}
@@ -144,7 +137,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// Can't decrement.
Assert(false);
-@@ -820,7 +820,7 @@
+@@ -820,7 +820,7 @@ FeatLabelLangIterator FeatLabelLangItera
Assert(false);
m_ilang = m_clang;
}
@@ -153,7 +146,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// Can't decrement.
Assert(false);
-@@ -906,7 +906,7 @@
+@@ -906,7 +906,7 @@ LanguageIterator LanguageIterator::opera
Assert(false);
m_ilang = m_clang;
}
@@ -162,10 +155,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// Can't decrement.
Assert(false);
-diff -ru ../silgraphite-2.3.1.orig/engine/src/font/TtfUtil.cpp ./engine/src/font/TtfUtil.cpp
---- ../silgraphite-2.3.1.orig/engine/src/font/TtfUtil.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/font/TtfUtil.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -492,7 +492,7 @@
+--- engine/src/font/TtfUtil.cpp.orig 2009-01-29 08:33:19 UTC
++++ engine/src/font/TtfUtil.cpp
+@@ -492,7 +492,7 @@ bool IsItalic(const void * pHead)
const Sfnt::FontHeader * pTable =
reinterpret_cast<const Sfnt::FontHeader *>(pHead);
@@ -174,7 +166,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
}
/*----------------------------------------------------------------------------------------------
-@@ -1108,8 +1108,8 @@
+@@ -1108,8 +1108,8 @@ size_t LocaLookup(gr::gid16 nGlyphId,
{ // loca entries are two bytes and have been divided by two
if (nGlyphId <= (lLocaSize >> 1) - 1) // allow sentinel value to be accessed
{
@@ -185,7 +177,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
}
}
-@@ -1117,8 +1117,8 @@
+@@ -1117,8 +1117,8 @@ size_t LocaLookup(gr::gid16 nGlyphId,
{ // loca entries are four bytes
if (nGlyphId <= (lLocaSize >> 2) - 1)
{
@@ -196,7 +188,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
}
}
-@@ -1586,7 +1586,7 @@
+@@ -1586,7 +1586,7 @@ bool IsDeepComposite(gr::gid16 nGlyphId,
for (size_t i = 0; i < cCompId; i++)
{
@@ -205,7 +197,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
pGlyf, pLoca, lLocaSize, pHead);
if (pSimpleGlyf == NULL) {return false;}
-@@ -1748,7 +1748,7 @@
+@@ -1748,7 +1748,7 @@ bool GlyfContourEndPoints(gr::gid16 nGly
----------------------------------------------------------------------------------------------*/
bool GlyfPoints(gr::gid16 nGlyphId, const void * pGlyf,
const void * pLoca, size_t lLocaSize, const void * pHead,
@@ -214,10 +206,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
int * prgnX, int * prgnY, bool * prgfOnCurve, size_t cnPoints)
{
std::fill_n(prgnX, cnPoints, INT_MAX);
-diff -ru ../silgraphite-2.3.1.orig/engine/src/painter/SegmentPainter.cpp ./engine/src/painter/SegmentPainter.cpp
---- ../silgraphite-2.3.1.orig/engine/src/painter/SegmentPainter.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/painter/SegmentPainter.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -353,7 +353,7 @@
+--- engine/src/painter/SegmentPainter.cpp.orig 2009-01-28 02:01:29 UTC
++++ engine/src/painter/SegmentPainter.cpp
+@@ -353,7 +353,7 @@ void SegmentPainter::positionsOfIP(
@param bOn - true if we are turning on (ignored in this implementation)
----------------------------------------------------------------------------------------------*/
bool SegmentPainter::drawSelectionRange(int ichwAnchor, int ichwEnd,
@@ -226,7 +217,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
if (g_fDrawing)
return true;
-@@ -993,7 +993,7 @@
+@@ -993,7 +993,7 @@ size_t SegmentPainter::getUnderlinePlace
an I-beam (std selection)
----------------------------------------------------------------------------------------------*/
void SegmentPainter::CalcOrDrawInsertionPoint(
@@ -235,7 +226,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
Rect * prdPrimary, Rect * prdSecondary)
{
GrResult res = kresOk;
-@@ -1277,7 +1277,7 @@
+@@ -1277,7 +1277,7 @@ void SegmentPainter::CalcOrDrawInsertion
if NULL, do the drawing
----------------------------------------------------------------------------------------------*/
void SegmentPainter::InvertIBeam(float xs, float ysTop, float ysBottom,
@@ -244,7 +235,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
float xd = ScaleXToDest(xs);
float ydTop = ScaleYToDest(ysTop);
-@@ -1675,7 +1675,7 @@
+@@ -1675,7 +1675,7 @@ bool SegmentPainter::AtEdgeOfCluster(GrS
}
bool SegmentPainter::AtEdgeOfCluster(GrSlotOutput * psloutBase, int isloutBase,
@@ -253,7 +244,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// Compare pslout to all the members of the cluster. If it is the minimum or maximum, it
// is at an edge.
-@@ -1778,12 +1778,12 @@
+@@ -1778,12 +1778,12 @@ void SegmentPainter::CalcPartialLigature
}
for (icomp = 0; icomp < pslout->NumberOfComponents(); icomp++)
{
@@ -271,7 +262,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
}
}
}
-@@ -2304,7 +2304,11 @@
+@@ -2304,7 +2304,11 @@ bool SegmentPainter::AdjustRectsToNotOve
Assert that there are no overlaps among all the rectangles in the array, which should
be the case if AdjustRectsToNotOverlap is working properly.
----------------------------------------------------------------------------------------------*/
@@ -283,7 +274,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
#ifdef _DEBUG
for (int irect1 = 0; irect1 < signed(vrect.size() - 1); irect1++)
-@@ -2452,7 +2456,11 @@
+@@ -2452,7 +2456,11 @@ bool SegmentPainter::AdjustLineSegsToNot
Assert that there are no overlaps among all the rectangles in the array, which should
be the case if AdjustRectsToNotOverlap is working properly.
----------------------------------------------------------------------------------------------*/
@@ -295,7 +286,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
#ifdef _DEBUG
for (int ils1 = 0; ils1 < (int)vls.size() - 1; ils1++)
-@@ -2884,7 +2892,7 @@
+@@ -2884,7 +2892,7 @@ bool SegmentPainter::AdjacentLigComponen
{
if (icompNext != icompCurr)
{
@@ -304,7 +295,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
if (fMovingRight && xsHorizNext > xsHorizCurr)
break;
else if (!fMovingRight && xsHorizNext < xsHorizCurr)
-@@ -2996,7 +3004,7 @@
+@@ -2996,7 +3004,7 @@ float SegmentPainter::ScaleY(float ys, R
/*----------------------------------------------------------------------------------------------
Make sure the font is set to use the character properties required by this segment.
----------------------------------------------------------------------------------------------*/
@@ -313,10 +304,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
return;
}
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/FileInput.cpp ./engine/src/segment/FileInput.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/FileInput.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/FileInput.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -80,7 +80,7 @@
+--- engine/src/segment/FileInput.cpp.orig 2009-01-21 22:36:42 UTC
++++ engine/src/segment/FileInput.cpp
+@@ -80,7 +80,7 @@ GrBufferIStream::~GrBufferIStream()
#ifdef GR_FW
bool GrBufferIStream::Open(std::wstring stuFileName, int kMode)
#else
@@ -325,10 +315,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
#endif
{
Assert(false); // use OpenBuffer
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrCharStream.cpp ./engine/src/segment/GrCharStream.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrCharStream.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrCharStream.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -417,8 +417,11 @@
+--- engine/src/segment/GrCharStream.cpp.orig 2009-01-21 22:36:42 UTC
++++ engine/src/segment/GrCharStream.cpp
+@@ -417,8 +417,11 @@ bool GrCharStream::AtUnicodeCharBoundary
return true;
*/
}
@@ -341,10 +330,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
Assert(ichs >= 0);
Assert(ichs <= cchs);
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrClassTable.h ./engine/src/segment/GrClassTable.h
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrClassTable.h 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrClassTable.h 2012-02-27 21:40:30.000000000 -0500
-@@ -54,7 +54,11 @@
+--- engine/src/segment/GrClassTable.h.orig 2009-01-21 22:36:42 UTC
++++ engine/src/segment/GrClassTable.h
+@@ -54,7 +54,11 @@ protected:
/*------------------------------------------------------------------------------------------
Copy the raw memory into the instance.
------------------------------------------------------------------------------------------*/
@@ -356,10 +344,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
m_cgixBIG = pchwStart[0];
m_digixBIGInit = pchwStart[1];
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrEngine.cpp ./engine/src/segment/GrEngine.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrEngine.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrEngine.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -159,12 +159,12 @@
+--- engine/src/segment/GrEngine.cpp.orig 2009-01-28 02:01:29 UTC
++++ engine/src/segment/GrEngine.cpp
+@@ -159,12 +159,12 @@ void GrEngine::BasicInit()
GrEngine::~GrEngine()
{
DestroyEverything();
@@ -378,7 +365,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
}
/*----------------------------------------------------------------------------------------------
-@@ -173,12 +173,12 @@
+@@ -173,12 +173,12 @@ GrEngine::~GrEngine()
void GrEngine::DestroyEverything()
{
DestroyContents();
@@ -397,7 +384,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
m_strCtrlFileReg.erase();
m_strCtrlFileBold.erase();
-@@ -417,7 +417,11 @@
+@@ -417,7 +417,11 @@ GrResult GrEngine::get_SegDatMaxLength(i
@return The supported script direction(s). If more than one, the application is
responsible for choosing the most appropriate.
----------------------------------------------------------------------------------------------*/
@@ -409,7 +396,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
ChkGrOutPtr(pgrfsdc);
ChkGrArrayArg(prgchwErrMsg, cchMaxErrMsg);
-@@ -789,7 +793,7 @@
+@@ -789,7 +793,7 @@ void GrEngine::RecordFontLoadError(OLECH
Record a system error indicating a bad error in rendering using a supposedly valid font.
OBSOLETE
----------------------------------------------------------------------------------------------*/
@@ -418,7 +405,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
if (prgchwErrMsg == NULL || cchMax == 0)
return;
-@@ -970,7 +974,7 @@
+@@ -970,7 +974,7 @@ void GrEngine::InitFromControlFileTest()
/*----------------------------------------------------------------------------------------------
Return whether the text is asking for bold and/or italic text.
----------------------------------------------------------------------------------------------*/
@@ -427,7 +414,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
*pfBold = pfont->bold();
*pfItalic = pfont->italic();
-@@ -981,7 +985,11 @@
+@@ -981,7 +985,11 @@ void GrEngine::GetStyles(Font * pfont, i
Should only be called when we know we are using a base font, or when we are reading
the base font to see if it is valid.
----------------------------------------------------------------------------------------------*/
@@ -439,7 +426,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
Assert(!fBase || m_stuBaseFaceName.size() > 0);
-@@ -1135,7 +1143,7 @@
+@@ -1135,7 +1143,7 @@ bool GrEngine::ReadSilfTable(GrIStream &
m_chwJShrink0 = 0xffff;
m_chwJStep0 = 0xffff;
m_chwJWeight0 = 0xffff;
@@ -448,7 +435,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// justification glyph attribute IDs
bTmp = grstrm.ReadByteFromFont();
-@@ -1210,10 +1218,12 @@
+@@ -1210,10 +1218,12 @@ bool GrEngine::ReadSilfTable(GrIStream &
// rendering behaviors--ignore for now
byte cBehaviors = grstrm.ReadByteFromFont();
@@ -463,10 +450,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
}
// linebreak glyph ID
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrFSM.cpp ./engine/src/segment/GrFSM.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrFSM.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrFSM.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -46,7 +46,7 @@
+--- engine/src/segment/GrFSM.cpp.orig 2009-01-21 22:36:42 UTC
++++ engine/src/segment/GrFSM.cpp
+@@ -46,7 +46,7 @@ namespace gr
Fill in the FSM by reading from the font stream.
Assumes the stream is in the correct position.
----------------------------------------------------------------------------------------------*/
@@ -475,7 +461,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
short snTmp;
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ bool GrFSM::ReadFromFont(GrIStream & grs
Fill in the FSM's state table by reading from the font stream.
Assumes the stream is in the correct position.
----------------------------------------------------------------------------------------------*/
@@ -484,10 +470,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
int cCells = ((m_crow - m_crowFinal) * m_ccol);
m_prgrowTransitions = new short[cCells];
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrFeature.cpp ./engine/src/segment/GrFeature.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrFeature.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrFeature.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -186,7 +186,7 @@
+--- engine/src/segment/GrFeature.cpp.orig 2009-01-21 22:36:42 UTC
++++ engine/src/segment/GrFeature.cpp
+@@ -186,7 +186,7 @@ std::wstring GrFeature::NthSettingLabel(
/*----------------------------------------------------------------------------------------------
Read the languages from the font.
----------------------------------------------------------------------------------------------*/
@@ -496,7 +481,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
GrIStream & grstrm = *pgrstrm;
-@@ -206,13 +206,22 @@
+@@ -206,13 +206,22 @@ bool GrLangTable::ReadFromFont(GrIStream
m_cbOffset0 = (lsbf)(m_prglang[0].cbOffsetBIG);
@@ -521,10 +506,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
return true;
}
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrPass.cpp ./engine/src/segment/GrPass.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrPass.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrPass.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -279,9 +279,10 @@
+--- engine/src/segment/GrPass.cpp.orig 2009-01-28 02:01:29 UTC
++++ engine/src/segment/GrPass.cpp
+@@ -279,9 +279,10 @@ void GrPass::InitializeWithNoRules()
@param twsh - how we are handling trailing white-space
@param pnRet - return value
@param pcslotGot - return the number of slots gotten
@@ -538,7 +522,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
@return kNextPass if we were able to generated the number requested, or processing is
complete; otherwise return the number of slots needed from the previous pass.
-@@ -465,7 +466,7 @@
+@@ -465,7 +466,7 @@ void GrPass::ExtendOutput(GrTableManager
void GrBidiPass::ExtendOutput(GrTableManager * ptman,
GrSlotStream* psstrmIn, GrSlotStream* psstrmOut,
int cslotNeededByNext, TrWsHandling twsh,
@@ -547,7 +531,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
Assert(psstrmIn->SlotsToReprocess() == 0);
-@@ -776,7 +777,7 @@
+@@ -776,7 +777,7 @@ int GrPass::ExtendGlyphIDOutput(GrTableM
int GrPass::ExtendFinalOutput(GrTableManager * ptman,
GrSlotStream * psstrmInput, GrSlotStream * psstrmOutput,
float xsSpaceAllotted, bool fWidthIsCharCount, bool fInfiniteWidth,
@@ -556,7 +540,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
int * pislotLB, float * pxsWidth)
{
EngineState * pengst = ptman->State();
-@@ -897,7 +898,11 @@
+@@ -897,7 +898,11 @@ int GrPass::ExtendFinalOutput(GrTableMan
Remove undesirable trailing white-space.
----------------------------------------------------------------------------------------------*/
int GrPass::RemoveTrailingWhiteSpace(GrTableManager * ptman, GrSlotStream * psstrmOut,
@@ -568,7 +552,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
EngineState * pengst = ptman->State();
-@@ -944,7 +949,7 @@
+@@ -944,7 +949,7 @@ int GrPass::RemoveTrailingWhiteSpace(GrT
should never be necessary if they've set up their tables right.
----------------------------------------------------------------------------------------------*/
void GrPass::CheckInputProgress(GrSlotStream * psstrmInput, GrSlotStream * psstrmOutput,
@@ -577,7 +561,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
int islotInput = psstrmInput->ReadPosForNextGet();
// Assert(islotInput >= islotOrigInput); -- no longer true now that we can back up
-@@ -1752,7 +1757,7 @@
+@@ -1752,7 +1757,7 @@ int GrBidiPass::Reverse(GrTableManager *
----------------------------------------------------------------------------------------------*/
int GrPass::Unwind(GrTableManager * ptman,
int islotChanged, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut,
@@ -586,7 +570,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// Back up the number of slots required for the longest rule context,
// but if we land in the middle of a chunk, go forward to its boundary.
-@@ -1824,7 +1829,7 @@
+@@ -1824,7 +1829,7 @@ int GrPass::Unwind(GrTableManager * ptma
----------------------------------------------------------------------------------------------*/
int GrBidiPass::Unwind(GrTableManager * ptman,
int islotChanged, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut,
@@ -595,7 +579,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
int islotIn;
int islotOut;
-@@ -1901,8 +1906,8 @@
+@@ -1901,8 +1906,8 @@ void PassState::UnwindLogInfo(int islotI
OBSOLETE
----------------------------------------------------------------------------------------------*/
//:Ignore
@@ -606,10 +590,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// Because this is a positioning pass, there is a one-to-one correspondence between
// the slots in the input and the slots in the output. Thus we can make simplifying
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrPass.h ./engine/src/segment/GrPass.h
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrPass.h 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrPass.h 2012-02-27 21:40:30.000000000 -0500
-@@ -197,7 +197,7 @@
+--- engine/src/segment/GrPass.h.orig 2008-08-21 14:24:32 UTC
++++ engine/src/segment/GrPass.h
+@@ -197,7 +197,7 @@ public:
bool ReadFromFont(GrIStream & grstrm, int fxdSilfVersion, int fxdRuleVersion, int nOffset);
void InitializeWithNoRules();
@@ -618,7 +601,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{ // only GrBidiPass does anything interesting
}
-@@ -253,13 +253,13 @@
+@@ -253,13 +253,13 @@ public:
m_pzpst->SetResyncSkip(n);
}
@@ -636,7 +619,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
}
-@@ -383,8 +383,8 @@
+@@ -383,8 +383,8 @@ protected:
void MapChunks(GrSlotStream * psstrmIn, GrSlotStream * psstrmOut,
int islotChunkI, int islotChunkO, int cslotReprocessed);
@@ -647,7 +630,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
}
-@@ -500,8 +500,8 @@
+@@ -500,8 +500,8 @@ public:
protected:
// Irrelevant when generating glyphs.
@@ -658,10 +641,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
Assert(false);
}
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrPassActionCode.cpp ./engine/src/segment/GrPassActionCode.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrPassActionCode.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrPassActionCode.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -632,8 +632,13 @@
+--- engine/src/segment/GrPassActionCode.cpp.orig 2009-01-28 02:01:29 UTC
++++ engine/src/segment/GrPassActionCode.cpp
+@@ -632,8 +632,13 @@ GrPass::StackMachineFlag GrPass::CheckSt
/*----------------------------------------------------------------------------------------------
We are finished processing a slot; go on to the next slot, or possibly go backwards.
----------------------------------------------------------------------------------------------*/
@@ -677,7 +659,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
gAssert(cslot == 1); // for now anyway
}
-@@ -690,6 +695,7 @@
+@@ -690,6 +695,7 @@ void GrPass::DoPutGlyph(GrTableManager *
psstrmOut->SetSegMinToWritePos(false);
if (fSetSegLim)
psstrmOut->SetSegLimToWritePos(false);
@@ -685,7 +667,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
psstrmOut->NextPut(pslotNew);
}
-@@ -729,6 +735,7 @@
+@@ -729,6 +735,7 @@ void GrPass::DoPutCopy(GrTableManager *
psstrmOut->SetSegMinToWritePos(false);
if (fSetSegLim)
psstrmOut->SetSegLimToWritePos(false);
@@ -693,7 +675,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
psstrmOut->NextPut(pslotNew);
}
-@@ -825,7 +832,7 @@
+@@ -825,7 +832,7 @@ void GrPass::DoPutSubs2(GrTableManager *
@param psstrmIn / Out - input/output streams
----------------------------------------------------------------------------------------------*/
void GrPass::DoPutSubs3(GrTableManager * ptman, bool fInserting,
@@ -702,7 +684,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
int nReplacementClass,
GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
{
-@@ -888,7 +895,7 @@
+@@ -888,7 +895,7 @@ void GrPass::DoPutSubsInit(GrSlotStream
Common part of all the DoPutSubs... methods.
----------------------------------------------------------------------------------------------*/
void GrPass::DoPutSubsAux(GrTableManager * ptman, bool fInserting, gid16 nGlyphReplacement,
@@ -711,7 +693,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
bool fAtSegMin, bool fAtSegLim)
{
EngineState * pengst = ptman->State();
-@@ -915,6 +922,7 @@
+@@ -915,6 +922,7 @@ void GrPass::DoPutSubsAux(GrTableManager
psstrmOut->SetSegMinToWritePos(false);
if (fSetSegLim)
psstrmOut->SetSegLimToWritePos(false);
@@ -719,7 +701,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
psstrmOut->NextPut(pslotNew);
}
-@@ -924,7 +932,7 @@
+@@ -924,7 +932,7 @@ void GrPass::DoPutSubsAux(GrTableManager
and its after-assoc to the slot before it. This makes it basically unselectable.
OBSOLETE - handled by slot initialization code
----------------------------------------------------------------------------------------------*/
@@ -728,7 +710,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
pslotNew->ClearAssocs();
}
-@@ -943,6 +951,7 @@
+@@ -943,6 +951,7 @@ void GrPass::DoDelete(GrTableManager * p
psstrmOut->SetSegLimToWritePos();
GrSlotState * pslot = psstrmIn->NextGet();
@@ -736,7 +718,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
pslot->MarkDeleted();
if (ptman->LoggingTransduction())
-@@ -957,7 +966,7 @@
+@@ -957,7 +966,7 @@ void GrPass::DoDelete(GrTableManager * p
@param fInserting - whether current slot was inserted
@param psstrmIn / Out - input/output streams
----------------------------------------------------------------------------------------------*/
@@ -745,7 +727,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
{
gAssert((unsigned)cnAssocs == vnAssocs.size());
-@@ -997,7 +1006,11 @@
+@@ -997,7 +1006,11 @@ void GrPass::DoAssoc(int cnAssocs, std::
@param vnStack - stack to read value from
@param psstrmIn / Out - input/output streams
----------------------------------------------------------------------------------------------*/
@@ -757,7 +739,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
SlotAttrName slat, int slati, std::vector<int> & vnStack,
GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
{
-@@ -1192,7 +1205,7 @@
+@@ -1192,7 +1205,7 @@ void GrPass::DoSetAttr(GrTableManager *
@param psstrmIn - input stream
----------------------------------------------------------------------------------------------*/
void GrPass::DoPushSlotAttr(GrTableManager * ptman,
@@ -766,7 +748,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
SlotAttrName slat, int slati, std::vector<int> & vnStack,
GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
{
-@@ -1236,16 +1249,16 @@
+@@ -1236,16 +1249,16 @@ void GrPass::DoPushSlotAttr(GrTableManag
case kslatAttTo: nVal = pslot->AttachTo(); break;
case kslatAttLevel: nVal = pslot->AttachLevel(); break;
@@ -785,7 +767,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
case kslatMeasureSol: nVal = pslot->MeasureSol(); break;
case kslatMeasureEol: nVal = pslot->MeasureEol(); break;
-@@ -1282,7 +1295,7 @@
+@@ -1282,7 +1295,7 @@ void GrPass::DoPushSlotAttr(GrTableManag
@param vnStack - stack to push onto
@param psstrmIn - input stream
----------------------------------------------------------------------------------------------*/
@@ -794,7 +776,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
int nGlyphAttr,
std::vector<int> & vnStack, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
{
-@@ -1307,7 +1320,7 @@
+@@ -1307,7 +1320,7 @@ void GrPass::DoPushGlyphAttr(GrTableMana
@param vnStack - stack to push onto
@param psstrmIn - input stream
----------------------------------------------------------------------------------------------*/
@@ -803,7 +785,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
int nGlyphAttr, std::vector<int> & vnStack,
GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
{
-@@ -1337,7 +1350,7 @@
+@@ -1337,7 +1350,7 @@ void GrPass::DoPushAttToGlyphAttr(GrTabl
@param vnStack - stack to push onto
@param psstrmIn - input stream
----------------------------------------------------------------------------------------------*/
@@ -812,7 +794,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
int nGlyphAttr, int nAttLevel,
std::vector<int> & vnStack, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
{
-@@ -1364,7 +1377,7 @@
+@@ -1364,7 +1377,7 @@ void GrPass::DoPushGlyphMetric(GrTableMa
@param psstrmIn - input stream
@param psstrmOut - output stream
----------------------------------------------------------------------------------------------*/
@@ -821,7 +803,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
int nGlyphAttr, int nAttLevel,
std::vector<int> & vnStack,
GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
-@@ -1399,7 +1412,7 @@
+@@ -1399,7 +1412,7 @@ void GrPass::DoPushGlyphMetricAux(GrTabl
}
else
{
@@ -830,7 +812,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
float xy;
switch (gmet)
-@@ -1435,7 +1448,11 @@
+@@ -1435,7 +1448,11 @@ void GrPass::DoPushGlyphMetricAux(GrTabl
@param psstrmIn - input stream
@param psstrmOut - output stream
----------------------------------------------------------------------------------------------*/
@@ -843,10 +825,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
int nFeat, std::vector<int> & vnStack, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut)
{
gAssert(!fInserting);
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrSlotState.cpp ./engine/src/segment/GrSlotState.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrSlotState.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrSlotState.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -261,7 +261,7 @@
+--- engine/src/segment/GrSlotState.cpp.orig 2009-01-28 02:01:29 UTC
++++ engine/src/segment/GrSlotState.cpp
+@@ -261,7 +261,7 @@ gid16 GrSlotAbstract::ActualGlyphForOutp
root or attached leaf slots.
OBSOLETE
----------------------------------------------------------------------------------------------*/
@@ -855,7 +836,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
#if 0
pslotOld->m_vpslotAttLeaves.CopyTo(m_vpslotAttLeaves);
-@@ -524,13 +524,13 @@
+@@ -524,13 +524,13 @@ void GrSlotState::AllComponentRefs(std::
GrSlotState * pslot;
if (HasComponents())
{
@@ -872,7 +853,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
}
}
}
-@@ -1024,7 +1024,7 @@
+@@ -1024,7 +1024,7 @@ void GrSlotState::EnsureLocalAttachmentT
NOTE: the caller is responsible to zap the cached positions of following glyphs
in the stream.
----------------------------------------------------------------------------------------------*/
@@ -881,7 +862,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
GrSlotState * pslotNewRoot)
{
GrSlotState * pslotOldRoot = (m_dislotRootFixed == 0) ?
-@@ -1063,7 +1063,7 @@
+@@ -1063,7 +1063,7 @@ void GrSlotState::Position(GrTableManage
float xsWidth, xsVisWidth;
if (m_xsPositionX == kNegInfFloat || m_ysPositionY == kNegInfFloat)
@@ -890,7 +871,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
*pmXPos = ptman->LogToEmUnits(m_xsPositionX);
*pmYPos = ptman->LogToEmUnits(m_ysPositionY);
-@@ -1077,7 +1077,7 @@
+@@ -1077,7 +1077,7 @@ void GrSlotState::AdjustRootMetrics(GrTa
{
Assert(m_dislotRootFixed == m_srAttachTo);
GrSlotState * pslotRoot = AttachRoot(psstrm);
@@ -899,7 +880,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
if (pslotRoot)
pslotRoot->AdjustRootMetrics(ptman, psstrm);
}
-@@ -1086,13 +1086,15 @@
+@@ -1086,13 +1086,15 @@ void GrSlotState::AdjustRootMetrics(GrTa
Calculate the composite metrics for this slot.
@param psstrm - stream for which we are calculating it
@@ -916,7 +897,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
if (m_nCompositeLevel == nLevel)
return;
-@@ -1101,19 +1103,38 @@
+@@ -1101,19 +1103,38 @@ void GrSlotState::CalcCompositeMetrics(G
{
Assert(m_dislotRootFixed == m_srAttachTo);
GrSlotState * pslotRoot = AttachRoot(psstrm);
@@ -958,7 +939,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
m_nCompositeLevel = nLevel;
}
-@@ -1129,25 +1150,33 @@
+@@ -1129,25 +1150,33 @@ void GrSlotState::CalcCompositeMetrics(G
/*----------------------------------------------------------------------------------------------
Calculate the metrics for this node and all its leaf nodes.
----------------------------------------------------------------------------------------------*/
@@ -1002,7 +983,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
}
}
-@@ -1263,7 +1292,7 @@
+@@ -1263,7 +1292,7 @@ float GrSlotState::GlyphXOffset(GrSlotSt
/*----------------------------------------------------------------------------------------------
Y-offsets of a single glyph relative to the previous advance position.
----------------------------------------------------------------------------------------------*/
@@ -1011,10 +992,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
return m_ysOffsetY;
}
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrSlotState.h ./engine/src/segment/GrSlotState.h
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrSlotState.h 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrSlotState.h 2012-02-27 21:40:30.000000000 -0500
-@@ -48,7 +48,7 @@
+--- engine/src/segment/GrSlotState.h.orig 2009-01-28 02:01:29 UTC
++++ engine/src/segment/GrSlotState.h
+@@ -48,7 +48,7 @@ public:
{
}
@@ -1023,7 +1003,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// the table manager is responsible for destroying the contents of m_prgnVarLenBuf
}
-@@ -231,7 +231,7 @@
+@@ -231,7 +231,7 @@ public:
ZapCompositeMetrics();
}
@@ -1032,7 +1012,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
}
-@@ -308,7 +308,11 @@
+@@ -308,7 +308,11 @@ public:
{
return m_islotPosPass;
}
@@ -1044,7 +1024,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
// If we're resetting it, it should be to the same value as before:
Assert(fInputToPosPass1 || m_islotPosPass == kNotYetSet || m_islotPosPass == islot);
-@@ -386,12 +390,12 @@
+@@ -386,12 +390,12 @@ public:
return (IsInitialLineBreak(chwLB) || IsFinalLineBreak(chwLB));
//return (m_chwGlyphID == chwLB); // TODO: remove
}
@@ -1059,7 +1039,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
return (m_spsl == kspslLbFinal);
//return (IsLineBreak(chwLB) && m_fInitialLB == false); // TODO: remove
-@@ -475,7 +479,7 @@
+@@ -475,7 +479,7 @@ public:
return m_mAttachAtX;
}
@@ -1068,7 +1048,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
if (m_mAttachAtX == kNotYetSet)
{
-@@ -615,7 +619,7 @@
+@@ -615,7 +619,7 @@ public:
GrSlotStream * psstrmIn, GrSlotStream * psstrmOut, int islotThis);
void CalcCompositeMetrics(GrTableManager * ptman, GrSlotStream * psstrm,
@@ -1077,7 +1057,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
void Position(GrTableManager * ptman,
GrSlotStream * psstrmOut, int * pmXPos, int * pmYPos);
-@@ -646,7 +650,7 @@
+@@ -646,7 +650,7 @@ public:
{
return ClusterBbLeft(psstrm) + xs;
}
@@ -1086,7 +1066,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
return ClusterAdvWidthFrom(xs) - ClusterBbRightFrom(xs);
}
-@@ -668,19 +672,19 @@
+@@ -668,19 +672,19 @@ public:
{
return ClusterBbRightFrom(Base(psstrm)->ClusterRootOffset());
}
@@ -1110,7 +1090,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
return m_ysClusterBbTop - m_ysClusterBbBottom + 1;
}
-@@ -990,7 +994,8 @@
+@@ -990,7 +994,8 @@ protected:
void InitMetrics(GrTableManager * ptman, GrSlotState * pslotRoot);
void InitLeafMetrics(GrTableManager * ptman, GrSlotState * pslotRoot);
void InitRootMetrics(GrTableManager * ptman);
@@ -1120,10 +1100,9 @@ diff -ru ../silgraphite-2.3.1.orig/engin
void AttachToRoot(GrTableManager * ptman, GrSlotStream *, GrSlotState * pslotNewRoot);
void AttachLogUnits(GrTableManager * ptman,
GrSlotState * pslotRoot,
-diff -ru ../silgraphite-2.3.1.orig/engine/src/segment/GrSlotStream.cpp ./engine/src/segment/GrSlotStream.cpp
---- ../silgraphite-2.3.1.orig/engine/src/segment/GrSlotStream.cpp 2012-02-27 21:39:57.000000000 -0500
-+++ ./engine/src/segment/GrSlotStream.cpp 2012-02-27 21:40:30.000000000 -0500
-@@ -189,12 +189,16 @@
+--- engine/src/segment/GrSlotStream.cpp.orig 2009-02-04 05:53:26 UTC
++++ engine/src/segment/GrSlotStream.cpp
+@@ -189,12 +189,16 @@ GrSlotState * GrSlotStream::Peek(int dis
stream position when the rule is being run.
@param dislot - how far back to peek before the write position
@@ -1141,7 +1120,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
{
Assert(dislot < 0);
if (dislot < m_islotRuleStartWrite * -1)
-@@ -1104,6 +1108,7 @@
+@@ -1104,6 +1108,7 @@ bool RightToLeftDir(DirCode dirc)
case kdircRLO:
case kdircRLE:
case kdircPdfR:
@@ -1149,7 +1128,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
return true;
case kdircNeutral:
-@@ -1212,7 +1217,7 @@
+@@ -1212,7 +1217,7 @@ bool GrSlotStream::MoreSpace(GrTableMana
return true;
float xsWidth, xsVisWidth;
@@ -1158,7 +1137,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
*pxsWidth = (fIgnoreTrailingWS || twsh == ktwshOnlyWs) ? xsVisWidth : xsWidth;
return (*pxsWidth < xsSpaceAllotted);
-@@ -1322,7 +1327,7 @@
+@@ -1322,7 +1327,7 @@ int GrSlotStream::InsertLineBreak(GrTabl
@param islotMin - first slot that is officially part of the segment (after initial LB)
----------------------------------------------------------------------------------------------*/
int GrSlotStream::MakeSegmentBreak(GrTableManager * ptman,
@@ -1167,7 +1146,7 @@ diff -ru ../silgraphite-2.3.1.orig/engin
LineBrk lb, TrWsHandling twsh, int islotMin,
LineBrk * plbNextToTry)
{
-@@ -1576,7 +1581,11 @@
+@@ -1576,7 +1581,11 @@ int GrSlotStream::MaxClusterSlot(int isl
Return the break weight of the given slot, which should be a line-break.
OBSOLETE??
----------------------------------------------------------------------------------------------*/
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list