aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2016-11-29 10:14:03 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-29 21:48:09 +0000
commit922e5be6e2494e46656ab3614c5395c6ff035a73 (patch)
tree598620ec0379b84f460c0c49b0074eb555958e9e
parent7a14734d2cf20e99a24949e9513d823fdfa03b8d (diff)
Fixes for SkColorLookUpTable::interp3D
(1) Fix subtle comparison bug so we interpolate the proper tetrahedral. (2) Add new comments - the clamp is necessary. (3) SkCSXformPrintf requires an extra friend class to compile. BUG:668784 Change-Id: Id1a5c561f23ccfe25e141b8490cddee4c2482326 Reviewed-on: https://skia-review.googlesource.com/5238 Reviewed-by: Robert Aftias <raftias@google.com> Commit-Queue: Matt Sarett <msarett@google.com>
-rw-r--r--infra/bots/assets/skimage/VERSION2
-rw-r--r--infra/bots/tasks.json256
-rw-r--r--src/core/SkColorLookUpTable.cpp9
-rw-r--r--src/core/SkColorLookUpTable.h2
4 files changed, 138 insertions, 131 deletions
diff --git a/infra/bots/assets/skimage/VERSION b/infra/bots/assets/skimage/VERSION
index ca7bf83ac5..da2d3988d7 100644
--- a/infra/bots/assets/skimage/VERSION
+++ b/infra/bots/assets/skimage/VERSION
@@ -1 +1 @@
-13 \ No newline at end of file
+14 \ No newline at end of file
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 17f4114663..2b8d46289f 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -2958,7 +2958,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3007,7 +3007,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3056,7 +3056,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3105,7 +3105,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3154,7 +3154,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3203,7 +3203,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3252,7 +3252,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3301,7 +3301,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3350,7 +3350,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3399,7 +3399,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3448,7 +3448,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3497,7 +3497,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3546,7 +3546,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3595,7 +3595,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3644,7 +3644,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3693,7 +3693,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3742,7 +3742,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3791,7 +3791,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3840,7 +3840,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3889,7 +3889,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3938,7 +3938,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -3987,7 +3987,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4036,7 +4036,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4085,7 +4085,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4134,7 +4134,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4183,7 +4183,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4232,7 +4232,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4281,7 +4281,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4330,7 +4330,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4379,7 +4379,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4428,7 +4428,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4477,7 +4477,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4526,7 +4526,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4575,7 +4575,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4624,7 +4624,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4673,7 +4673,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4800,7 +4800,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4848,7 +4848,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4896,7 +4896,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4945,7 +4945,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -4994,7 +4994,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5042,7 +5042,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5090,7 +5090,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5138,7 +5138,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5192,7 +5192,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5241,7 +5241,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5295,7 +5295,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5344,7 +5344,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5397,7 +5397,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5446,7 +5446,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5495,7 +5495,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5544,7 +5544,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5593,7 +5593,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5641,7 +5641,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5689,7 +5689,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5737,7 +5737,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5786,7 +5786,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5835,7 +5835,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5884,7 +5884,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5933,7 +5933,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -5981,7 +5981,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6029,7 +6029,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6078,7 +6078,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6127,7 +6127,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6176,7 +6176,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6225,7 +6225,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6274,7 +6274,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6323,7 +6323,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6372,7 +6372,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6421,7 +6421,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6470,7 +6470,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6519,7 +6519,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6568,7 +6568,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6617,7 +6617,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6666,7 +6666,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6715,7 +6715,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6764,7 +6764,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6813,7 +6813,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6862,7 +6862,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6911,7 +6911,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -6960,7 +6960,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7009,7 +7009,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7058,7 +7058,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7107,7 +7107,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7156,7 +7156,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7205,7 +7205,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7254,7 +7254,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7303,7 +7303,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7352,7 +7352,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7401,7 +7401,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7450,7 +7450,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7499,7 +7499,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7548,7 +7548,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7597,7 +7597,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7646,7 +7646,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7695,7 +7695,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7744,7 +7744,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7793,7 +7793,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7841,7 +7841,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7889,7 +7889,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7938,7 +7938,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -7987,7 +7987,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8035,7 +8035,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8083,7 +8083,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8131,7 +8131,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8185,7 +8185,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8234,7 +8234,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8288,7 +8288,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8337,7 +8337,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8391,7 +8391,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8444,7 +8444,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8497,7 +8497,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8546,7 +8546,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8595,7 +8595,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8644,7 +8644,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8693,7 +8693,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8742,7 +8742,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8791,7 +8791,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8839,7 +8839,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8887,7 +8887,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8935,7 +8935,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -8984,7 +8984,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -9033,7 +9033,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -9082,7 +9082,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -9131,7 +9131,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -9180,7 +9180,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -9229,7 +9229,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
@@ -9277,7 +9277,7 @@
{
"name": "skia/bots/skimage",
"path": "skimage",
- "version": "version:13"
+ "version": "version:14"
},
{
"name": "skia/bots/skp",
diff --git a/src/core/SkColorLookUpTable.cpp b/src/core/SkColorLookUpTable.cpp
index 76e0bca369..eb832b3214 100644
--- a/src/core/SkColorLookUpTable.cpp
+++ b/src/core/SkColorLookUpTable.cpp
@@ -63,7 +63,7 @@ void SkColorLookUpTable::interp3D(float dst[3], float src[3]) const {
// tetrahedral or trilinear.
for (int i = 0; i < 3; i++) {
if (diffZ < diffY) {
- if (diffZ < diffX) {
+ if (diffZ > diffX) {
dst[i] = (ptr[n000] + diffZ * (ptr[n110] - ptr[n010]) +
diffY * (ptr[n010] - ptr[n000]) +
diffX * (ptr[n111] - ptr[n110]));
@@ -92,7 +92,12 @@ void SkColorLookUpTable::interp3D(float dst[3], float src[3]) const {
}
}
- // TODO(raftias): Figure out why this is going out of range (up to 1.0359!)
+ // |src| is guaranteed to be in the 0-1 range as are all entries
+ // in the table. For "increasing" tables, outputs will also be
+ // in the 0-1 range. While this property is logical for color
+ // look up tables, we don't check for it.
+ // And for arbitrary, non-increasing tables, it is easy to see how
+ // the output might not be 0-1. So we clamp here.
if (dst[i] > 1.f) {
dst[i] = 1.f;
} else if (dst[i] < 0.f) {
diff --git a/src/core/SkColorLookUpTable.h b/src/core/SkColorLookUpTable.h
index b9eb81acc1..020a953700 100644
--- a/src/core/SkColorLookUpTable.h
+++ b/src/core/SkColorLookUpTable.h
@@ -29,6 +29,8 @@ private:
uint8_t fGridPoints[3];
+ friend class SkColorSpaceXform_A2B;
+
public:
// Objects of this type are created in a custom fashion using sk_malloc_throw
// and therefore must be sk_freed.