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

[Florian Boucault]

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

[Arthur Mello (artmello)]

lgtm and the problem seems to be fixed on device

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== 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 @@
         delegate: SingleMediaViewer {
             id: media
             objectName: "openedMedia" + index
-            mediaFileURL: model.mediaSource.path
-            mediaFileType: model.mediaSource.type
+            mediaSource: model.mediaSource
             maxDimension: Math.max(galleryPhotoViewer.width, galleryPhotoViewer.height)
 
             width: galleryPhotoViewer.width

=== 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 @@
 Item {
     id: viewer
     property bool pinchInProgress: zoomPinchArea.active
-    property var mediaFileType
-    property string mediaFileURL
+    property var mediaSource
     property real maxDimension
     property bool showThumbnail: true
 
-    property bool isVideo: mediaFileType === MediaSource.Video
+    property bool isVideo: mediaSource.type === MediaSource.Video
     property bool isPlayingVideo: isVideo && video.isPlaying
     property bool userInteracting: pinchInProgress || flickable.sizeScale != 1.0
     property bool fullyZoomed: flickable.sizeScale == zoomPinchArea.maximumZoom
@@ -152,7 +151,7 @@
                     anchors.fill: parent
                     asynchronous: true
                     cache: false
-                    source: viewer.isVideo ? ("image://thumbnailer/" + mediaFileURL) : mediaFileURL
+                    source: mediaSource.galleryPreviewPath
                     sourceSize {
                         width: viewer.maxDimension
                         height: viewer.maxDimension
@@ -169,7 +168,8 @@
                     anchors.fill: parent
                     asynchronous: true
                     cache: false
-                    source: flickable.sizeScale > 1.0 ? mediaFileURL : ""
+                    // Load image using the GalleryStandardImageProvider to ensure EXIF orientation
+                    source: flickable.sizeScale > 1.0 ? mediaSource.galleryPath : ""
                     sourceSize {
                         width: width
                         height: height
@@ -184,7 +184,7 @@
                 visible: viewer.isVideo && video.status == Loader.Ready &&
                          video.item.playbackState !== MediaPlayer.StoppedState
                 onLoaded: {
-                    item.source = mediaFileURL;
+                    item.source = mediaSource.path;
                     item.play()
                 }