Menu
▾
▴
[Silgraphite-cvs] silgraphite/contrib/pangomod GrGraphics.cpp,1.2,1.3 GrGraphics.h,1.2,1.3 GrTextSrc.cpp,1.5,1.6 GrTextSrc.h,1.3,1.4 Makefile.am,1.3,1.4 configure.ac,1.3,1.4 pangographite.cpp,1.6,1.7
Update of /cvsroot/silgraphite/silgraphite/contrib/pangomod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31237 Modified Files: GrGraphics.cpp GrGraphics.h GrTextSrc.cpp GrTextSrc.h Makefile.am configure.ac pangographite.cpp Log Message: LgCharRenderProps -> GrCharProps Index: GrGraphics.cpp =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/GrGraphics.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GrGraphics.cpp 27 Aug 2004 10:19:00 -0000 1.2 +++ GrGraphics.cpp 25 Oct 2004 21:23:54 -0000 1.3 @@ -20,7 +20,7 @@ : m_pfont(hfont), m_xyFontEmSquare(0), m_Ascent(0), m_Descent(0) { m_hfont = pango_xft_font_get_font(hfont); - memset (&m_chrp, '\0', sizeof(LgCharRenderProps)); + memset (&m_chrp, '\0', sizeof(GrCharProps)); m_yinch = FUDGE_FACTOR; //m_face = m_hfont ? XftLockFace(m_hfont) : NULL; } @@ -120,9 +120,9 @@ #define GetGValue(rgb) ((BYTE) ((rgb) >> 8)) #define GetBValue(rgb) ((BYTE) ((rgb) >> 16)) -GrResult GrGraphics::SetupGraphics(LgCharRenderProps * pchrp) +GrResult GrGraphics::SetupGraphics(GrCharProps * pchrp) { - memcpy(&m_chrp, pchrp, sizeof(LgCharRenderProps)); + memcpy(&m_chrp, pchrp, sizeof(GrCharProps)); #if 0 // set the colour m_colour.color.red = GetRValue(pchrp->clrFore); @@ -308,8 +308,8 @@ return kresOk; } -GrResult GrGraphics::get_FontCharProperties(LgCharRenderProps*pchrp) +GrResult GrGraphics::get_FontCharProperties(GrCharProps*pchrp) { - memcpy(pchrp, &m_chrp, sizeof(LgCharRenderProps)); + memcpy(pchrp, &m_chrp, sizeof(GrCharProps)); return kresOk; } Index: GrGraphics.h =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/GrGraphics.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GrGraphics.h 27 Aug 2004 10:19:01 -0000 1.2 +++ GrGraphics.h 25 Oct 2004 21:23:54 -0000 1.3 @@ -41,9 +41,9 @@ virtual GrResult get_FontAscent(int* pdy); virtual GrResult get_FontDescent(int* pdy); virtual GrResult get_YUnitsPerInch(int * pyInch); - //will NOT change font face name regardless of LgCharRenderProps.szFaceName - virtual GrResult SetupGraphics(LgCharRenderProps * pchrp); - virtual GrResult get_FontCharProperties(LgCharRenderProps * pchrp); + //will NOT change font face name regardless of GrCharProps.szFaceName + virtual GrResult SetupGraphics(GrCharProps * pchrp); + virtual GrResult get_FontCharProperties(GrCharProps * pchrp); private: //XftDraw *m_draw; PangoFont *m_pfont; @@ -52,7 +52,7 @@ int m_xyFontEmSquare; int m_Ascent; int m_Descent; - LgCharRenderProps m_chrp; + GrCharProps m_chrp; //XftColor m_colour; MetricMap m_MetricCache; }; Index: GrTextSrc.cpp =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/GrTextSrc.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- GrTextSrc.cpp 16 Sep 2004 14:44:31 -0000 1.5 +++ GrTextSrc.cpp 25 Oct 2004 21:23:54 -0000 1.6 @@ -5,7 +5,7 @@ #include <glib/gmessages.h> #include <glib/gmem.h> -GrTextSrc::GrTextSrc(const char* pszText, int length, LgCharRenderProps & chrp, +GrTextSrc::GrTextSrc(const char* pszText, int length, GrCharProps & chrp, const char * prgchFontVar, int ichFontVar) { #if 0 @@ -24,7 +24,7 @@ //memcpy(m_prgchText, pszText, isizeof(OLECHAR) * m_cchLength); m_prgchText[m_cchLength] = '\0'; // zero-terminate - memcpy(&m_chrp, &chrp, isizeof(LgCharRenderProps)); + memcpy(&m_chrp, &chrp, isizeof(GrCharProps)); memset(m_rgchFontVar, 0, isizeof(m_rgchFontVar)); //memcpy(m_rgchFontVar, prgchFontVar, std::min(ichFontVar, isizeof(m_rgchFontVar))); #ifdef __GNUC__ @@ -37,7 +37,7 @@ } #if 0 -GrTextSrc::GrTextSrc(const OLECHAR* pszText, LgCharRenderProps & chrp, +GrTextSrc::GrTextSrc(const OLECHAR* pszText, GrCharProps & chrp, const char * prgchFontVar, int ichFontVar) { m_cchLength = wcslen(pszText); @@ -47,7 +47,7 @@ memcpy(m_prgchText, pszText, isizeof(OLECHAR) * m_cchLength); m_prgchText[m_cchLength] = '\0'; // zero-terminate - memcpy(&m_chrp, &chrp, isizeof(LgCharRenderProps)); + memcpy(&m_chrp, &chrp, isizeof(GrCharProps)); memset(m_rgchFontVar, 0, isizeof(m_rgchFontVar)); //memcpy(m_rgchFontVar, prgchFontVar, std::min(ichFontVar, isizeof(m_rgchFontVar))); #ifdef __GNUC__ @@ -90,12 +90,12 @@ return kresOk; } -GrResult GrTextSrc::GetCharProps(int ich, LgCharRenderProps * pchrp, +GrResult GrTextSrc::GetCharProps(int ich, GrCharProps * pchrp, int * pichMin, int * pichLim) { *pichMin = 0; *pichLim = m_cchLength; - if (memcpy(pchrp, &m_chrp, isizeof(LgCharRenderProps))) + if (memcpy(pchrp, &m_chrp, isizeof(GrCharProps))) { return kresOk; } Index: GrTextSrc.h =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/GrTextSrc.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GrTextSrc.h 20 Aug 2004 23:42:26 -0000 1.3 +++ GrTextSrc.h 25 Oct 2004 21:23:54 -0000 1.4 @@ -6,17 +6,17 @@ class GrTextSrc : public IGrTextSource { public: - GrTextSrc(const char * pszText, int length, LgCharRenderProps & chrp, + GrTextSrc(const char * pszText, int length, GrCharProps & chrp, const char * prgchFontVar, int ichFontVar); #if 0 - GrTextSrc(const OLECHAR * pszText, LgCharRenderProps & chrp, + GrTextSrc(const OLECHAR * pszText, GrCharProps & chrp, const char * prgchFontVar, int ichFontVar); #endif ~GrTextSrc(); virtual GrResult Fetch(int ichMin, int ichLim, utf16 * prgchBuf); virtual GrResult get_Length(int * pcch); - virtual GrResult GetCharProps(int ich, LgCharRenderProps * pchrp, + virtual GrResult GetCharProps(int ich, GrCharProps * pchrp, int * pichMin, int * pichLim); virtual GrResult GetParaProps(int ich, LgParaRenderProps * pchrp, int * pichMin, int * pichLim); @@ -30,7 +30,7 @@ utf16 * m_prgchText; int m_cchLength; utf16 m_rgchFontVar[64]; - LgCharRenderProps m_chrp; + GrCharProps m_chrp; }; #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 27 Aug 2004 10:19:01 -0000 1.3 +++ Makefile.am 25 Oct 2004 21:23:54 -0000 1.4 @@ -20,6 +20,8 @@ #INCLUDES += -I$(top_srcdir)/../../src/TtfUtil -I$(top_srcdir)/../../src/lib #INCLUDES += -I$(top_srcdir)/../../src/Generic +EXTRA_DIST = module.diff script.diff \ + fontconfig.diff fontconfig-cvs.diff #moduledir = $(pkglibdir)/pango/$(PANGO_MODULE_VERSION)/modules moduledir = $(libdir)/silgraphite/pango/$(PANGO_MODULE_VERSION) Index: configure.ac =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- configure.ac 27 Aug 2004 10:19:01 -0000 1.3 +++ configure.ac 25 Oct 2004 21:23:54 -0000 1.4 @@ -1,7 +1,7 @@ # --------------------------------------------------------------------- # Initialisation # --------------------------------------------------------------------- -AC_INIT(grpangomod, 1.1.2, sil...@li...) +AC_INIT(pangographite, 1.1.2, sil...@li...) AC_CONFIG_SRCDIR(pangographite.cpp) AC_PREREQ(2.54) AC_REVISION($Revision$) Index: pangographite.cpp =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/pangographite.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pangographite.cpp 16 Sep 2004 14:47:13 -0000 1.6 +++ pangographite.cpp 25 Oct 2004 21:23:54 -0000 1.7 @@ -63,8 +63,8 @@ int dichContext; GrSegment * pgrseg; - LgCharRenderProps * pchrp = new LgCharRenderProps(); - memset(pchrp, '\0', sizeof(LgCharRenderProps)); + GrCharProps * pchrp = new GrCharProps(); + memset(pchrp, '\0', sizeof(GrCharProps)); //pchrp->dympHeight = size * 1000; // font size in millipoints GrTextSrc * pgrtext; pgrtext = new GrTextSrc(text, length, *pchrp, "", 0); |