commit d46dce3de5449a3bc1eb40be3f049408125442ef
author Mike Klein <mtklein@google.com> Thu Aug 16 10:17:03 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 16 19:13:41 2018 +0000
tree c1af2f495b4398e6de70a1e2cb7de7b7f986cd31
parent d221adbfc46723752bcf6e383cb26368a1450e57

don't adapt any gray colors to 565

Adapting gray to 565 will add a noticeable purple/green tint.
I'd rather only the 565 images in Gold were tainted with that.

Change-Id: Ib09e92b2f78c6de086345124e9eefeb31bbb5fa8
Reviewed-on: https://skia-review.googlesource.com/147422
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

gm/convexpolyclip.cpp

diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp
index 2de071f..3cc64dc 100644
--- a/gm/convexpolyclip.cpp
+++ b/gm/convexpolyclip.cpp
@@ -25,7 +25,7 @@
 
     SkScalar    radius = 3 * SkMaxScalar(wScalar, hScalar);
 
-    SkColor     colors[] = { sk_tool_utils::color_to_565(SK_ColorDKGRAY),
+    SkColor     colors[] = { SK_ColorDKGRAY,
                              sk_tool_utils::color_to_565(0xFF222255),
                              sk_tool_utils::color_to_565(0xFF331133),
                              sk_tool_utils::color_to_565(0xFF884422),
@@ -60,7 +60,7 @@
     sk_tool_utils::set_portable_typeface(&paint);
     paint.setTextSize(wScalar / 2.2f);
     paint.setShader(nullptr);
-    paint.setColor(sk_tool_utils::color_to_565(SK_ColorLTGRAY));
+    paint.setColor(SK_ColorLTGRAY);
     constexpr char kTxt[] = "Skia";
     SkPoint texPos = { wScalar / 17, hScalar / 2 + paint.getTextSize() / 2.5f };
     canvas.drawText(kTxt, SK_ARRAY_COUNT(kTxt)-1, texPos.fX, texPos.fY, paint);
@@ -152,7 +152,7 @@
         txtPaint.setTextSize(23.f);
         txtPaint.setAntiAlias(true);
         sk_tool_utils::set_portable_typeface(&txtPaint);
-        txtPaint.setColor(sk_tool_utils::color_to_565(SK_ColorDKGRAY));
+        txtPaint.setColor(SK_ColorDKGRAY);
         SkScalar textW = txtPaint.measureText(kTxt, SK_ARRAY_COUNT(kTxt)-1);
 
         SkScalar startX = 0;