From 93bb080503eec5df5674a1bcfe4baaceced799ff Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 8 Mar 2016 10:09:18 -0800 Subject: make pm4f be RGBA always, not pmcolor order BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1774523002 Review URL: https://codereview.chromium.org/1774523002 --- src/core/SkSpanProcs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/SkSpanProcs.cpp') diff --git a/src/core/SkSpanProcs.cpp b/src/core/SkSpanProcs.cpp index efbce9704a..385bd6b70f 100644 --- a/src/core/SkSpanProcs.cpp +++ b/src/core/SkSpanProcs.cpp @@ -22,7 +22,7 @@ static void load_l32(const SkPixmap& src, int x, int y, SkPM4f span[], int count SkASSERT(src.addr32(x + count - 1, y)); for (int i = 0; i < count; ++i) { - (SkNx_cast(Sk4b::Load(&addr[i])) * Sk4f(1.0f/255)).store(span[i].fVec); + (to_4f_rgba(addr[i]) * Sk4f(1.0f/255)).store(span[i].fVec); } } @@ -32,7 +32,7 @@ static void load_s32(const SkPixmap& src, int x, int y, SkPM4f span[], int count SkASSERT(src.addr32(x + count - 1, y)); for (int i = 0; i < count; ++i) { - srgb_to_linear(SkNx_cast(Sk4b::Load(&addr[i])) * Sk4f(1.0f/255)).store(span[i].fVec); + srgb_to_linear(to_4f_rgba(addr[i]) * Sk4f(1.0f/255)).store(span[i].fVec); } } -- cgit v1.2.3