Roll skia/third_party/skcms 2914b63d6886..68d3f3a95f1b (1 commits)
https://skia.googlesource.com/skcms.git/+log/2914b63d6886..68d3f3a95f1b git log 2914b63d6886..68d3f3a95f1b --date=short --no-merges --format='%ad %ae %s' 2019-11-20 brianosman@google.com Add more diagnostic output to ICC profile dumps Created with: gclient setdep -r skia/third_party/skcms@68d3f3a95f1b If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skcms-skia-autoroll Please CC robertphillips@google.com,mtklein@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux-blink-rel Bug: None Change-Id: Id6161785af72c9b37680a1f264cecbb9ff4ef2ac TBR=robertphillips@google.com,mtklein@google.com TBR=robertphillips@google.com,mtklein@google.com Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255475 Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
This commit is contained in:
parent
f7cb902904
commit
d95243b55f
8
third_party/skcms/skcms.cc
vendored
8
third_party/skcms/skcms.cc
vendored
@ -230,7 +230,7 @@ static float eval_curve(const skcms_Curve* curve, float x) {
|
||||
return l + (h-l)*t;
|
||||
}
|
||||
|
||||
static float max_roundtrip_error(const skcms_Curve* curve, const skcms_TransferFunction* inv_tf) {
|
||||
float skcms_MaxRoundtripError(const skcms_Curve* curve, const skcms_TransferFunction* inv_tf) {
|
||||
uint32_t N = curve->table_entries > 256 ? curve->table_entries : 256;
|
||||
const float dx = 1.0f / (N - 1);
|
||||
float err = 0;
|
||||
@ -243,7 +243,7 @@ static float max_roundtrip_error(const skcms_Curve* curve, const skcms_TransferF
|
||||
}
|
||||
|
||||
bool skcms_AreApproximateInverses(const skcms_Curve* curve, const skcms_TransferFunction* inv_tf) {
|
||||
return max_roundtrip_error(curve, inv_tf) < (1/512.0f);
|
||||
return skcms_MaxRoundtripError(curve, inv_tf) < (1/512.0f);
|
||||
}
|
||||
|
||||
// Additional ICC signature values that are only used internally
|
||||
@ -1897,7 +1897,7 @@ bool skcms_ApproximateCurve(const skcms_Curve* curve,
|
||||
continue;
|
||||
}
|
||||
|
||||
float err = max_roundtrip_error(curve, &tf_inv);
|
||||
float err = skcms_MaxRoundtripError(curve, &tf_inv);
|
||||
if (*max_error > err) {
|
||||
*max_error = err;
|
||||
*approx = tf;
|
||||
@ -2559,7 +2559,7 @@ bool skcms_MakeUsableAsDestinationWithSingleCurve(skcms_ICCProfile* profile) {
|
||||
|
||||
float err = 0;
|
||||
for (int j = 0; j < 3; ++j) {
|
||||
err = fmaxf_(err, max_roundtrip_error(&profile->trc[j], &inv));
|
||||
err = fmaxf_(err, skcms_MaxRoundtripError(&profile->trc[j], &inv));
|
||||
}
|
||||
if (min_max_error > err) {
|
||||
min_max_error = err;
|
||||
|
2
third_party/skcms/skcms_internal.h
vendored
2
third_party/skcms/skcms_internal.h
vendored
@ -31,6 +31,8 @@ extern "C" {
|
||||
void skcms_GetTagByIndex (const skcms_ICCProfile*, uint32_t idx, skcms_ICCTag*);
|
||||
bool skcms_GetTagBySignature(const skcms_ICCProfile*, uint32_t sig, skcms_ICCTag*);
|
||||
|
||||
float skcms_MaxRoundtripError(const skcms_Curve* curve, const skcms_TransferFunction* inv_tf);
|
||||
|
||||
// 252 of a random shuffle of all possible bytes.
|
||||
// 252 is evenly divisible by 3 and 4. Only 192, 10, 241, and 43 are missing.
|
||||
// Used for ICC profile equivalence testing.
|
||||
|
2
third_party/skcms/version.sha1
vendored
2
third_party/skcms/version.sha1
vendored
@ -1 +1 @@
|
||||
2914b63d68860258b93ec7f6217890561e636f09
|
||||
68d3f3a95f1b8cee1b927a0883d3d33f40d4f8db
|
Loading…
Reference in New Issue
Block a user