commit 8f7a9a9bfb51a00082bde7eb6b04515b935a588f
author Matt Sarett <msarett@google.com> Wed Mar 29 17:12:26 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 29 21:52:22 2017 +0000
tree 84d3e5a3a230560dcb217c9bf3137c751b20e335
parent d7e06aec7e7837ca1dd54680ad37b431e40e4eef

565 color xforms: make sure we clamp if necessary

Bug: skia:
Change-Id: I48528a0ff8dd199e0cd1649f973b5722384eacf3
Reviewed-on: https://skia-review.googlesource.com/10581
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

src/core/SkColorSpaceXform.cpp

diff --git a/src/core/SkColorSpaceXform.cpp b/src/core/SkColorSpaceXform.cpp
index 522a06d..82b442b 100644
--- a/src/core/SkColorSpaceXform.cpp
+++ b/src/core/SkColorSpaceXform.cpp
@@ -1227,7 +1227,10 @@
     if (kNone_ColorSpaceMatch == kCSM) {
         pipeline.append(SkRasterPipeline::matrix_3x4, fSrcToDst);
 
-        if (kRGBA_8888_ColorFormat == dstColorFormat || kBGRA_8888_ColorFormat == dstColorFormat) {
+        if (kRGBA_8888_ColorFormat == dstColorFormat ||
+            kBGRA_8888_ColorFormat == dstColorFormat ||
+            kBGR_565_ColorFormat == dstColorFormat)
+        {
             bool need_clamp_0, need_clamp_1;
             analyze_3x4_matrix(fSrcToDst, &need_clamp_0, &need_clamp_1);