summaryrefslogtreecommitdiffstats
path: root/sample
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-24 18:35:14 -0800
committerAndreas Gampe <agampe@google.com>2014-12-03 14:20:11 -0800
commitcb20a2f0b366bfc16db3a489a60156dec7a9fe21 (patch)
tree1dbaf08de908d3c911eaec996ea5fe6938beeec7 /sample
parent13f1aae02bacd475722bc8ea3fc2cf6abc1a82e3 (diff)
downloadandroid_frameworks_minikin-cb20a2f0b366bfc16db3a489a60156dec7a9fe21.tar.gz
android_frameworks_minikin-cb20a2f0b366bfc16db3a489a60156dec7a9fe21.tar.bz2
android_frameworks_minikin-cb20a2f0b366bfc16db3a489a60156dec7a9fe21.zip
Minikin: Remove unused variables, fix init order
For build-system CFLAGS clean-up, fix unused variables. Reorder initializer list to initialize in the order of member declarations. Change-Id: I64358b2dcf0e39d0f4e18fdc3473de867f84fcba
Diffstat (limited to 'sample')
-rw-r--r--sample/example_skia.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/sample/example_skia.cpp b/sample/example_skia.cpp
index 51fcf47..f892b8c 100644
--- a/sample/example_skia.cpp
+++ b/sample/example_skia.cpp
@@ -55,8 +55,6 @@ FontCollection *makeFontCollection() {
};
FontFamily *family = new FontFamily();
- FT_Face face;
- FT_Error error;
for (size_t i = 0; i < sizeof(fns)/sizeof(fns[0]); i++) {
const char *fn = fns[i];
SkTypeface *skFace = SkTypeface::CreateFromFile(fn);
@@ -118,7 +116,6 @@ 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; font-weight: 700;";
int bidiFlags = 0;
FontStyle fontStyle(7);
MinikinPaint minikinPaint;