ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2103 from nado/fix_NoFribidi_compilation

Browse Source 
Fix compilation with -DUSE_FRIBIDI=0
This commit is contained in:
auriamg 2015-04-24 21:07:12 -04:00
commit f97db81ce3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/translation.cpp
View File

@ -96,6 +96,7 @@ wchar_t* utf8_to_wide(const char* input)
// ----------------------------------------------------------------------------
/** Frees the memory allocated for the result of toFribidiChar(). */
#ifdef ENABLE_BIDI
void freeFribidiChar(FriBidiChar *str)
{
#ifdef TEST_BIDI
@ -105,13 +106,16 @@ void freeFribidiChar(FriBidiChar *str)
delete[] str;
#endif
}
#endif
/** Frees the memory allocated for the result of fromFribidiChar(). */
#ifdef ENABLE_BIDI
void freeFribidiChar(wchar_t *str)
{
if (sizeof(wchar_t) != sizeof(FriBidiChar))
delete[] str;
}
#endif
// ----------------------------------------------------------------------------
/** Converts a wstring to a FriBidi-string.
@ -121,6 +125,7 @@ void freeFribidiChar(wchar_t *str)
On linux, the string doesn't need to be converted because wchar_t is
already UTF-32. On windows the string is converted from UTF-16 by this
function. */
#ifdef ENABLE_BIDI
FriBidiChar* toFribidiChar(const wchar_t* str)
{
std::size_t length = wcslen(str);
@ -168,6 +173,7 @@ wchar_t* fromFribidiChar(const FriBidiChar* str)
}
return result;
}
#endif
// ----------------------------------------------------------------------------
Translations::Translations() //: m_dictionary_manager("UTF-16")