OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0027232: Configuration - fix mblen missing building issue on Android

Browse Source 
Assume UTF-8 as the only locale supported on Android.
This commit is contained in:
kgv 2016-03-05 15:46:42 +03:00
parent d3013f55a0
commit ab2335aeae
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NCollection/NCollection_UtfString.cxx
View File

@ -19,6 +19,7 @@
#include <NCollection_UtfString.hxx> #include <NCollection_UtfString.hxx>
#if !defined(__ANDROID__)
//======================================================================= //=======================================================================
//function : ~NCollection_UtfStringTool //function : ~NCollection_UtfStringTool
//purpose : //purpose :
@ -87,3 +88,4 @@ bool NCollection_UtfStringTool::ToLocale (const wchar_t* theWideString,
} }
return true; return true;
} }
#endif

19
src/NCollection/NCollection_UtfString.lxx
View File

@ -272,6 +272,7 @@ void NCollection_UtfString<Type>::FromUnicode (const TypeFrom* theStringU
strFree (anOldBuffer); strFree (anOldBuffer);
} }
#if !defined(__ANDROID__)
//! Auxiliary convertion tool. //! Auxiliary convertion tool.
class NCollection_UtfStringTool class NCollection_UtfStringTool
{ {
@ -293,6 +294,7 @@ public:
private: private:
wchar_t* myWideBuffer; //!< temporary variable wchar_t* myWideBuffer; //!< temporary variable
}; };
#endif
// ======================================================================= // =======================================================================
// function : FromLocale // function : FromLocale
@ -302,6 +304,10 @@ template<typename Type> inline
void NCollection_UtfString<Type>::FromLocale (const char* theString, void NCollection_UtfString<Type>::FromLocale (const char* theString,
const Standard_Integer theLength) const Standard_Integer theLength)
{ {
#if defined(__ANDROID__)
// no locales on Android
FromUnicode (theString, theLength);
#else
NCollection_UtfStringTool aConvertor; NCollection_UtfStringTool aConvertor;
wchar_t* aWideBuffer = aConvertor.FromLocale (theString); wchar_t* aWideBuffer = aConvertor.FromLocale (theString);
if (aWideBuffer == NULL) if (aWideBuffer == NULL)
@ -310,6 +316,7 @@ void NCollection_UtfString<Type>::FromLocale (const char* theString,
return; return;
} }
FromUnicode (aWideBuffer, theLength); FromUnicode (aWideBuffer, theLength);
#endif
} }
// ======================================================================= // =======================================================================
@ -320,8 +327,20 @@ template<typename Type> inline
bool NCollection_UtfString<Type>::ToLocale (char* theBuffer, bool NCollection_UtfString<Type>::ToLocale (char* theBuffer,
const Standard_Integer theSizeBytes) const const Standard_Integer theSizeBytes) const
{ {
#if defined(__ANDROID__)
// no locales on Android
NCollection_UtfString<Standard_Utf8Char> anUtf8Copy (myString, myLength);
const Standard_Integer aSize = anUtf8Copy.Size() + 1;
if (theSizeBytes < aSize)
{
return false;
}
std::memcpy (theBuffer, anUtf8Copy.ToCString(), (Standard_Size )aSize);
return true;
#else
NCollection_UtfString<wchar_t> aWideCopy (myString, myLength); NCollection_UtfString<wchar_t> aWideCopy (myString, myLength);
return NCollection_UtfStringTool::ToLocale (aWideCopy.ToCString(), theBuffer, theSizeBytes); return NCollection_UtfStringTool::ToLocale (aWideCopy.ToCString(), theBuffer, theSizeBytes);
#endif
} }
// ======================================================================= // =======================================================================