Merge lp:~fboucault/qt-halide/fix-live-updates into lp:qt-halide

Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 273
Merged at revision: 316
Proposed branch: lp:~fboucault/qt-halide/fix-live-updates
Merge into: lp:qt-halide
Diff against target: 32 lines (+15/-0)
1 file modified
tests/unit/tst_transform.qml (+15/-0)
To merge this branch: bzr merge lp:~fboucault/qt-halide/fix-live-updates
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+278311@code.launchpad.net

Commit message

Fix HalideTransform::setLive not triggering a render if needed when going back to live

To post a comment you must log in.
273. By Florian Boucault

Merged from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unit/tst_transform.qml'
2--- tests/unit/tst_transform.qml 2015-06-09 16:34:24 +0000
3+++ tests/unit/tst_transform.qml 2015-11-23 13:21:00 +0000
4@@ -45,6 +45,13 @@
5 property int channel: 0
6 }
7
8+ HalideFunction {
9+ id: green
10+ name: "channel"
11+ property HalideImage input
12+ property int channel: 1
13+ }
14+
15 HalideImage {
16 id: input
17 source: "in.png"
18@@ -143,6 +150,14 @@
19
20 transform.live = false;
21 compareAllPixelsWithColor(255, 128, 128, 255, "output changed after going off live");
22+
23+ spy.clear();
24+ transform.functions = [green];
25+ compare(spy.count, 0, "Updates should not be fired when changing functions while not live");
26+
27+ transform.live = true;
28+ spy.waitForUpdate()
29+ compareAllPixelsWithColor(128, 255, 128, 255, "new function list not rendered when going live");
30 }
31
32 // verify changing input will correctly be done

Subscribers

People subscribed via source and target branches

to all changes: