Update of /cvsroot/silgraphite/silgraphite/include
In directory sc8-pr-cvs1:/tmp/cvs-serv3270/include
Modified Files:
GrCommon.h GrEngine.h GrSegment.h
Log Message:
Synchronized with FW, 16 Apr 2003, changelist #6720
Index: GrCommon.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrCommon.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GrCommon.h 1 Apr 2003 22:23:36 -0000 1.2
+++ GrCommon.h 16 Apr 2003 19:59:37 -0000 1.3
@@ -148,6 +148,8 @@
typedef achar * Psz;
typedef const achar * Pcsz;
+typedef wchar grwchar;
+
/*************************************************************************************
Offsets and addresses. AddrOf is useful for taking the address of an object
Index: GrEngine.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrEngine.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- GrEngine.h 14 Apr 2003 21:34:25 -0000 1.6
+++ GrEngine.h 16 Apr 2003 19:59:37 -0000 1.7
@@ -116,23 +116,23 @@
int * pdichwContext,
OLECHAR * prgchwErrMsg, int cchMaxErrMsg);
- wchar GetGlyphIDFromUnicode(int nUnicode);
- wchar ActualGlyphForOutput(wchar chwGlyphID);
+ grwchar GetGlyphIDFromUnicode(int nUnicode);
+ grwchar ActualGlyphForOutput(grwchar chwGlyphID);
int GetFontEmUnits()
{
return m_mFontEmUnits;
}
- wchar LBGlyphID()
+ grwchar LBGlyphID()
{
return m_chwLBGlyphID;
}
- wchar GetClassGlyphIDAt(int nClass, int nIndex);
- int GetIndexInGlyphClass(int nClass, wchar chwGlyphID);
- int GlyphAttrValue(wchar chwGlyphID, int nAttrID);
- int ComponentIndexForGlyph(wchar chwGlyphID, int nCompID);
+ grwchar GetClassGlyphIDAt(int nClass, int nIndex);
+ int GetIndexInGlyphClass(int nClass, grwchar chwGlyphID);
+ int GlyphAttrValue(grwchar chwGlyphID, int nAttrID);
+ int ComponentIndexForGlyph(grwchar chwGlyphID, int nCompID);
void InitFontName();
void RecordFontLoadError(OLECHAR * prgchwErrMsg, int cchMaxErrMsg);
@@ -265,13 +265,7 @@
return 2;
}
- static int ReadVersion(GrIStream & grstrm)
- {
- int nVersion = grstrm.ReadIntFromFont();
- if (nVersion == 0x00010000)
- nVersion = 0x00000001; // kludge for silly mistake
- return nVersion;
- }
+ static int ReadVersion(GrIStream & grstrm);
protected:
// Member variables:
@@ -345,11 +339,11 @@
int m_cchwPostXlbContext;
// magic glyph attribute numbers
- wchar m_chwPseudoAttr; // actual-for-pseudo fake glyph attribute
- wchar m_chwBWAttr; // break-weight
- wchar m_chwDirAttr; // directionality
+ grwchar m_chwPseudoAttr; // actual-for-pseudo fake glyph attribute
+ grwchar m_chwBWAttr; // break-weight
+ grwchar m_chwDirAttr; // directionality
- wchar m_chwLBGlyphID; // magic line-break glyph ID
+ grwchar m_chwLBGlyphID; // magic line-break glyph ID
int m_cComponents; // number of glyph attributes at the beginning of the glyph table
// that actually represent ligature components
@@ -411,7 +405,7 @@
void CreateEmpty();
- wchar MapToPseudo(int nUnicode);
+ grwchar MapToPseudo(int nUnicode);
//:Ignore
#ifdef OLD_TEST_STUFF
Index: GrSegment.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrSegment.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GrSegment.h 14 Apr 2003 21:34:26 -0000 1.5
+++ GrSegment.h 16 Apr 2003 19:59:37 -0000 1.6
@@ -78,7 +78,7 @@
GrResult get_RightToLeft(int ichwBase, bool * pfResult);
GrResult get_DirectionDepth(int ichwBase, int * pnDepth, bool * pfWeak);
GrResult SetDirectionDepth(int ichwBase, int nNewDepth);
- GrResult get_OldWritingSystem(int ichwBase, int * pws, int * pows);
+ GrResult get_WritingSystem(int ichwBase, int * pws, int * pows);
GrResult get_Lim(int ichwBase, int * pdichw);
GrResult get_LimInterest(int ichwBase, int * pdichw);
@@ -210,7 +210,7 @@
int clrFore, int clrBack, bool fBackColor);
void SetUpOutputArrays(GrTableManager * ptm, GrSlotStream * psstrmFinal,
- int cchwUnderlying, int csloutSurface, wchar chwLB,
+ int cchwUnderlying, int csloutSurface, grwchar chwLB,
LgTrailingWsHandling twsh, bool fParaRtl, int nDirDepth,
bool fEmpty = false);
void ShiftGlyphs(int dxsShift);
|
