Mask orientation and layout correctly.

include/core/SkDeviceProperties.h

 #ifndef SkDeviceProperties_DEFINED
 #define SkDeviceProperties_DEFINED
 
 #ifndef SK_GAMMA_EXPONENT
     #define SK_GAMMA_EXPONENT (2.2f)
 #endif
 
 #ifdef SK_GAMMA_SRGB
     #undef SK_GAMMA_EXPONENT
     #define SK_GAMMA_EXPONENT (0.0f)
 #endif
 
 //TODO: get everyone to stop using SkFontLCDConfig::SetSubpixel* and remove this import.
 #include "SkFontLCDConfig.h"
 
 struct SkDeviceProperties {
     struct Geometry {
         /** The orientation of the pixel specifies the interpretation of the
         *  layout. If the orientation is horizontal, the layout is interpreted as
         *  left to right. It the orientation is vertical, the layout is
         *  interpreted top to bottom (rotated 90deg cw from horizontal).
         */
         enum Orientation {
             kUnknown_Orientation      = 0x0,
             kKnown_Orientation        = 0x2,
 
             kHorizontal_Orientation   = 0x2,  //!< this is the default

[clefru, 2013/05/07 14:07:57]

How is this "default", when we don't default to it in the case of an unknown
layout?

[bungeman-skia, 2013/05/07 14:24:31]

When you 'MakeDefault' this is the value you get. If you 'Make' one with
'kUnknown' there is nothing to default, the user stated that the geometry is
unknown (or at least not one of the others). Otherwise we wouldn't call this
'kUnknown' we'd call it 'kDefault'. But it makes no sense to have such a value,
so it isn't provided.

             kVertical_Orientation     = 0x3,
 
             kOrientationMask          = 0x3,
         };
 
         /** The layout of the pixel specifies its subpixel geometry.
         *
         *  kUnknown_Layout means that the subpixel elements are not spatially
         *  separated in any known or usable fashion.
         */
         enum Layout {
             kUnknown_Layout   = 0x0,
             kKnown_Layout     = 0x8,
 
             kRGB_Layout       = 0x8,  //!< this is the default

[clefru, 2013/05/07 14:07:57]

Same

             kBGR_Layout       = 0xC,
 
             kLayoutMask       = 0xC,
         };
 
         Orientation getOrientation() {
-            return static_cast<Orientation>(fGeometry | kOrientationMask);
+            return static_cast<Orientation>(fGeometry & kOrientationMask);
         }
         Layout getLayout() {
-            return static_cast<Layout>(fGeometry | kLayoutMask);
+            return static_cast<Layout>(fGeometry & kLayoutMask);
         }
 
         bool isOrientationKnown() {
             return SkToBool(fGeometry & kKnown_Orientation);
         }
         bool isLayoutKnown() {
             return SkToBool(fGeometry & kKnown_Layout);
         }
 
     private:
@@ skipping 40 matching lines @@
 
     /** Each pixel of an image will have some number of channels.
      *  Can the layout of those channels be exploited? */
     Geometry fGeometry;
 
     /** Represents the color space of the image. This is a woefully inadequate beginning. */
     SkScalar fGamma;
 };
 
 #endif