diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-11 16:17:55 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-13 09:16:38 +0100 |
| commit | b2631c72c0628e68c0fae7567fd12e6646455efc (patch) | |
| tree | 4b01c4d8a4a96819cfe39fe246f54ea11f0bf7ce /src/gui | |
| parent | 0ce443691fac1188103e5eaa66be40278d5d5e97 (diff) | |
Extend colorspace testing and fix bug it uncovered
When changing transferfunction the look-up-tables needs to be
regenerated.
Pick-to: 6.1 6.0 5.15
Change-Id: I83ca5fe570f85d478a374f52c0a82db84e70c3b8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qcolorspace.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qcolortrc_p.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp index e6f3db8f45..e1f8d0b63b 100644 --- a/src/gui/painting/qcolorspace.cpp +++ b/src/gui/painting/qcolorspace.cpp @@ -403,6 +403,7 @@ void QColorSpacePrivate::setTransferFunctionTables(const QList<uint16_t> &redTra trc[2].m_type = QColorTrc::Type::Table; trc[2].m_table = blueTable; } + lut.generated.storeRelease(0); } void QColorSpacePrivate::setTransferFunction() @@ -438,6 +439,7 @@ void QColorSpacePrivate::setTransferFunction() } trc[1] = trc[0]; trc[2] = trc[0]; + lut.generated.storeRelease(0); } QColorTransform QColorSpacePrivate::transformationToColorSpace(const QColorSpacePrivate *out) const diff --git a/src/gui/painting/qcolortrc_p.h b/src/gui/painting/qcolortrc_p.h index 3ef9d442fc..058be3c7ce 100644 --- a/src/gui/painting/qcolortrc_p.h +++ b/src/gui/painting/qcolortrc_p.h @@ -114,7 +114,7 @@ public: if (x >= 0.0f && x <= 1.0f) return applyInverse(x); if (m_type == Type::Function) - return std::copysign(applyInverse(x), x); + return std::copysign(applyInverse(std::abs(x)), x); if (m_type == Type::Table) return x < 0.0f ? 0.0f : 1.0f; return x; |