From: <sil...@li...> - 2005-05-27 18:18:37
|
Update of /cvsroot/silgraphite/silgraphite/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19623/include Modified Files: Tag: v2api GrStructs.h UtilString.h Log Message: Fixed bug in positioning mechanism (showed up in justified Burmese). Index: GrStructs.h =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/include/GrStructs.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- GrStructs.h 27 Oct 2004 14:32:00 -0000 1.1.2.1 +++ GrStructs.h 27 May 2005 18:18:25 -0000 1.1.2.2 @@ -48,6 +48,7 @@ int value; } FeatureSetting; + } // namespace gr Index: UtilString.h =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/include/UtilString.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- UtilString.h 12 Apr 2004 10:24:25 -0000 1.7 +++ UtilString.h 27 May 2005 18:18:26 -0000 1.7.2.1 @@ -331,7 +331,7 @@ { for ( ; --cch >= 0; prgch1++, prgch2++) { - if (*prgch1 != *prgch2 && gr::ToLower(*prgch1) != gr::ToLower(*prgch2)) + if (*prgch1 != *prgch2 && /*gr::*/ToLower(*prgch1) != /*gr::*/ToLower(*prgch2)) return false; } @@ -1431,10 +1431,10 @@ int ich; int cch = Length(); - ch = gr::ToLower(ch); + ch = /*gr::*/ToLower(ch); for (ich = ichMin; ich < cch; ich++) { - if (gr::ToLower(m_pbuf->m_rgch[ich]) == ch) + if (/*gr::*/ToLower(m_pbuf->m_rgch[ich]) == ch) return ich; } @@ -1476,12 +1476,12 @@ if (ichLast >= Length()) ichLast = Length() - 1; - ch = gr::ToLower(ch); + ch = /*gr::*/ToLower(ch); int ich; for (ich = ichLast; ich >= 0; --ich) { - if (gr::ToLower(m_pbuf->m_rgch[ich]) == ch) + if (/*gr::*/ToLower(m_pbuf->m_rgch[ich]) == ch) return ich; } @@ -1597,11 +1597,11 @@ // Last position in m_rgch where prgch can be. int ichLast = Length() - cch; int ich; - XChar ch = gr::ToLower(prgch[0]); + XChar ch = /*gr::*/ToLower(prgch[0]); for (ich = ichMin; ich <= ichLast; ich++) { - if (gr::ToLower(m_pbuf->m_rgch[ich]) == ch && + if (/*gr::*/ToLower(m_pbuf->m_rgch[ich]) == ch && EqualsRgchCI(m_pbuf->m_rgch + ich, prgch, cch)) { return ich; @@ -1714,11 +1714,11 @@ if (ichLast > Length() - cch) ichLast = Length() - cch; - XChar ch = gr::ToLower(prgch[0]); + XChar ch = /*gr::*/ToLower(prgch[0]); int ich; for (ich = ichLast; ich >= 0; --ich) { - if (gr::ToLower(m_pbuf->m_rgch[ich]) == ch && + if (/*gr::*/ToLower(m_pbuf->m_rgch[ich]) == ch && EqualsRgchCI(m_pbuf->m_rgch + ich, prgch, cch)) { return ich; @@ -1755,6 +1755,8 @@ //:> without initialization by a constructor. This is so other constructors can use //:> instances of StrBase without having to deal with the possibility of s_bufEmpty //:> being uninitialized. + StrBuffer() + {} long m_crefMinusOne; // The reference count minus one. size_t m_cb; // The byte count. XChar m_rgch[1]; // The characters. |