From b6bb5cb7c2573a9829a0d3aa7b16a55830a7e816 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 21 Nov 2011 19:32:29 +0000 Subject: reorder bits and remove obsolete kForceAA experimental bit git-svn-id: http://skia.googlecode.com/svn/trunk@2725 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkScalerContext.h | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'include/core/SkScalerContext.h') diff --git a/include/core/SkScalerContext.h b/include/core/SkScalerContext.h index c9fb83b2c4..04dd847ff1 100644 --- a/include/core/SkScalerContext.h +++ b/include/core/SkScalerContext.h @@ -157,28 +157,23 @@ struct SkGlyph { class SkScalerContext { public: enum Flags { - kFrameAndFill_Flag = 0x01, - kDevKernText_Flag = 0x02, - kGammaForBlack_Flag = 0x04, // illegal to set both Gamma flags - kGammaForWhite_Flag = 0x08, // illegal to set both Gamma flags - + kFrameAndFill_Flag = 0x0001, + kDevKernText_Flag = 0x0002, + kEmbeddedBitmapText_Flag = 0x0004, + kEmbolden_Flag = 0x0008, + kSubpixelPositioning_Flag = 0x0010, + kAutohinting_Flag = 0x0020, + kVertical_Flag = 0x0040, // together, these two flags resulting in a two bit value which matches // up with the SkPaint::Hinting enum. - kHintingBit1_Flag = 0x10, - kHintingBit2_Flag = 0x20, - - kEmbeddedBitmapText_Flag = 0x40, - kEmbolden_Flag = 0x80, - kSubpixelPositioning_Flag = 0x100, - kAutohinting_Flag = 0x200, - kVertical_Flag = 0x400, - + kHintingBit1_Flag = 0x0080, + kHintingBit2_Flag = 0x0100, // these should only ever be set if fMaskFormat is LCD16 or LCD32 - kLCD_Vertical_Flag = 0x0800, // else Horizontal - kLCD_BGROrder_Flag = 0x1000, // else RGB order - - // experimental - kForceAA_Flag = 0x2000 + kLCD_Vertical_Flag = 0x0200, // else Horizontal + kLCD_BGROrder_Flag = 0x0400, // else RGB order + // gamma flags + kGammaForBlack_Flag = 0x0800, + kGammaForWhite_Flag = 0x1000, }; private: enum { -- cgit v1.2.3