Fix GrUnPreMulColor.

include/gpu/GrColor.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 93 matching lines @@
 
 /** Returns an unpremuled version of the GrColor. */
 static inline GrColor GrUnPreMulColor(GrColor color) {
     unsigned r = GrColorUnpackR(color);
     unsigned g = GrColorUnpackG(color); 
     unsigned b = GrColorUnpackB(color);
     unsigned a = GrColorUnpackA(color);
     SkPMColor colorPM = SkPackARGB32(a, r, g, b);
     SkColor colorUPM = SkUnPreMultiply::PMColorToColor(colorPM);
 
-    r = SkGetPackedR32(colorUPM);
-    g = SkGetPackedG32(colorUPM);
-    b = SkGetPackedB32(colorUPM);
-    a = SkGetPackedA32(colorUPM);
+    r = SkColorGetR(colorUPM);

[bsalomon, 2014/12/08 20:19:32]

GrColorUnpackR, etc?

[bsalomon, 2014/12/08 20:21:18]

Oh i get it, lgtm

+    g = SkColorGetG(colorUPM);
+    b = SkColorGetB(colorUPM);
+    a = SkColorGetA(colorUPM);
 
     return GrColorPackRGBA(r, g, b, a);
 }
 
 /**
  * Flags used for bitfields of color components. They are defined so that the bit order reflects the
  * GrColor shift order.
  */
 enum GrColorComponentFlags {
     kR_GrColorComponentFlag = 1 << (GrColor_SHIFT_R / 8),
@@ skipping 54 matching lines @@
     GR_STATIC_ASSERT(7  == kETC1_GrPixelConfig);
     GR_STATIC_ASSERT(8  == kLATC_GrPixelConfig);
     GR_STATIC_ASSERT(9  == kR11_EAC_GrPixelConfig);
     GR_STATIC_ASSERT(10 == kASTC_12x12_GrPixelConfig);
     GR_STATIC_ASSERT(11 == kRGBA_float_GrPixelConfig);
     GR_STATIC_ASSERT(12 == kAlpha_half_GrPixelConfig);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kFlags) == kGrPixelConfigCnt);
 }
 
 #endif