Merge lp:~phablet-team/gallery-app/fix-crop-on-new-photos into lp:gallery-app

[Ugo Riboni]

Make sure the first time a photo is added to the database we read the actual size save it to the database

Make sure the first time a photo is added to the database we read the actual size save it to the database

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1128
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1091/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/19
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/77
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/391
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/145
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17075
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/401
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/401/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/gallery-app/fix-crop-on-new-photos]

1129. By Ugo Riboni on 2015-01-20

Remove debug messages

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'src/database/media-table.cpp'
--- src/database/media-table.cpp	2013-07-01 14:44:34 +0000
+++ src/database/media-table.cpp	2015-01-20 13:15:55 +0000
@@ -65,18 +65,20 @@
  */
 qint64 MediaTable::createIdForMedia(const QString& filename,
                                        const QDateTime& timestamp, const QDateTime& exposureTime,
-                                       Orientation originalOrientation, qint64 filesize)
+                                       Orientation originalOrientation, qint64 filesize, QSize size)
 {
     // Add the row.
     QSqlQuery query(*m_db->getDB());
     query.prepare("INSERT INTO MediaTable (filename, timestamp, exposure_time, "
-                  "original_orientation, filesize) VALUES (:filename, :timestamp, "
-                  ":exposure_time, :original_orientation, :filesize)");
+                  "original_orientation, filesize, width, height) VALUES (:filename, :timestamp, "
+                  ":exposure_time, :original_orientation, :filesize, :width, :height)");
     query.bindValue(":filename", filename);
     query.bindValue(":timestamp", timestamp.toMSecsSinceEpoch());
     query.bindValue(":exposure_time", exposureTime.toMSecsSinceEpoch());
     query.bindValue(":original_orientation", originalOrientation);
     query.bindValue(":filesize", filesize);
+    query.bindValue(":width", size.width());
+    query.bindValue(":height", size.height());
     if (!query.exec())
         m_db->logSqlError(query);
 

=== modified file 'src/database/media-table.h'
--- src/database/media-table.h	2013-07-01 14:44:34 +0000
+++ src/database/media-table.h	2015-01-20 13:15:55 +0000
@@ -41,7 +41,7 @@
 
     qint64 createIdForMedia(const QString& filename, const QDateTime& timestamp,
                             const QDateTime& exposureTime, Orientation originalOrientation,
-                            qint64 filesize);
+                            qint64 filesize, QSize size);
 
     void updateMedia(qint64 mediaId, const QString& filename,
                       const QDateTime& timestamp, const QDateTime& exposureTime,

=== modified file 'src/media-object-factory.cpp'
--- src/media-object-factory.cpp	2014-05-31 02:01:13 +0000
+++ src/media-object-factory.cpp	2015-01-20 13:15:55 +0000
@@ -150,9 +150,12 @@
             return 0;
         }
 
+        // This will cause the real size to be read from the file
+        if (photo) m_size = photo->size();
+
         // Add to DB.
         id = m_mediaTable->createIdForMedia(file.absoluteFilePath(), m_timeStamp,
-                                            m_exposureTime, m_orientation, m_fileSize);
+                                            m_exposureTime, m_orientation, m_fileSize, m_size);
     } else {
         // Load metadata from DB.
         m_mediaTable->getRow(id, m_size, m_orientation, m_timeStamp, m_exposureTime);

=== modified file 'src/photo/photo.cpp'
--- src/photo/photo.cpp	2014-12-17 00:34:42 +0000
+++ src/photo/photo.cpp	2015-01-20 13:15:55 +0000
@@ -232,8 +232,9 @@
                     .toTransform());
 
         // Cache this here since the image is already loaded.
-        if (!isSizeSet())
+        if (!isSizeSet()) {
             setSize(image.size());
+        }
     }
 
     return image;

=== modified file 'tests/unittests/stubs/media-table_stub.cpp'
--- tests/unittests/stubs/media-table_stub.cpp	2013-07-01 14:44:34 +0000
+++ tests/unittests/stubs/media-table_stub.cpp	2015-01-20 13:15:55 +0000
@@ -33,6 +33,8 @@
     QDateTime exposureTime;
     Orientation originalOrientation;
     qint64 filesize;
+    int width;
+    int height;
 };
 
 static qint64 mediaLastId = 0;
@@ -62,7 +64,7 @@
 
 qint64 MediaTable::createIdForMedia(const QString& filename,
                                        const QDateTime& timestamp, const QDateTime& exposureTime,
-                                       Orientation originalOrientation, qint64 filesize)
+                                       Orientation originalOrientation, qint64 filesize, QSize size)
 {
     MediaDataRow row;
     row.id = mediaLastId;
@@ -72,6 +74,8 @@
     row.exposureTime = exposureTime;
     row.originalOrientation = originalOrientation;
     row.filesize = filesize;
+    row.height = size.height();
+    row.width = size.width();
     mediaFakeTable.append(row);
     return row.id;
 }