diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-03-06 09:06:43 -0500 |
|---|---|---|
| committer | Derek Sollenberger <derek@android.com> | 2012-03-06 09:44:47 -0500 |
| commit | 4f1dae40e24d57d647db01443b8bf2410514b8b5 (patch) | |
| tree | 594df3f3fc6c1d90a76691a75763ae1beacfdf98 /include/core/SkPaint.h | |
| parent | 1cab2921ab279367f8206cdadc9259d12e603548 (diff) | |
| download | external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.zip external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.tar.gz external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.tar.bz2 | |
Skia Merge (revision 3312)
This CL also includes changes made to Android's copy of
Skia in their J release branch.
Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc
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; |