[Scummvm-git-logs] scummvm master -> 2de08c0717684c01a168011785d79e4a2e547a9a

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2de08c0717 COMMON: Fix FriBidiParType failure on 3ds


Commit: 2de08c0717684c01a168011785d79e4a2e547a9a
    https://github.com/scummvm/scummvm/commit/2de08c0717684c01a168011785d79e4a2e547a9a
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-14T22:18:15+01:00

Commit Message:
COMMON: Fix FriBidiParType failure on 3ds

/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*}

Changed paths:
    common/unicode-bidi.cpp
    common/unicode-bidi.h


diff --git a/common/unicode-bidi.cpp b/common/unicode-bidi.cpp
index b03b03d72a..86a8d2ab8a 100644
--- a/common/unicode-bidi.cpp
+++ b/common/unicode-bidi.cpp
@@ -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) {
diff --git a/common/unicode-bidi.h b/common/unicode-bidi.h
index a24fad16ca..2b50d56f3f 100644
--- a/common/unicode-bidi.h
+++ b/common/unicode-bidi.h
@@ -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();
 
 	/**