diff options
author | Behdad Esfahbod <behdad@google.com> | 2014-07-29 16:57:00 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@google.com> | 2014-07-29 16:57:00 -0400 |
commit | 9802b0dc8e648117ab917e716e81e8a0da909cb3 (patch) | |
tree | 853c0456b2adf17c945d4835c4296a452aa2b7f2 | |
parent | d50c99df4efbc57eb4419bd7944a979b9a1d53cc (diff) | |
download | android_frameworks_minikin-9802b0dc8e648117ab917e716e81e8a0da909cb3.tar.gz android_frameworks_minikin-9802b0dc8e648117ab917e716e81e8a0da909cb3.tar.bz2 android_frameworks_minikin-9802b0dc8e648117ab917e716e81e8a0da909cb3.zip |
Fix examples build
Was broken after recent CSS removal.
Change-Id: I160fbc73286b21336d6f3943ff92d7d150dff74b
-rw-r--r-- | sample/example.cpp | 7 | ||||
-rw-r--r-- | sample/example_skia.cpp | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sample/example.cpp b/sample/example.cpp index 1247291..487357a 100644 --- a/sample/example.cpp +++ b/sample/example.cpp @@ -84,9 +84,12 @@ int runMinikinTest() { Layout layout; layout.setFontCollection(collection); const char *text = "fine world \xe0\xa4\xa8\xe0\xa4\xae\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\xa4\xe0\xa5\x87"; - const char *style = "font-size: 32;"; + int bidiFlags = 0; + FontStyle fontStyle; + MinikinPaint paint; + paint.size = 32; icu::UnicodeString icuText = icu::UnicodeString::fromUTF8(text); - layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), style); + layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), bidiFlags, fontStyle, paint); layout.dump(); Bitmap bitmap(250, 50); layout.draw(&bitmap, 10, 40, 32); diff --git a/sample/example_skia.cpp b/sample/example_skia.cpp index 4eb0a56..51fcf47 100644 --- a/sample/example_skia.cpp +++ b/sample/example_skia.cpp @@ -119,8 +119,12 @@ int runMinikinTest() { layout.setFontCollection(collection); const char *text = "fine world \xe0\xa4\xa8\xe0\xa4\xae\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\xa4\xe0\xa5\x87"; const char *style = "font-size: 32; font-weight: 700;"; + int bidiFlags = 0; + FontStyle fontStyle(7); + MinikinPaint minikinPaint; + minikinPaint.size = 32; icu::UnicodeString icuText = icu::UnicodeString::fromUTF8(text); - layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), style); + layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), bidiFlags, fontStyle, minikinPaint); layout.dump(); SkAutoGraphics ag; |