Merge lp:~fboucault/qtubuntu-camera/remove_maker_tag into lp:qtubuntu-camera

[Florian Boucault]

Systematically remove EXIF Exif.Photo.MakerNote tag. Exiv2 is unable to deal with it and this prevents any other tag to be written/modified.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-amd64-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-staging-vivid-i386-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-staging-ci/26/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-ci/140/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/qtubuntu-camera/remove_maker_tag]

163. By Florian Boucault on 2016-04-29

Systematically remove EXIF Exif.Photo.MakerNote tag. Exiv2 is unable to deal with it and this prevents any other tag to be written/modified.

=== modified file 'src/storagemanager.cpp'
--- src/storagemanager.cpp	2016-02-11 15:32:52 +0000
+++ src/storagemanager.cpp	2016-04-29 13:40:50 +0000
@@ -111,6 +111,20 @@
     try {
         image->readMetadata();
         Exiv2::ExifData ed = image->exifData();
+
+        /* This works around the Exiv2's unability to deal with the MakerNote tag
+         * due to its totally unspecified nature.
+         * Its presence sometimes causes Exiv2 to refuse to write/modify any other
+         * metadata (including orientation, GPS metadata).
+         * See https://bugs.launchpad.net/zhongshan/+bug/1572878 for possible
+         * consequences.
+         */
+        Exiv2::ExifKey makerNoteKey = Exiv2::ExifKey("Exif.Photo.MakerNote");
+        Exiv2::ExifData::iterator makerNoteIter = ed.findKey(makerNoteKey);
+        if (makerNoteIter != ed.end()) {
+            ed.erase(makerNoteIter);
+        }
+
         const QString now = QDateTime::currentDateTime().toString("yyyy:MM:dd HH:mm:ss");
         ed["Exif.Photo.DateTimeOriginal"].setValue(now.toStdString());
         ed["Exif.Photo.DateTimeDigitized"].setValue(now.toStdString());