gallery-app

Merge lp:~fboucault/gallery-app/respect_exif_orientation into lp:gallery-app

  1. respect_exif_orientation
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Bill Filler
Approved revision: 1098
Merged at revision: 1098
Proposed branch: lp:~fboucault/gallery-app/respect_exif_orientation
Merge into: lp:gallery-app
Diff against target: 59 lines (+7/-8)
2 files modified
rc/qml/MediaViewer/MediaViewer.qml (+1/-2)
rc/qml/MediaViewer/SingleMediaViewer.qml (+6/-6)
To merge this branch: bzr merge lp:~fboucault/gallery-app/respect_exif_orientation
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Arthur Mello (community) Approve
Review via email: mp+237805@code.launchpad.net

Commit message

Respect EXIF orientation when showing a photo by starting to use the GalleryStandardImageProvider again.

To post a comment you must log in.
Revision history for this message
Arthur Mello (artmello) wrote :

lgtm and the problem seems to be fixed on device

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1098
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1058/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/233
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/475/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4018
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/618/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/780
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4345
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4345/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1058/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

tested, works

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml 2014-09-26 20:06:51 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml 2014-10-09 16:19:30 +0000
@@ -166,8 +166,7 @@
166 delegate: SingleMediaViewer {166 delegate: SingleMediaViewer {
167 id: media167 id: media
168 objectName: "openedMedia" + index168 objectName: "openedMedia" + index
169 mediaFileURL: model.mediaSource.path169 mediaSource: model.mediaSource
170 mediaFileType: model.mediaSource.type
171 maxDimension: Math.max(galleryPhotoViewer.width, galleryPhotoViewer.height)170 maxDimension: Math.max(galleryPhotoViewer.width, galleryPhotoViewer.height)
172171
173 width: galleryPhotoViewer.width172 width: galleryPhotoViewer.width
174173
=== modified file 'rc/qml/MediaViewer/SingleMediaViewer.qml'
--- rc/qml/MediaViewer/SingleMediaViewer.qml 2014-10-08 02:34:11 +0000
+++ rc/qml/MediaViewer/SingleMediaViewer.qml 2014-10-09 16:19:30 +0000
@@ -27,12 +27,11 @@
27Item {27Item {
28 id: viewer28 id: viewer
29 property bool pinchInProgress: zoomPinchArea.active29 property bool pinchInProgress: zoomPinchArea.active
30 property var mediaFileType30 property var mediaSource
31 property string mediaFileURL
32 property real maxDimension31 property real maxDimension
33 property bool showThumbnail: true32 property bool showThumbnail: true
3433
35 property bool isVideo: mediaFileType === MediaSource.Video34 property bool isVideo: mediaSource.type === MediaSource.Video
36 property bool isPlayingVideo: isVideo && video.isPlaying35 property bool isPlayingVideo: isVideo && video.isPlaying
37 property bool userInteracting: pinchInProgress || flickable.sizeScale != 1.036 property bool userInteracting: pinchInProgress || flickable.sizeScale != 1.0
38 property bool fullyZoomed: flickable.sizeScale == zoomPinchArea.maximumZoom37 property bool fullyZoomed: flickable.sizeScale == zoomPinchArea.maximumZoom
@@ -152,7 +151,7 @@
152 anchors.fill: parent151 anchors.fill: parent
153 asynchronous: true152 asynchronous: true
154 cache: false153 cache: false
155 source: viewer.isVideo ? ("image://thumbnailer/" + mediaFileURL) : mediaFileURL154 source: mediaSource.galleryPreviewPath
156 sourceSize {155 sourceSize {
157 width: viewer.maxDimension156 width: viewer.maxDimension
158 height: viewer.maxDimension157 height: viewer.maxDimension
@@ -169,7 +168,8 @@
169 anchors.fill: parent168 anchors.fill: parent
170 asynchronous: true169 asynchronous: true
171 cache: false170 cache: false
172 source: flickable.sizeScale > 1.0 ? mediaFileURL : ""171 // Load image using the GalleryStandardImageProvider to ensure EXIF orientation
172 source: flickable.sizeScale > 1.0 ? mediaSource.galleryPath : ""
173 sourceSize {173 sourceSize {
174 width: width174 width: width
175 height: height175 height: height
@@ -184,7 +184,7 @@
184 visible: viewer.isVideo && video.status == Loader.Ready &&184 visible: viewer.isVideo && video.status == Loader.Ready &&
185 video.item.playbackState !== MediaPlayer.StoppedState185 video.item.playbackState !== MediaPlayer.StoppedState
186 onLoaded: {186 onLoaded: {
187 item.source = mediaFileURL;187 item.source = mediaSource.path;
188 item.play()188 item.play()
189 }189 }
190190

Subscribers

People subscribed via source and target branches