[tracker/tracker-1.6] tracker-extract-xmp: Fix extraction of orientation values 3 and 4

[Debarshi Ray <debarshir src gnome org>]

commit 3302dbd3c414844817685612ecc9035de3245b34
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Nov 18 17:21:54 2015 +0100

    tracker-extract-xmp: Fix extraction of orientation values 3 and 4
    
    They had gotten swapped around. See:
    http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf
    
    https://bugzilla.gnome.org/show_bug.cgi?id=758295

 src/libtracker-extract/tracker-xmp.c        |    4 ++--
 tests/libtracker-extract/tracker-test-xmp.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index 8729af0..42ade15 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -301,9 +301,9 @@ fix_orientation (const gchar *orientation)
        } else if (orientation && g_ascii_strcasecmp (orientation, "2") == 0) {
                return  "nfo:orientation-top-mirror";
        } else if (orientation && g_ascii_strcasecmp (orientation, "3") == 0) {
-               return "nfo:orientation-bottom-mirror";
+               return "nfo:orientation-bottom";
        } else if (orientation && g_ascii_strcasecmp (orientation, "4") == 0) {
-               return  "nfo:orientation-bottom";
+               return  "nfo:orientation-bottom-mirror";
        } else if (orientation && g_ascii_strcasecmp (orientation, "5") == 0) {
                return  "nfo:orientation-left-mirror";
        } else if (orientation && g_ascii_strcasecmp (orientation, "6") == 0) {
diff --git a/tests/libtracker-extract/tracker-test-xmp.c b/tests/libtracker-extract/tracker-test-xmp.c
index d8a2708..0936e2c 100644
--- a/tests/libtracker-extract/tracker-test-xmp.c
+++ b/tests/libtracker-extract/tracker-test-xmp.c
@@ -107,8 +107,8 @@ static ExifNepomuk METERING_MODES [] = {
 
 static ExifNepomuk ORIENTATIONS [] = {
        {"2", "nfo:orientation-top-mirror"},
-       {"3", "nfo:orientation-bottom-mirror"},
-       {"4", "nfo:orientation-bottom"},
+       {"3", "nfo:orientation-bottom"},
+       {"4", "nfo:orientation-bottom-mirror"},
        {"5", "nfo:orientation-left-mirror"},
        {"6", "nfo:orientation-right"},
        {"7", "nfo:orientation-right-mirror"},