Kaydet (Commit) 227ca233 authored tarafından Caolán McNamara's avatar Caolán McNamara

move copy of icu's ScriptRun into vcl namespace

Change-Id: Idbd3f3e903d6e411d565d29884e52862c3e1cc58
üst fef9bf4e
...@@ -372,7 +372,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) ...@@ -372,7 +372,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
rLayout.Reserve(nGlyphCapacity); rLayout.Reserve(nGlyphCapacity);
ScriptRun aScriptRun(reinterpret_cast<const UChar *>(rArgs.mpStr), rArgs.mnLength); vcl::ScriptRun aScriptRun(reinterpret_cast<const UChar *>(rArgs.mpStr), rArgs.mnLength);
Point aCurrPos(0, 0); Point aCurrPos(0, 0);
while (true) while (true)
......
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0]) #define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
namespace vcl {
const char ScriptRun::fgClassID=0; const char ScriptRun::fgClassID=0;
UChar32 ScriptRun::pairedChars[] = { UChar32 ScriptRun::pairedChars[] = {
...@@ -230,3 +232,4 @@ UBool ScriptRun::next() ...@@ -230,3 +232,4 @@ UBool ScriptRun::next()
return true; return true;
} }
}
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
#include "unicode/uobject.h" #include "unicode/uobject.h"
#include "unicode/uscript.h" #include "unicode/uscript.h"
namespace vcl {
struct ScriptRecord struct ScriptRecord
{ {
UChar32 startChar; UChar32 startChar;
...@@ -181,4 +183,6 @@ inline void ScriptRun::reset(const UChar chars[], int32_t start, int32_t length) ...@@ -181,4 +183,6 @@ inline void ScriptRun::reset(const UChar chars[], int32_t start, int32_t length)
reset(start, length); reset(start, length);
} }
}
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment