diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:00:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:00:10 +0200 |
| commit | c891e3383f723a4cfd3a686927f089c0d62b47d4 (patch) | |
| tree | 62580719e366071bd6080f3bece1cfc02be0083f | |
| parent | 551b1fe346c5704e5ca22d8d4e8b34478f38e2fa (diff) | |
| parent | 3c4c7ac6069a57b17199627742d8e2b32a3a31c9 (diff) | |
| download | qtgraphicaleffects-c891e3383f723a4cfd3a686927f089c0d62b47d4.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I3cbef8f35d67f99d41ceb35b6ee67094dd8a8b4f
| -rw-r--r-- | src/effects/BrightnessContrast.qml | 3 | ||||
| -rw-r--r-- | src/effects/ColorOverlay.qml | 3 | ||||
| -rw-r--r-- | src/effects/Colorize.qml | 3 | ||||
| -rw-r--r-- | src/effects/Desaturate.qml | 3 | ||||
| -rw-r--r-- | src/effects/GammaAdjust.qml | 3 | ||||
| -rw-r--r-- | src/effects/HueSaturation.qml | 3 | ||||
| -rw-r--r-- | src/effects/LevelAdjust.qml | 3 |
7 files changed, 7 insertions, 14 deletions
diff --git a/src/effects/BrightnessContrast.qml b/src/effects/BrightnessContrast.qml index a95872c..85b38bb 100644 --- a/src/effects/BrightnessContrast.qml +++ b/src/effects/BrightnessContrast.qml @@ -167,8 +167,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/ColorOverlay.qml b/src/effects/ColorOverlay.qml index b2cdaa0..f348541 100644 --- a/src/effects/ColorOverlay.qml +++ b/src/effects/ColorOverlay.qml @@ -123,8 +123,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/Colorize.qml b/src/effects/Colorize.qml index 501111f..42f1796 100644 --- a/src/effects/Colorize.qml +++ b/src/effects/Colorize.qml @@ -210,8 +210,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/Desaturate.qml b/src/effects/Desaturate.qml index 3347e2f..e56de55 100644 --- a/src/effects/Desaturate.qml +++ b/src/effects/Desaturate.qml @@ -122,8 +122,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/GammaAdjust.qml b/src/effects/GammaAdjust.qml index e4e39e5..2c3edbb 100644 --- a/src/effects/GammaAdjust.qml +++ b/src/effects/GammaAdjust.qml @@ -159,8 +159,7 @@ luminance = pow(original_luminance, 1.0 / gamma); // The luminance is assumed to SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/HueSaturation.qml b/src/effects/HueSaturation.qml index 526f474..eb13dcb 100644 --- a/src/effects/HueSaturation.qml +++ b/src/effects/HueSaturation.qml @@ -199,8 +199,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { diff --git a/src/effects/LevelAdjust.qml b/src/effects/LevelAdjust.qml index 004c798..b98faca 100644 --- a/src/effects/LevelAdjust.qml +++ b/src/effects/LevelAdjust.qml @@ -408,8 +408,7 @@ Item { SourceProxy { id: sourceProxy input: rootItem.source - interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth) - ? SourceProxy.NearestInterpolation : SourceProxy.LinearInterpolation + interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation } ShaderEffectSource { |