Re: unicode bug in TortoiseMerge

Першин Юрий wrote:
> Index: FileTextLines.cpp
> ===================================================================
> --- FileTextLines.cpp (revision 9622)
> +++ FileTextLines.cpp (working copy)
> @@ -272,6 +272,7 @@
> // fill in the lines into the array
> wchar_t * pTextBuf = (wchar_t *)pFileBuf;
> wchar_t * pLineStart = (wchar_t *)pFileBuf;
> + if(m_UnicodeType == UNICODE_LE) { ++pTextBuf; ++pLineStart;
> dwReadBytes/=2; --dwReadBytes; }
> for (DWORD i = 0; i<dwReadBytes; ++i)
> {
> if (*pTextBuf == '\r')

Thanks for the patch!
Committed in revision 9661 with some minor tweaks.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org