Merge lp://qastaging/~phablet-team/gallery-app/avoid-thumbnailers-from-viewer into lp://qastaging/gallery-app
Proposed by
Ugo Riboni
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Arthur Mello | ||||
Approved revision: | 1132 | ||||
Merged at revision: | 1130 | ||||
Proposed branch: | lp://qastaging/~phablet-team/gallery-app/avoid-thumbnailers-from-viewer | ||||
Merge into: | lp://qastaging/gallery-app | ||||
Diff against target: |
114 lines (+20/-23) 5 files modified
rc/qml/MediaViewer/MediaViewer.qml (+0/-5) rc/qml/MediaViewer/SingleMediaViewer.qml (+1/-17) src/medialoader/photo-metadata.cpp (+11/-0) src/medialoader/photo-metadata.h (+5/-0) src/photo/photo-edit-thread.cpp (+3/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~phablet-team/gallery-app/avoid-thumbnailers-from-viewer | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Arthur Mello (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
Directly downscale the images for the viewer instead of asking the thumbnailer to do it (which it would do incorrectly)
Description of the change
Directly downscale the images for the viewer instead of asking the thumbnailer to do it (which it would do incorrectly)
To post a comment you must log in.
FAILED: Continuous integration, rev:1130 jenkins. qa.ubuntu. com/job/ gallery- app-ci/ 1092/ jenkins. qa.ubuntu. com/job/ gallery- app-vivid- amd64-ci/ 20 jenkins. qa.ubuntu. com/job/ gallery- app-vivid- armhf-ci/ 20 jenkins. qa.ubuntu. com/job/ gallery- app-vivid- armhf-ci/ 20/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ gallery- app-vivid- i386-ci/ 20 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/80 jenkins. qa.ubuntu. com/job/ generic- mediumtests- vivid/412/ console jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/720 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 165 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 17222 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-amd64/ 461/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/gallery- app-ci/ 1092/rebuild
http://