diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-24 18:35:14 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-12-03 14:20:11 -0800 |
commit | cb20a2f0b366bfc16db3a489a60156dec7a9fe21 (patch) | |
tree | 1dbaf08de908d3c911eaec996ea5fe6938beeec7 /libs/minikin/Layout.cpp | |
parent | 13f1aae02bacd475722bc8ea3fc2cf6abc1a82e3 (diff) | |
download | android_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 'libs/minikin/Layout.cpp')
-rw-r--r-- | libs/minikin/Layout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp index fa77701..db0667b 100644 --- a/libs/minikin/Layout.cpp +++ b/libs/minikin/Layout.cpp @@ -77,11 +77,11 @@ class LayoutCacheKey { public: LayoutCacheKey(const FontCollection* collection, const MinikinPaint& paint, FontStyle style, const uint16_t* chars, size_t start, size_t count, size_t nchars, bool dir) - : mStart(start), mCount(count), mId(collection->getId()), mStyle(style), + : mChars(chars), mNchars(nchars), + mStart(start), mCount(count), mId(collection->getId()), mStyle(style), mSize(paint.size), mScaleX(paint.scaleX), mSkewX(paint.skewX), mLetterSpacing(paint.letterSpacing), - mPaintFlags(paint.paintFlags), mIsRtl(dir), - mChars(chars), mNchars(nchars) { + mPaintFlags(paint.paintFlags), mIsRtl(dir) { } bool operator==(const LayoutCacheKey &other) const; hash_t hash() const; |