1*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/engine/config/ltmain.sh 2009-01-28 11:21:59.000000000 +0900 2*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/engine/config/ltmain.sh 2009-08-23 20:59:13.180125000 +0900 3*cdf0e10cSrcweir@@ -3963,7 +3963,7 @@ 4*cdf0e10cSrcweir case $dir in 5*cdf0e10cSrcweir [\\/]* | [A-Za-z]:[\\/]*) ;; 6*cdf0e10cSrcweir *) 7*cdf0e10cSrcweir- absdir=`cd "$dir" && pwd` 8*cdf0e10cSrcweir+ absdir=`cygpath -m -a "$dir"` 9*cdf0e10cSrcweir test -z "$absdir" && \ 10*cdf0e10cSrcweir func_fatal_error "cannot determine absolute directory name of \`$dir'" 11*cdf0e10cSrcweir dir="$absdir" 12*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/engine/src/Makefile.in 2009-01-28 11:25:00.000000000 +0900 13*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/engine/src/Makefile.in 2009-08-23 20:59:13.742625000 +0900 14*cdf0e10cSrcweir@@ -62,7 +62,8 @@ 15*cdf0e10cSrcweir GrFSM.lo GrGlyphTable.lo GrPassActionCode.lo GrPass.lo \ 16*cdf0e10cSrcweir GrSlotState.lo GrSlotStream.lo GrTableManager.lo \ 17*cdf0e10cSrcweir MemoryUsage.lo Platform.lo SegmentAux.lo Segment.lo TestFSM.lo \ 18*cdf0e10cSrcweir- TestPasses.lo TransductionLog.lo SegmentPainter.lo 19*cdf0e10cSrcweir+ TestPasses.lo TransductionLog.lo SegmentPainter.lo WinFont.lo \ 20*cdf0e10cSrcweir+ WinSegmentPainter.lo 21*cdf0e10cSrcweir libgraphite_la_OBJECTS = $(am_libgraphite_la_OBJECTS) 22*cdf0e10cSrcweir libgraphite_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ 23*cdf0e10cSrcweir $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ 24*cdf0e10cSrcweir@@ -257,11 +258,14 @@ 25*cdf0e10cSrcweir $(segmentdir)/Platform.cpp $(segmentdir)/SegmentAux.cpp \ 26*cdf0e10cSrcweir $(segmentdir)/Segment.cpp $(segmentdir)/TestFSM.cpp \ 27*cdf0e10cSrcweir $(segmentdir)/TestPasses.cpp $(segmentdir)/TransductionLog.cpp \ 28*cdf0e10cSrcweir- $(painterdir)/SegmentPainter.cpp 29*cdf0e10cSrcweir+ $(painterdir)/SegmentPainter.cpp \ 30*cdf0e10cSrcweir+ $(winwrapperdir)/WinFont.cpp \ 31*cdf0e10cSrcweir+ $(winwrapperdir)/WinSegmentPainter.cpp 32*cdf0e10cSrcweir genericdir = $(top_srcdir)/src/generic 33*cdf0e10cSrcweir fontdir = $(top_srcdir)/src/font 34*cdf0e10cSrcweir segmentdir = $(top_srcdir)/src/segment 35*cdf0e10cSrcweir painterdir = $(top_srcdir)/src/painter 36*cdf0e10cSrcweir+winwrapperdir = $(top_srcdir)/../wrappers/win32 37*cdf0e10cSrcweir all: all-am 38*cdf0e10cSrcweir 39*cdf0e10cSrcweir .SUFFIXES: 40*cdf0e10cSrcweir@@ -358,6 +362,8 @@ 41*cdf0e10cSrcweir @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TransductionLog.Plo@am__quote@ 42*cdf0e10cSrcweir @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TtfUtil.Plo@am__quote@ 43*cdf0e10cSrcweir @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Plo@am__quote@ 44*cdf0e10cSrcweir+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinFont.Plo@am__quote@ 45*cdf0e10cSrcweir+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinSegmentPainter.Plo@am__quote@ 46*cdf0e10cSrcweir 47*cdf0e10cSrcweir .cpp.o: 48*cdf0e10cSrcweir @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 49*cdf0e10cSrcweir@@ -569,6 +575,20 @@ 50*cdf0e10cSrcweir @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 51*cdf0e10cSrcweir @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SegmentPainter.lo `test -f '$(painterdir)/SegmentPainter.cpp' || echo '$(srcdir)/'`$(painterdir)/SegmentPainter.cpp 52*cdf0e10cSrcweir 53*cdf0e10cSrcweir+WinFont.lo: $(winwrapperdir)/WinFont.cpp 54*cdf0e10cSrcweir+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT WinFont.lo -MD -MP -MF $(DEPDIR)/WinFont.Tpo -c -o WinFont.lo `test -f '$(winwrapperdir)/WinFont.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinFont.cpp 55*cdf0e10cSrcweir+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/WinFont.Tpo $(DEPDIR)/WinFont.Plo 56*cdf0e10cSrcweir+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(winwrapperdir)/WinFont.cpp' object='WinFont.lo' libtool=yes @AMDEPBACKSLASH@ 57*cdf0e10cSrcweir+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 58*cdf0e10cSrcweir+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WinFont.lo `test -f '$(winwrapperdir)/WinFont.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinFont.cpp 59*cdf0e10cSrcweir+ 60*cdf0e10cSrcweir+WinSegmentPainter.lo: $(winwrapperdir)/WinSegmentPainter.cpp 61*cdf0e10cSrcweir+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT WinSegmentPainter.lo -MD -MP -MF $(DEPDIR)/WinSegmentPainter.Tpo -c -o WinSegmentPainter.lo `test -f '$(winwrapperdir)/WinSegmentPainter.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinSegmentPainter.cpp 62*cdf0e10cSrcweir+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/WinSegmentPainter.Tpo $(DEPDIR)/WinSegmentPainter.Plo 63*cdf0e10cSrcweir+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(winwrapperdir)/WinSegmentPainter.cpp' object='WinSegmentPainter.lo' libtool=yes @AMDEPBACKSLASH@ 64*cdf0e10cSrcweir+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 65*cdf0e10cSrcweir+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WinSegmentPainter.lo `test -f '$(winwrapperdir)/WinSegmentPainter.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinSegmentPainter.cpp 66*cdf0e10cSrcweir+ 67*cdf0e10cSrcweir mostlyclean-libtool: 68*cdf0e10cSrcweir -rm -f *.lo 69*cdf0e10cSrcweir 70*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/engine/src/font/FileFont.cpp 2009-01-22 07:36:42.000000000 +0900 71*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/engine/src/font/FileFont.cpp 2009-08-23 20:59:14.148875000 +0900 72*cdf0e10cSrcweir@@ -208,7 +208,11 @@ 73*cdf0e10cSrcweir } 74*cdf0e10cSrcweir // } 75*cdf0e10cSrcweir #elif 1 76*cdf0e10cSrcweir+#ifdef __MINGW32__ 77*cdf0e10cSrcweir+ m_stuFaceName.assign(reinterpret_cast<wchar_t*>(rgchwFace)); 78*cdf0e10cSrcweir+#else 79*cdf0e10cSrcweir m_stuFaceName.assign(rgchwFace); 80*cdf0e10cSrcweir+#endif 81*cdf0e10cSrcweir #else // VS 2005 needs this: 82*cdf0e10cSrcweir for (int cch16 = 0; cch16 < cchw; cch16++) 83*cdf0e10cSrcweir m_stuFaceName.push_back(rgchwFace[cch16]); 84*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2009-01-22 07:36:42.000000000 +0900 85*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2009-08-23 20:59:15.445750000 +0900 86*cdf0e10cSrcweir@@ -375,7 +375,7 @@ 87*cdf0e10cSrcweir _itow(dxDesiredWidth, rgchw, 10); 88*cdf0e10cSrcweir strTmp += rgchw; 89*cdf0e10cSrcweir strTmp += L")\n"; 90*cdf0e10cSrcweir- OutputDebugString(strTmp.c_str()); 91*cdf0e10cSrcweir+ OutputDebugStringW(strTmp.c_str()); 92*cdf0e10cSrcweir #else 93*cdf0e10cSrcweir Assert(fprintf(stderr, 94*cdf0e10cSrcweir "justification failed by %d units (width needed = %d)\n", 95*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp 2009-01-22 07:36:42.000000000 +0900 96*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp 2009-08-23 20:59:15.711375000 +0900 97*cdf0e10cSrcweir@@ -56,7 +56,7 @@ 98*cdf0e10cSrcweir 99*cdf0e10cSrcweir int main(int argc, char* argv[]) 100*cdf0e10cSrcweir { 101*cdf0e10cSrcweir-#ifdef _WIN32 102*cdf0e10cSrcweir+#if defined(_WIN32) && !defined(__MINGW32__) 103*cdf0e10cSrcweir _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF); 104*cdf0e10cSrcweir #endif // WIN32 105*cdf0e10cSrcweir 106*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/engine/test/RegressionTest/main.h 2009-01-29 17:33:19.000000000 +0900 107*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/main.h 2009-08-23 20:59:15.945750000 +0900 108*cdf0e10cSrcweir@@ -36,7 +36,7 @@ 109*cdf0e10cSrcweir ////#include <algorithm> 110*cdf0e10cSrcweir #include <string> 111*cdf0e10cSrcweir #include <cstring> 112*cdf0e10cSrcweir-#ifdef _WIN32 113*cdf0e10cSrcweir+#if defined(_WIN32) && !defined(__MINGW32__) 114*cdf0e10cSrcweir #include <crtdbg.h> 115*cdf0e10cSrcweir #endif // _WIN32 116*cdf0e10cSrcweir #include <assert.h> 117*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-01-29 17:33:19.000000000 +0900 118*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-08-23 20:59:16.211375000 +0900 119*cdf0e10cSrcweir@@ -846,7 +846,7 @@ 120*cdf0e10cSrcweir 121*cdf0e10cSrcweir } // namespace gr 122*cdf0e10cSrcweir 123*cdf0e10cSrcweir-template stdext::hash_map< 124*cdf0e10cSrcweir+template class stdext::hash_map< 125*cdf0e10cSrcweir gr::WinFont::LogFontWrapper, 126*cdf0e10cSrcweir gr::WinFont::FontHandleCache::FontCacheValue, 127*cdf0e10cSrcweir gr::WinFont::LogFontHashFuncs>; 128*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h 2009-01-29 17:33:19.000000000 +0900 129*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h 2009-08-23 20:59:16.367625000 +0900 130*cdf0e10cSrcweir@@ -17,6 +17,9 @@ 131*cdf0e10cSrcweir #endif 132*cdf0e10cSrcweir #ifndef WINFONT_INCLUDED 133*cdf0e10cSrcweir #define WINFONT_INCLUDED 134*cdf0e10cSrcweir+#if __GNUC__ >=3 135*cdf0e10cSrcweir+#pragma GCC system_header 136*cdf0e10cSrcweir+#endif 137*cdf0e10cSrcweir 138*cdf0e10cSrcweir //:End Ignore 139*cdf0e10cSrcweir 140*cdf0e10cSrcweir@@ -27,6 +30,8 @@ 141*cdf0e10cSrcweir #include "GrClient.h" 142*cdf0e10cSrcweir #include "Font.h" 143*cdf0e10cSrcweir 144*cdf0e10cSrcweir+namespace stdext = std; 145*cdf0e10cSrcweir+ 146*cdf0e10cSrcweir #ifdef _STLPORT_VERSION 147*cdf0e10cSrcweir namespace stdext = _STLP_STD; 148*cdf0e10cSrcweir #endif 149*cdf0e10cSrcweir--- misc/silgraphite-2.3.1/wrappers/win32/WinSegmentPainter.h 2008-05-09 20:10:30.000000000 +0900 150*cdf0e10cSrcweir+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinSegmentPainter.h 2009-08-23 21:14:38.961375000 +0900 151*cdf0e10cSrcweir@@ -82,7 +82,7 @@ 152*cdf0e10cSrcweir // return ::SetBkColor(hdc, PALETTERGB(GetRValue(clr), GetGValue(clr), GetBValue(clr))); 153*cdf0e10cSrcweir //} 154*cdf0e10cSrcweir 155*cdf0e10cSrcweir- void WinSegmentPainter::paintAux(); 156*cdf0e10cSrcweir+ void paintAux(); 157*cdf0e10cSrcweir 158*cdf0e10cSrcweir protected: 159*cdf0e10cSrcweir // member variables: 160