diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-03-12 10:03:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-12 10:03:41 -0700 |
| commit | 2a049989f422cb1f59e9e05f413d13745f34a3d1 (patch) | |
| tree | 594df3f3fc6c1d90a76691a75763ae1beacfdf98 /include/core/SkPaint.h | |
| parent | 0a6004fdb6c99bccb8bc0bb9686616870dae73f3 (diff) | |
| parent | 358eae7150db67e5f10071ebb229c5c5b02e6a07 (diff) | |
| download | external_skia-2a049989f422cb1f59e9e05f413d13745f34a3d1.zip external_skia-2a049989f422cb1f59e9e05f413d13745f34a3d1.tar.gz external_skia-2a049989f422cb1f59e9e05f413d13745f34a3d1.tar.bz2 | |
am 358eae71: Merge "Skia Merge (revision 3312)"
* commit '358eae7150db67e5f10071ebb229c5c5b02e6a07':
Skia Merge (revision 3312)
Diffstat (limited to 'include/core/SkPaint.h')
| -rw-r--r-- | include/core/SkPaint.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 445f7eb..31bc30b 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -100,11 +100,12 @@ public: kEmbeddedBitmapText_Flag = 0x400, //!< mask to enable embedded bitmap strikes kAutoHinting_Flag = 0x800, //!< mask to force Freetype's autohinter kVerticalText_Flag = 0x1000, + kGenA8FromLCD_Flag = 0x2000, // hack for GDI -- do not use if you can help it // when adding extra flags, note that the fFlags member is specified // with a bit-width and you'll have to expand it. - kAllFlags = 0x1FFF + kAllFlags = 0x3FFF }; /** Return the paint's flags. Use the Flag enum to test flag values. @@ -880,7 +881,7 @@ private: SkColor fColor; SkScalar fWidth; SkScalar fMiterLimit; - unsigned fFlags : 14; + unsigned fFlags : 15; unsigned fTextAlign : 2; unsigned fCapType : 2; unsigned fJoinType : 2; |