Fix 32/64 bit warnings on g++-4.2.

include/core/SkColorPriv.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkColorPriv_DEFINED
@@ skipping 285 matching lines @@
     const uint32_t mask = 0xFF00FF00;
     return (ag & mask) | ((rb & mask) >> 8);
 }
 
 /**
  * 0xAAxxGGxxRRxxBBxx -> 0xAARRGGBB
  * (note, AGRB -> ARGB)
  */
 static inline SkPMColor SkUnsplay(uint64_t agrb) {
     const uint32_t mask = 0xFF00FF00;
-    return ((agrb & mask) >> 8) |  // 0x00RR00BB
-           ((agrb >> 32) & mask);  // 0xAARRGGBB
+    return SkPMColor(
+        ((agrb & mask) >> 8) |   // 0x00RR00BB
+        ((agrb >> 32) & mask));  // 0xAARRGGBB
 }
 
 static inline SkPMColor SkFastFourByteInterp256_32(SkPMColor src, SkPMColor dst, unsigned scale) {
     SkASSERT(scale <= 256);
 
     // Two 8-bit blends per two 32-bit registers, with space to make sure the math doesn't collide.
     uint32_t src_ag, src_rb, dst_ag, dst_rb;
     SkSplay(src, &src_ag, &src_rb);
     SkSplay(dst, &dst_ag, &dst_rb);
 
@@ skipping 588 matching lines @@
     int srcG = SkColorGetG(src);
     int srcB = SkColorGetB(src);
 
     for (int i = 0; i < width; i++) {
         dst[i] = SkBlendLCD16Opaque(srcR, srcG, srcB, dst[i], mask[i],
                                     opaqueDst);
     }
 }
 
 #endif