diff options
| author | Raph Levien <raph@google.com> | 2014-06-05 20:04:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 20:04:26 +0000 |
| commit | 80556a83ad69fe8fb3505b399e772382f2f8d5e1 (patch) | |
| tree | cb7a75911a006bbe4b8c914f60f9133587e9cb35 | |
| parent | d963b2d5e642df200dd79af864e7acedc0b11307 (diff) | |
| parent | 893399732b64203133c22ad3c1f3535e46bf35a7 (diff) | |
| download | android_frameworks_minikin-80556a83ad69fe8fb3505b399e772382f2f8d5e1.tar.gz android_frameworks_minikin-80556a83ad69fe8fb3505b399e772382f2f8d5e1.tar.bz2 android_frameworks_minikin-80556a83ad69fe8fb3505b399e772382f2f8d5e1.zip | |
am 89339973: Fix unmatching type
* commit '893399732b64203133c22ad3c1f3535e46bf35a7':
Fix unmatching type
| -rw-r--r-- | libs/minikin/Layout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp index c13aed8..5471b38 100644 --- a/libs/minikin/Layout.cpp +++ b/libs/minikin/Layout.cpp @@ -81,7 +81,7 @@ private: float mSize; float mScaleX; float mSkewX; - int mPaintFlags; + int32_t mPaintFlags; bool mIsRtl; // Note: any fields added to MinikinPaint must also be reflected here. // TODO: language matching (possibly integrate into style) |