Merge lp:~schwann/qtubuntu-camera/qtcamera-no-thumbnails into lp:qtubuntu-camera

[Günter Schwann]

Remove unused thumbnail generation

Remove unused thumbnail generation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/18

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

review: Approve (continuous-integration)

[Ugo Riboni (uriboni)]

Dead code removal, seems sensible

review: Approve

=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2013-06-18 12:14:43 +0000
+++ src/aalimagecapturecontrol.cpp	2013-06-24 07:02:52 +0000
@@ -34,13 +34,6 @@
 
 #include <ubuntu/application/ui/display.h>
 
-const int PREVIEW_WIDTH_MAX = 360;
-const int PREVIEW_HEIGHT_MAX = 360;
-const int PREVIEW_QUALITY = 70;
-const char* PREVIEW_FILE_FORMAT = "JPEG";
-const QLatin1String PREVIEW_FILE_EXT = QLatin1String("JPG");
-const QLatin1String PREVIEW_DIR = QLatin1String(".thumbs");
-
 AalImageCaptureControl::AalImageCaptureControl(AalCameraService *service, QObject *parent)
    : QCameraImageCaptureControl(parent),
     m_service(service),
@@ -267,10 +260,6 @@
         return;
     }
 
-// disabled, as it curently can't hande the case, when android uses the exif data for the rotation
-//    if (imageIsInGallery(m_pendingCaptureFile))
-//        saveThumbnail((const uchar*)data, dataSize);
-
     QFile finalFile(file.fileName());
     bool ok = finalFile.rename(m_pendingCaptureFile);
     if (!ok) {
@@ -287,38 +276,3 @@
     android_camera_start_preview(m_service->androidControl());
     m_service->updateCaptureReady();
 }
-
-bool AalImageCaptureControl::imageIsInGallery(const QString &fileName) const
-{
-    QFileInfo fi(fileName);
-    return fi.absolutePath() == m_galleryPath;
-}
-
-bool AalImageCaptureControl::saveThumbnail(const uchar *data, int dataSize)
-{
-    QString thumbnailDir = m_galleryPath + "/" + PREVIEW_DIR;
-    QDir tdir(thumbnailDir);
-    if (!tdir.exists()) {
-        tdir.mkpath(thumbnailDir);
-        if (!tdir.exists()) {
-            qWarning() << "Can't create directory for the gallery thumbnail " << thumbnailDir;
-            return false;
-        }
-    }
-
-    QImage fullsized;
-    fullsized.loadFromData(data, dataSize);
-    if (fullsized.isNull()) {
-        qWarning() << "Can't load the full sized image for thumbnail generation";
-        return false;
-    }
-
-    QImage scaled = (fullsized.height() > fullsized.width())
-      ? fullsized.scaledToWidth(PREVIEW_WIDTH_MAX, Qt::SmoothTransformation)
-      : fullsized.scaledToHeight(PREVIEW_HEIGHT_MAX, Qt::SmoothTransformation);
-
-    QFileInfo fi(m_pendingCaptureFile);
-    QString thumbnailName =  thumbnailDir + "/" + fi.completeBaseName() + "_th." + PREVIEW_FILE_EXT;
-
-    return scaled.save(thumbnailName, PREVIEW_FILE_FORMAT, PREVIEW_QUALITY);
-}

=== modified file 'src/aalimagecapturecontrol.h'
--- src/aalimagecapturecontrol.h	2013-03-12 16:17:37 +0000
+++ src/aalimagecapturecontrol.h	2013-06-24 07:02:52 +0000
@@ -66,8 +66,6 @@
     float getScreenAspectRatio();
     void getPriorityAspectRatios();
     void saveJpeg(void* data, uint32_t dataSize);
-    bool imageIsInGallery(const QString &fileName) const;
-    bool saveThumbnail(const uchar *data, int dataSize);
 
     AalCameraService *m_service;
     AalCameraControl *m_cameraControl;