nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reuse temporary memory for reencoding / reordering fribidi-strings

Browse source
This commit is contained in:
Mathias Gumz 2010-09-05 10:47:01 +02:00
parent 60c92b96f2
commit 63f9c8c1a2
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/FbTk/FbString.cc
View file

@ -44,6 +44,7 @@
#include <locale.h> #include <locale.h>
#include <iostream> #include <iostream>
#include <vector>
#ifdef HAVE_FRIBIDI #ifdef HAVE_FRIBIDI
#include <fribidi/fribidi.h> #include <fribidi/fribidi.h>
@ -246,31 +247,38 @@ bool haveUTF8() {
#ifdef HAVE_FRIBIDI #ifdef HAVE_FRIBIDI
FbString BidiLog2Vis (const FbString& src){ FbString BidiLog2Vis (const FbString& src) {
FriBidiChar * us, * out_us;
FriBidiCharType base;
FbString r;
char * out;
us = new FriBidiChar[src.size()+1]; FriBidiCharType base = FRIBIDI_TYPE_N;
out_us = new FriBidiChar[src.size()+1];
unsigned int len = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8, const_cast<char *>(src.c_str()), src.length(), us); // reuse allocated memory for reencoding / reordering
static std::vector<FriBidiChar> us;
static std::vector<FriBidiChar> out_us;
static FbString result;
base = FRIBIDI_TYPE_N; const size_t S = src.size() + 1;
fribidi_log2vis(us, len, &base, out_us, NULL, NULL, NULL); const size_t S4 = S * 4;
out = new char[4*src.size()+1]; if (us.capacity() < S)
us.reserve(S);
if (out_us.capacity() < S)
out_us.reserve(S);
if (result.capacity() < S4)
result.reserve(S4);
fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, out_us, len, out); us.resize(S);
FriBidiStrIndex len = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8,
const_cast<char*>(src.c_str()), S - 1,
&us[0]);
r = out; out_us.resize(S);
fribidi_log2vis(&us[0], len, &base, &out_us[0], NULL, NULL, NULL);
delete[] out_us; result.resize(S4);
delete[] us; len = fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, &out_us[0], len, &result[0]);
delete[] out; result.resize(len); // trim to currently used chars
return r; return result;
} }
#endif #endif