libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Fix FriBidiParType failure on 3ds

Browse Source 
/data/src/master/common/unicode-bidi.cpp: In member function 'void
Common::UnicodeBiDiText::initWithU32String(const Common::U32String&)':
/data/src/master/common/unicode-bidi.cpp:78:3: error: invalid conversion
from 'uint32*' {aka 'unsigned int*'} to 'FriBidiParType*' {aka 'long
unsigned int*'} [-fpermissive]
   78 |   &_pbase_dir,
      |   ^~~~~~~~~~~
      |   |
      |   uint32* {aka unsigned int*}
This commit is contained in:
Orgad Shaneh 2021-03-14 22:33:39 +02:00 committed by Eugene Sandulenko
parent 58f912aaa4
commit 2de08c0717
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/unicode-bidi.cpp
View File

@ -38,7 +38,7 @@ UnicodeBiDiText::UnicodeBiDiText(const Common::String &str, const Common::CodePa
initWithU32String(str.decode(page));
}
UnicodeBiDiText::UnicodeBiDiText(const Common::String &str, const Common::CodePage page, uint *pbase_dir) : logical(str), _log_to_vis_index(NULL), _vis_to_log_index(NULL) {
UnicodeBiDiText::UnicodeBiDiText(const Common::String &str, const Common::CodePage page, uint32 *pbase_dir) : logical(str), _log_to_vis_index(NULL), _vis_to_log_index(NULL) {
_pbase_dir = *pbase_dir;
initWithU32String(str.decode(page));
*pbase_dir = _pbase_dir;
@ -71,11 +71,12 @@ void UnicodeBiDiText::initWithU32String(const U32String &input) {
_log_to_vis_index = new uint32[input_size];
_vis_to_log_index = new uint32[input_size];
FriBidiParType pbase_dir = FriBidiParType(_pbase_dir);
if (!fribidi_log2vis(
/* input */
(const FriBidiChar *)input.c_str(),
input_size,
&_pbase_dir,
&pbase_dir,
/* output */
visual_str,
(FriBidiStrIndex *)_log_to_vis_index, // position_L_to_V_list,
@ -93,6 +94,7 @@ void UnicodeBiDiText::initWithU32String(const U32String &input) {
visual = U32String((uint32 *)visual_str, input.size());
delete[] visual_str;
}
_pbase_dir = pbase_dir;
#else
static bool fribidiWarning = true;
if (fribidiWarning) {

2
common/unicode-bidi.h
View File

@ -57,7 +57,7 @@ public:
UnicodeBiDiText(const Common::U32String &str);
UnicodeBiDiText(const Common::String &str, const Common::CodePage page);
UnicodeBiDiText(const Common::String &str, const Common::CodePage page, uint *pbase_dir);
UnicodeBiDiText(const Common::String &str, const Common::CodePage page, uint32 *pbase_dir);
~UnicodeBiDiText();
/**