aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/skcms/src/Transform_inl.h
diff options
context:
space:
mode:
authorGravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>2018-07-02 19:40:45 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-02 20:13:22 +0000
commit2f046f1f526715f2c2179e825529770fae5ff078 (patch)
tree4146936884cc55322479ef04fe919944e20d523d /third_party/skcms/src/Transform_inl.h
parent5155d38fdcd4d4e94181bf01ef4831e442a4380b (diff)
Roll skia/third_party/skcms 99b01c076f47..0977edc92270 (1 commits)
https://skia.googlesource.com/skcms.git/+log/99b01c076f47..0977edc92270 2018-07-02 mtklein@chromium.org tidy up skcms_internal.h The AutoRoll server is located here: https://skcms-skia-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel TBR=ethannicholas@google.com Change-Id: I18cd1addc22aab4d1e6db2498153992b382e0635 Reviewed-on: https://skia-review.googlesource.com/138953 Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Diffstat (limited to 'third_party/skcms/src/Transform_inl.h')
-rw-r--r--third_party/skcms/src/Transform_inl.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/third_party/skcms/src/Transform_inl.h b/third_party/skcms/src/Transform_inl.h
index 34dcbbfff6..a8f3c8a0bd 100644
--- a/third_party/skcms/src/Transform_inl.h
+++ b/third_party/skcms/src/Transform_inl.h
@@ -5,11 +5,9 @@
* found in the LICENSE file.
*/
-// Intentionally NO #pragma once
+// Intentionally NO #pragma once... included multiple times.
-#include "../skcms_internal.h"
-
-// This file is included from src/Transform.c, with some values and types pre-defined:
+// This file is included from skcms.c with some values and types pre-defined:
// N: depth of all vectors, 1,4,8, or 16
//
// F: a vector of N float
@@ -573,7 +571,7 @@ static void NS(exec_ops)(const Op* ops, const void** args,
const char* src, char* dst, int i) {
F r = F0, g = F0, b = F0, a = F0;
while (true) {
- switch (profile_next_op(*ops++)) {
+ switch (*ops++) {
case Op_noop: break;
case Op_load_a8:{