diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2023-01-10 11:43:14 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-01-11 11:16:21 -0800 |
commit | 03b72188f45e72d313f8af2e16cb7067b6084f99 (patch) | |
tree | d77818b3e3ec12b6b7dba285041bab2649d00435 /src/gui/painting/qcolortransform.cpp | |
parent | 299f2a7a3f2d17b21e818143c1c1dfecf63bdf8d (diff) |
QtGui: fix build with GCC 13's support for FP16
Conversion must be explicit from float, but doesn't need to be from int.
qimage.cpp:1915:33: error: converting to ‘qfloat16::NativeType’ {aka ‘_Float16’} from ‘float’ with greater conversion rank [-Werror]
Pick-to: 6.5
Change-Id: Ide4dbd0777a44ed0870efffd17390a0e86f1fd7e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/gui/painting/qcolortransform.cpp')
-rw-r--r-- | src/gui/painting/qcolortransform.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qcolortransform.cpp b/src/gui/painting/qcolortransform.cpp index 698696877b..579d99d09c 100644 --- a/src/gui/painting/qcolortransform.cpp +++ b/src/gui/painting/qcolortransform.cpp @@ -237,9 +237,9 @@ QRgbaFloat16 QColorTransform::map(QRgbaFloat16 rgbafp16) const c.y = d->colorSpaceIn->trc[1].applyExtended(rgbafp16.g); c.z = d->colorSpaceIn->trc[2].applyExtended(rgbafp16.b); c = d->colorMatrix.map(c); - rgbafp16.r = d->colorSpaceOut->trc[0].applyInverseExtended(c.x); - rgbafp16.g = d->colorSpaceOut->trc[1].applyInverseExtended(c.y); - rgbafp16.b = d->colorSpaceOut->trc[2].applyInverseExtended(c.z); + rgbafp16.r = qfloat16(d->colorSpaceOut->trc[0].applyInverseExtended(c.x)); + rgbafp16.g = qfloat16(d->colorSpaceOut->trc[1].applyInverseExtended(c.y)); + rgbafp16.b = qfloat16(d->colorSpaceOut->trc[2].applyInverseExtended(c.z)); return rgbafp16; } |