diff options
| author |  Brian Osman <brianosman@google.com> | 2018-04-10 16:05:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-11 11:20:01 +0000 |
| commit | 07b3bebcf21001e66b14ca8dd730287857258c68 (patch) | |
| tree | 3accfe3af50c3fdb9f7580e45ab41b6a315f3a6c | |
| parent | 323fbcf6d18f1a82b76cc3e471015dc9717e7fb5 (diff) | |
skcms→e753c6d disable -Wdouble-promotion
Change-Id: I8cfebed0a6617a625dd91e31af4b581aaeae86fe
Reviewed-on: https://skia-review.googlesource.com/120122
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
| -rw-r--r-- | third_party/skcms/src/LinearAlgebra.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/third_party/skcms/src/LinearAlgebra.c b/third_party/skcms/src/LinearAlgebra.c index 4fe539c5d3..9ef7079fdc 100644 --- a/third_party/skcms/src/LinearAlgebra.c +++ b/third_party/skcms/src/LinearAlgebra.c @@ -11,22 +11,22 @@ #include <float.h> bool skcms_Matrix4x4_invert(const skcms_Matrix4x4* src, skcms_Matrix4x4* dst) { - double a00 = (double)src->vals[0][0], - a01 = (double)src->vals[1][0], - a02 = (double)src->vals[2][0], - a03 = (double)src->vals[3][0], - a10 = (double)src->vals[0][1], - a11 = (double)src->vals[1][1], - a12 = (double)src->vals[2][1], - a13 = (double)src->vals[3][1], - a20 = (double)src->vals[0][2], - a21 = (double)src->vals[1][2], - a22 = (double)src->vals[2][2], - a23 = (double)src->vals[3][2], - a30 = (double)src->vals[0][3], - a31 = (double)src->vals[1][3], - a32 = (double)src->vals[2][3], - a33 = (double)src->vals[3][3]; + double a00 = src->vals[0][0], + a01 = src->vals[1][0], + a02 = src->vals[2][0], + a03 = src->vals[3][0], + a10 = src->vals[0][1], + a11 = src->vals[1][1], + a12 = src->vals[2][1], + a13 = src->vals[3][1], + a20 = src->vals[0][2], + a21 = src->vals[1][2], + a22 = src->vals[2][2], + a23 = src->vals[3][2], + a30 = src->vals[0][3], + a31 = src->vals[1][3], + a32 = src->vals[2][3], + a33 = src->vals[3][3]; double b00 = a00*a11 - a01*a10, b01 = a00*a12 - a02*a10, @@ -53,7 +53,7 @@ bool skcms_Matrix4x4_invert(const skcms_Matrix4x4* src, skcms_Matrix4x4* dst) { } double invdet = 1.0 / determinant; - if (invdet > +(double)FLT_MAX || invdet < -(double)FLT_MAX || !isfinitef_((float)invdet)) { + if (invdet > +FLT_MAX || invdet < -FLT_MAX || !isfinitef_((float)invdet)) { return false; } @@ -97,15 +97,15 @@ bool skcms_Matrix4x4_invert(const skcms_Matrix4x4* src, skcms_Matrix4x4* dst) { } bool skcms_Matrix3x3_invert(const skcms_Matrix3x3* src, skcms_Matrix3x3* dst) { - double a00 = (double)src->vals[0][0], - a01 = (double)src->vals[1][0], - a02 = (double)src->vals[2][0], - a10 = (double)src->vals[0][1], - a11 = (double)src->vals[1][1], - a12 = (double)src->vals[2][1], - a20 = (double)src->vals[0][2], - a21 = (double)src->vals[1][2], - a22 = (double)src->vals[2][2]; + double a00 = src->vals[0][0], + a01 = src->vals[1][0], + a02 = src->vals[2][0], + a10 = src->vals[0][1], + a11 = src->vals[1][1], + a12 = src->vals[2][1], + a20 = src->vals[0][2], + a21 = src->vals[1][2], + a22 = src->vals[2][2]; double b0 = a00*a11 - a01*a10, b1 = a00*a12 - a02*a10, |