AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename gamma stage gamma_

Browse Source 
In some setups we see StockStage::gamma somehow
shadowing `double gamma(double)` from math.h.

No big deal.  We do the same for plus_ and xor_.

Change-Id: Ib5d45edf33dcfbc1d0eef1806674fa908e752200
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209788
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2019-04-23 08:00:35 -05:00 committed by Skia Commit-Bot
parent 12c4629624
commit 1ce03a613e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/SkColorSpaceXformSteps.cpp
View File

@ -158,7 +158,7 @@ void SkColorSpaceXformSteps::apply(SkRasterPipeline* p, bool src_is_normalized)
srcTF.d == 0 &&
srcTF.e == 0 &&
srcTF.f == 0) {
p->append(SkRasterPipeline::gamma, &srcTF.g);
p->append(SkRasterPipeline::gamma_, &srcTF.g);
} else {
p->append(SkRasterPipeline::parametric, &srcTF);
}
@ -175,7 +175,7 @@ void SkColorSpaceXformSteps::apply(SkRasterPipeline* p, bool src_is_normalized)
dstTFInv.d == 0 &&
dstTFInv.e == 0 &&
dstTFInv.f == 0) {
p->append(SkRasterPipeline::gamma, &dstTFInv.g);
p->append(SkRasterPipeline::gamma_, &dstTFInv.g);
} else {
p->append(SkRasterPipeline::parametric, &dstTFInv);
}

2
src/core/SkRasterPipeline.h
View File

@ -65,7 +65,7 @@
M(matrix_translate) M(matrix_scale_translate) \
M(matrix_2x3) M(matrix_3x3) M(matrix_3x4) M(matrix_4x5) M(matrix_4x3) \
M(matrix_perspective) \
M(parametric) M(gamma) \
M(parametric) M(gamma_) \
M(mirror_x) M(repeat_x) \
M(mirror_y) M(repeat_y) \
M(decal_x) M(decal_y) M(decal_x_and_y) \

4
src/opts/SkRasterPipeline_opts.h
View File

@ -1562,7 +1562,7 @@ STAGE(parametric, const skcms_TransferFunction* ctx) {
b = fn(b);
}
STAGE(gamma, const float* G) {
STAGE(gamma_, const float* G) {
auto fn = [&](F v) {
U32 sign;
v = strip_sign(v, &sign);
@ -3413,7 +3413,7 @@ STAGE_GP(bilerp_clamp_8888, const SkRasterPipeline_GatherCtx* ctx) {
NOT_IMPLEMENTED(matrix_4x5) // TODO
NOT_IMPLEMENTED(matrix_4x3) // TODO
NOT_IMPLEMENTED(parametric)
NOT_IMPLEMENTED(gamma)
NOT_IMPLEMENTED(gamma_)
NOT_IMPLEMENTED(rgb_to_hsl)
NOT_IMPLEMENTED(hsl_to_rgb)
NOT_IMPLEMENTED(gauss_a_to_rgba) // TODO