clean up low-hanging swap_rb

There are two remaining swap_rb uses that both look non-trivial to
replace:
   - sampling out of index8 when the color table is bgra
   - table transforms on bgra inputs in SkColorSpaceXform

I don't think it's a big deal to just leave swap_rb around,
just a little sad.

Change-Id: I3d30200cf867cbf37d6f86572b1574d3e22e3490
Reviewed-on: https://skia-review.googlesource.com/21040
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/images/SkImageEncoderFns.h b/src/images/SkImageEncoderFns.h
index 6012a45697..4e73e4ff75 100644
--- a/src/images/SkImageEncoderFns.h
+++ b/src/images/SkImageEncoderFns.h
@@ -154,9 +154,10 @@ static inline void transform_scanline_bgrA(char* SK_RESTRICT dst, const char* SK
 template <bool kIsRGBA>
 static inline void transform_scanline_unpremultiply_sRGB(void* dst, const void* src, int width) {
     SkRasterPipeline_<256> p;
-    p.append(SkRasterPipeline::load_8888, &src);
-    if (!kIsRGBA) {
-        p.append(SkRasterPipeline::swap_rb);
+    if (kIsRGBA) {
+        p.append(SkRasterPipeline::load_8888, &src);
+    } else {
+        p.append(SkRasterPipeline::load_bgra, &src);
     }
 
     p.append_from_srgb(kPremul_SkAlphaType);