diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-09 14:21:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-09 14:21:35 +0100 |
| commit | 227ca23324fabd77abae1b7eb6186ba11d519fae (patch) | |
| tree | 6a83670dc824e45125035d8d457cca9a4a2e8870 /vcl/generic | |
| parent | fef9bf4e39b041c7f13e4d1584e3086068e781fc (diff) | |
move copy of icu's ScriptRun into vcl namespace
Change-Id: Idbd3f3e903d6e411d565d29884e52862c3e1cc58
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/scrptrun.cxx | 3 | ||||
| -rw-r--r-- | vcl/generic/glyphs/scrptrun.h | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 3f065bb0ee1d..abd04baf41cf 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -372,7 +372,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) 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); while (true) diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx index f72d296f060d..965fbf1a3142 100644 --- a/vcl/generic/glyphs/scrptrun.cxx +++ b/vcl/generic/glyphs/scrptrun.cxx @@ -41,6 +41,8 @@ #define ARRAY_SIZE(array) (sizeof array / sizeof array[0]) +namespace vcl { + const char ScriptRun::fgClassID=0; UChar32 ScriptRun::pairedChars[] = { @@ -230,3 +232,4 @@ UBool ScriptRun::next() return true; } +} diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h index 6e9bbd66cb81..56ea88cc6525 100644 --- a/vcl/generic/glyphs/scrptrun.h +++ b/vcl/generic/glyphs/scrptrun.h @@ -44,6 +44,8 @@ #include "unicode/uobject.h" #include "unicode/uscript.h" +namespace vcl { + struct ScriptRecord { UChar32 startChar; @@ -181,4 +183,6 @@ inline void ScriptRun::reset(const UChar chars[], int32_t start, int32_t length) reset(start, length); } +} + #endif |