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)
@@ skipping 28 matching lines @@
             kUnknown_Layout   = 0x0,
             kKnown_Layout     = 0x8,
 
             kRGB_Layout       = 0x8,  //!< this is the default
             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