diff options
| author |  skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> | 2018-04-26 20:01:32 +0000 |
|---|---|---|
| committer |  Mike Klein <mtklein@chromium.org> | 2018-04-26 20:29:34 +0000 |
| commit | c4afb06293422f6cb69b8f555d8295394353da8e (patch) | |
| tree | 83dce10be81c046e87d85f703db8047f05d65311 | |
| parent | a7ae1fc04000ab68d2df8c594a864a623fc48df4 (diff) | |
Roll skia/third_party/skcms ba9fcb3..c3b186a (1 commits)
https://skia.googlesource.com/skcms.git/+log/ba9fcb3..c3b186a
2018-04-26 mtklein@google.com add poly_tf to skcms_sRGB_profile
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.
TBR=stani@google.com
Change-Id: I456a54f4c810dc7c77978c4a68bcec6a875ff802
Reviewed-on: https://skia-review.googlesource.com/124064
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
| -rw-r--r-- | third_party/skcms/src/ICCProfile.c | 7 | ||||
| -rw-r--r-- | third_party/skcms/src/PolyTF.c | 4 | ||||
| -rwxr-xr-x | third_party/skcms/version.sha1 | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/third_party/skcms/src/ICCProfile.c b/third_party/skcms/src/ICCProfile.c index 8448327257..90ce6fcaf2 100644 --- a/third_party/skcms/src/ICCProfile.c +++ b/third_party/skcms/src/ICCProfile.c @@ -806,6 +806,13 @@ const skcms_ICCProfile skcms_sRGB_profile = { { 0.222488403f, 0.716873169f, 0.060607910f }, { 0.013916016f, 0.097076416f, 0.714096069f }, }}, + + .has_poly_tf = { true, true, true }, + .poly_tf = { + {0.293833881617f, 0.704207003117f, (float)(1/12.92), 0.04045f}, + {0.293833881617f, 0.704207003117f, (float)(1/12.92), 0.04045f}, + {0.293833881617f, 0.704207003117f, (float)(1/12.92), 0.04045f}, + }, }; const skcms_ICCProfile skcms_XYZD50_profile = { diff --git a/third_party/skcms/src/PolyTF.c b/third_party/skcms/src/PolyTF.c index f4d837b9b6..f7f9a3fb3d 100644 --- a/third_party/skcms/src/PolyTF.c +++ b/third_party/skcms/src/PolyTF.c @@ -150,6 +150,8 @@ static bool fit_poly_tf(const skcms_Curve* curve, skcms_PolyTF* tf) { void skcms_OptimizeForSpeed(skcms_ICCProfile* profile) { for (int i = 0; profile->has_trc && i < 3; i++) { - profile->has_poly_tf[i] = fit_poly_tf(&profile->trc[i], &profile->poly_tf[i]); + if (!profile->has_poly_tf[i]) { + profile->has_poly_tf[i] = fit_poly_tf(&profile->trc[i], &profile->poly_tf[i]); + } } } diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index a5c84c6ec2..6cdb91df73 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -ba9fcb3c092fd4d5d064b60663cb6526ebc9c84f
\ No newline at end of file +c3b186a912acceb3dec3f49b01cfa02977cbde88
\ No newline at end of file |