From 4b8e9a348ca379b203c26ff14dd236267dd60646 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 25 Feb 2016 11:37:09 +0100 Subject: Fix crash when a ShaderEffectSource is missing a sourceItem Task-number: QTBUG-51375 Change-Id: I98029d5a617c730a18897bebae27cf14c1d7b876 Reviewed-by: Thomas Senyk Reviewed-by: Mitch Curtis --- src/effects/private/qgfxsourceproxy.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/effects/private/qgfxsourceproxy.cpp b/src/effects/private/qgfxsourceproxy.cpp index bd55ff0..a94d574 100644 --- a/src/effects/private/qgfxsourceproxy.cpp +++ b/src/effects/private/qgfxsourceproxy.cpp @@ -102,6 +102,8 @@ void QGfxSourceProxy::useProxy() QObject *QGfxSourceProxy::findLayer(QQuickItem *item) { + if (!item) + return 0; QQuickItemPrivate *d = QQuickItemPrivate::get(item); if (d->extra.isAllocated() && d->extra->layer) { QObject *layer = qvariant_cast(item->property("layer")); -- cgit v1.2.3 From e064eff45a5f0e10905c72ad375a948e768c0f80 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 29 Feb 2016 16:40:17 +0100 Subject: Purge sRGB chunks from PNGs in documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: Ie8d9a72fde6bf65a63b8786fe2bb1a7c5da1c4b7 Reviewed-by: Topi Reiniö --- src/effects/doc/images/Blend_bug_and_butterfly.png | Bin 128741 -> 125749 bytes .../images/BrightnessContrast_contrast_graph.png | Bin 13581 -> 10294 bytes src/effects/doc/images/Colorize_hue_scale.png | Bin 2855 -> 2507 bytes src/effects/doc/images/Desaturate_bug.png | Bin 116557 -> 109437 bytes src/effects/doc/images/DropShadow_butterfly.png | Bin 31781 -> 28892 bytes .../doc/images/GammaAdjust_gamma1_graph.png | Bin 16118 -> 12313 bytes .../doc/images/GammaAdjust_gamma2_graph.png | Bin 13755 -> 10524 bytes .../doc/images/GammaAdjust_gamma3_graph.png | Bin 15932 -> 12152 bytes src/effects/doc/images/GaussianBlur_bug.png | Bin 86476 -> 85996 bytes .../doc/images/GaussianBlur_deviation_graph.png | Bin 12802 -> 9282 bytes src/effects/doc/images/Glow_butterfly.png | Bin 30949 -> 30815 bytes src/effects/doc/images/HueSaturation_bug.png | Bin 134914 -> 131055 bytes .../doc/images/LevelAdjust_default_curve.png | Bin 11478 -> 8702 bytes .../doc/images/LevelAdjust_gamma1_curve.png | Bin 11478 -> 8702 bytes .../doc/images/LevelAdjust_gamma2_curve.png | Bin 21388 -> 16343 bytes .../doc/images/LevelAdjust_gamma3_curve.png | Bin 19752 -> 15837 bytes .../doc/images/LevelAdjust_maximumInput2_curve.png | Bin 15189 -> 11589 bytes .../doc/images/LevelAdjust_maximumInput3_curve.png | Bin 14310 -> 11224 bytes .../images/LevelAdjust_maximumOutput2_curve.png | Bin 15427 -> 11727 bytes .../images/LevelAdjust_maximumOutput3_curve.png | Bin 14296 -> 11143 bytes .../doc/images/LevelAdjust_minimumInput2_curve.png | Bin 15919 -> 11925 bytes .../doc/images/LevelAdjust_minimumInput3_curve.png | Bin 15655 -> 11862 bytes .../images/LevelAdjust_minimumOutput2_curve.png | Bin 15679 -> 11976 bytes .../images/LevelAdjust_minimumOutput3_curve.png | Bin 15106 -> 11690 bytes src/effects/doc/images/Original_bug.png | Bin 129092 -> 126233 bytes src/effects/doc/images/Original_butterfly.png | Bin 26308 -> 26172 bytes .../doc/images/Original_butterfly_black.png | Bin 23410 -> 23291 bytes src/effects/doc/images/RecursiveBlur_bug.png | Bin 62153 -> 55817 bytes src/effects/doc/images/ThresholdMask_bug.png | Bin 122971 -> 122641 bytes src/effects/doc/images/fog.png | Bin 225653 -> 192467 bytes 30 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/effects/doc/images/Blend_bug_and_butterfly.png b/src/effects/doc/images/Blend_bug_and_butterfly.png index 1e3f09f..e7c6f79 100644 Binary files a/src/effects/doc/images/Blend_bug_and_butterfly.png and b/src/effects/doc/images/Blend_bug_and_butterfly.png differ diff --git a/src/effects/doc/images/BrightnessContrast_contrast_graph.png b/src/effects/doc/images/BrightnessContrast_contrast_graph.png index 67b3d7b..ee3b767 100644 Binary files a/src/effects/doc/images/BrightnessContrast_contrast_graph.png and b/src/effects/doc/images/BrightnessContrast_contrast_graph.png differ diff --git a/src/effects/doc/images/Colorize_hue_scale.png b/src/effects/doc/images/Colorize_hue_scale.png index 2eb9bc4..1e8ccd4 100644 Binary files a/src/effects/doc/images/Colorize_hue_scale.png and b/src/effects/doc/images/Colorize_hue_scale.png differ diff --git a/src/effects/doc/images/Desaturate_bug.png b/src/effects/doc/images/Desaturate_bug.png index 1f684df..30c840b 100644 Binary files a/src/effects/doc/images/Desaturate_bug.png and b/src/effects/doc/images/Desaturate_bug.png differ diff --git a/src/effects/doc/images/DropShadow_butterfly.png b/src/effects/doc/images/DropShadow_butterfly.png index 67f18d1..8fa2c09 100644 Binary files a/src/effects/doc/images/DropShadow_butterfly.png and b/src/effects/doc/images/DropShadow_butterfly.png differ diff --git a/src/effects/doc/images/GammaAdjust_gamma1_graph.png b/src/effects/doc/images/GammaAdjust_gamma1_graph.png index bdb854c..12916d4 100644 Binary files a/src/effects/doc/images/GammaAdjust_gamma1_graph.png and b/src/effects/doc/images/GammaAdjust_gamma1_graph.png differ diff --git a/src/effects/doc/images/GammaAdjust_gamma2_graph.png b/src/effects/doc/images/GammaAdjust_gamma2_graph.png index 9b9c859..15064cb 100644 Binary files a/src/effects/doc/images/GammaAdjust_gamma2_graph.png and b/src/effects/doc/images/GammaAdjust_gamma2_graph.png differ diff --git a/src/effects/doc/images/GammaAdjust_gamma3_graph.png b/src/effects/doc/images/GammaAdjust_gamma3_graph.png index 4e16dae..8201612 100644 Binary files a/src/effects/doc/images/GammaAdjust_gamma3_graph.png and b/src/effects/doc/images/GammaAdjust_gamma3_graph.png differ diff --git a/src/effects/doc/images/GaussianBlur_bug.png b/src/effects/doc/images/GaussianBlur_bug.png index 262ef0e..a9db381 100644 Binary files a/src/effects/doc/images/GaussianBlur_bug.png and b/src/effects/doc/images/GaussianBlur_bug.png differ diff --git a/src/effects/doc/images/GaussianBlur_deviation_graph.png b/src/effects/doc/images/GaussianBlur_deviation_graph.png index d4a09a5..2c22008 100644 Binary files a/src/effects/doc/images/GaussianBlur_deviation_graph.png and b/src/effects/doc/images/GaussianBlur_deviation_graph.png differ diff --git a/src/effects/doc/images/Glow_butterfly.png b/src/effects/doc/images/Glow_butterfly.png index f6eb9e3..57c26f8 100644 Binary files a/src/effects/doc/images/Glow_butterfly.png and b/src/effects/doc/images/Glow_butterfly.png differ diff --git a/src/effects/doc/images/HueSaturation_bug.png b/src/effects/doc/images/HueSaturation_bug.png index bbdcdc5..96c150d 100644 Binary files a/src/effects/doc/images/HueSaturation_bug.png and b/src/effects/doc/images/HueSaturation_bug.png differ diff --git a/src/effects/doc/images/LevelAdjust_default_curve.png b/src/effects/doc/images/LevelAdjust_default_curve.png index 4e98cc4..d689e0b 100644 Binary files a/src/effects/doc/images/LevelAdjust_default_curve.png and b/src/effects/doc/images/LevelAdjust_default_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_gamma1_curve.png b/src/effects/doc/images/LevelAdjust_gamma1_curve.png index a8434d9..d689e0b 100644 Binary files a/src/effects/doc/images/LevelAdjust_gamma1_curve.png and b/src/effects/doc/images/LevelAdjust_gamma1_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_gamma2_curve.png b/src/effects/doc/images/LevelAdjust_gamma2_curve.png index 3fd61b5..2533ca3 100644 Binary files a/src/effects/doc/images/LevelAdjust_gamma2_curve.png and b/src/effects/doc/images/LevelAdjust_gamma2_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_gamma3_curve.png b/src/effects/doc/images/LevelAdjust_gamma3_curve.png index 90d3e92..ac3a7ca 100644 Binary files a/src/effects/doc/images/LevelAdjust_gamma3_curve.png and b/src/effects/doc/images/LevelAdjust_gamma3_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_maximumInput2_curve.png b/src/effects/doc/images/LevelAdjust_maximumInput2_curve.png index 669dcd8..8cfcae9 100644 Binary files a/src/effects/doc/images/LevelAdjust_maximumInput2_curve.png and b/src/effects/doc/images/LevelAdjust_maximumInput2_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_maximumInput3_curve.png b/src/effects/doc/images/LevelAdjust_maximumInput3_curve.png index 7cc4316..76ee303 100644 Binary files a/src/effects/doc/images/LevelAdjust_maximumInput3_curve.png and b/src/effects/doc/images/LevelAdjust_maximumInput3_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_maximumOutput2_curve.png b/src/effects/doc/images/LevelAdjust_maximumOutput2_curve.png index 467ff1f..6c98980 100644 Binary files a/src/effects/doc/images/LevelAdjust_maximumOutput2_curve.png and b/src/effects/doc/images/LevelAdjust_maximumOutput2_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_maximumOutput3_curve.png b/src/effects/doc/images/LevelAdjust_maximumOutput3_curve.png index c94123b..3e464ef 100644 Binary files a/src/effects/doc/images/LevelAdjust_maximumOutput3_curve.png and b/src/effects/doc/images/LevelAdjust_maximumOutput3_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_minimumInput2_curve.png b/src/effects/doc/images/LevelAdjust_minimumInput2_curve.png index bea83c2..056f828 100644 Binary files a/src/effects/doc/images/LevelAdjust_minimumInput2_curve.png and b/src/effects/doc/images/LevelAdjust_minimumInput2_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_minimumInput3_curve.png b/src/effects/doc/images/LevelAdjust_minimumInput3_curve.png index 5663a81..ed4c5e5 100644 Binary files a/src/effects/doc/images/LevelAdjust_minimumInput3_curve.png and b/src/effects/doc/images/LevelAdjust_minimumInput3_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_minimumOutput2_curve.png b/src/effects/doc/images/LevelAdjust_minimumOutput2_curve.png index f0e6b09..2b4d3b1 100644 Binary files a/src/effects/doc/images/LevelAdjust_minimumOutput2_curve.png and b/src/effects/doc/images/LevelAdjust_minimumOutput2_curve.png differ diff --git a/src/effects/doc/images/LevelAdjust_minimumOutput3_curve.png b/src/effects/doc/images/LevelAdjust_minimumOutput3_curve.png index 26c9211..7ebc8a9 100644 Binary files a/src/effects/doc/images/LevelAdjust_minimumOutput3_curve.png and b/src/effects/doc/images/LevelAdjust_minimumOutput3_curve.png differ diff --git a/src/effects/doc/images/Original_bug.png b/src/effects/doc/images/Original_bug.png index 9445834..a93bcde 100644 Binary files a/src/effects/doc/images/Original_bug.png and b/src/effects/doc/images/Original_bug.png differ diff --git a/src/effects/doc/images/Original_butterfly.png b/src/effects/doc/images/Original_butterfly.png index ca6a3cf..a81dc7b 100644 Binary files a/src/effects/doc/images/Original_butterfly.png and b/src/effects/doc/images/Original_butterfly.png differ diff --git a/src/effects/doc/images/Original_butterfly_black.png b/src/effects/doc/images/Original_butterfly_black.png index e8247b4..1f9f010 100644 Binary files a/src/effects/doc/images/Original_butterfly_black.png and b/src/effects/doc/images/Original_butterfly_black.png differ diff --git a/src/effects/doc/images/RecursiveBlur_bug.png b/src/effects/doc/images/RecursiveBlur_bug.png index 6caf48e..470eebb 100644 Binary files a/src/effects/doc/images/RecursiveBlur_bug.png and b/src/effects/doc/images/RecursiveBlur_bug.png differ diff --git a/src/effects/doc/images/ThresholdMask_bug.png b/src/effects/doc/images/ThresholdMask_bug.png index 1839e03..d16429a 100644 Binary files a/src/effects/doc/images/ThresholdMask_bug.png and b/src/effects/doc/images/ThresholdMask_bug.png differ diff --git a/src/effects/doc/images/fog.png b/src/effects/doc/images/fog.png index f462222..1a51c01 100644 Binary files a/src/effects/doc/images/fog.png and b/src/effects/doc/images/fog.png differ -- cgit v1.2.3 From 6523d7c4843e1d4176035c46e1514c39bdcfc3bf Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 29 Feb 2016 16:40:17 +0100 Subject: Purge sRGB chunks from PNGs in tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I21879d6d43c610ebee074bd12417d9d5ebc69096 Reviewed-by: Topi Reiniö --- tests/manual/testbed/images/background.png | Bin 149 -> 80 bytes tests/manual/testbed/images/fog.png | Bin 225653 -> 192467 bytes tests/manual/testbed/images/slider_handle_b.png | Bin 1031 -> 867 bytes tests/manual/testbed/images/workarea_right.png | Bin 157 -> 77 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/manual/testbed/images/background.png b/tests/manual/testbed/images/background.png index 458d33d..72cb9f0 100644 Binary files a/tests/manual/testbed/images/background.png and b/tests/manual/testbed/images/background.png differ diff --git a/tests/manual/testbed/images/fog.png b/tests/manual/testbed/images/fog.png index f462222..1a51c01 100644 Binary files a/tests/manual/testbed/images/fog.png and b/tests/manual/testbed/images/fog.png differ diff --git a/tests/manual/testbed/images/slider_handle_b.png b/tests/manual/testbed/images/slider_handle_b.png index c7d2540..4c2dd3c 100644 Binary files a/tests/manual/testbed/images/slider_handle_b.png and b/tests/manual/testbed/images/slider_handle_b.png differ diff --git a/tests/manual/testbed/images/workarea_right.png b/tests/manual/testbed/images/workarea_right.png index 4954781..2d82242 100644 Binary files a/tests/manual/testbed/images/workarea_right.png and b/tests/manual/testbed/images/workarea_right.png differ -- cgit v1.2.3