Merge lp:~schwann/gallery-app/gallery-edit-thread into lp:gallery-app

[Günter Schwann]

Run edit operations in a background task

Run edit operations in a background task. So now one can see the spinner running, and is able to use the UI, while the editing is performed.

[lp:~schwann/gallery-app/gallery-edit-thread]

788. By Günter Schwann on 2013-07-26

Properly block undo/redo

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:787
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/372/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/182
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1606
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1356

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:788
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/373/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/183
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1609
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1358

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good.

review: Approve

=== modified file 'src/media/media-source.h'
--- src/media/media-source.h	2013-07-05 08:12:31 +0000
+++ src/media/media-source.h	2013-07-26 16:08:26 +0000
@@ -103,7 +103,6 @@
     void setFileTimestamp(const QDateTime& timestamp);
 
     const QSize& size();
-    void setSize(const QSize& size);
 
     qint64 id() const;
     void setId(qint64 id);
@@ -112,6 +111,9 @@
 
     void setMediaTable(MediaTable *mediaTable);
 
+public Q_SLOTS:
+    void setSize(const QSize& size);
+
 protected:
     bool isSizeSet() const;
 

=== modified file 'src/photo/CMakeLists.txt'
--- src/photo/CMakeLists.txt	2013-07-03 11:53:48 +0000
+++ src/photo/CMakeLists.txt	2013-07-26 16:08:26 +0000
@@ -18,12 +18,14 @@
     photo.h
     photo-caches.h
     photo-edit-state.h
+    photo-edit-thread.h
     )
 
 set(gallery_photo_SRCS
     photo.cpp
     photo-caches.cpp
     photo-edit-state.cpp
+    photo-edit-thread.cpp
     )
 
 add_library(${GALLERY_PHOTO_LIB}

=== added file 'src/photo/photo-edit-thread.cpp'
--- src/photo/photo-edit-thread.cpp	1970-01-01 00:00:00 +0000
+++ src/photo/photo-edit-thread.cpp	2013-07-26 16:08:26 +0000
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "photo-edit-thread.h"
+#include "photo.h"
+
+// medialoader
+#include "photo-metadata.h"
+
+// util
+#include "imaging.h"
+
+#include <QDebug>
+
+/*!
+ * \brief PhotoEditThread::PhotoEditThread
+ */
+PhotoEditThread::PhotoEditThread(Photo *photo, const PhotoEditState &editState)
+    : QThread(),
+      m_photo(photo),
+      m_editState(editState),
+      m_caches(photo->file()),
+      m_oldOrientation(photo->orientation())
+{
+}
+
+/*!
+ * \brief PhotoEditThread::editState resturns the editing stse used for this processing
+ * \return
+ */
+const PhotoEditState &PhotoEditThread::editState() const
+{
+    return m_editState;
+}
+
+/*!
+ * \brief PhotoEditThread::oldOrientation returns the orientation of the photo before the editing
+ * \return
+ */
+Orientation PhotoEditThread::oldOrientation() const
+{
+    return m_oldOrientation;
+}
+
+/*!
+ * \brief PhotoEditThread::run \reimp
+ */
+void PhotoEditThread::run()
+{
+    // As a special case, if editing to the original version, we simply restore
+    // from the original and call it a day.
+    if (m_editState.isOriginal()) {
+        if (!m_caches.restoreOriginal())
+            qWarning() << "Error restoring original for" << m_photo->file().filePath();
+        else
+            Q_EMIT resetToOriginalSize();
+
+        // As a courtesy, when the original goes away, we get rid of the other
+        // cached files too.
+        m_caches.discardCachedEnhanced();
+        return;
+    }
+
+    if (!m_caches.cacheOriginal())
+        qWarning() << "Error caching original for" << m_photo->file().filePath();
+
+    if (m_editState.is_enhanced_ && !m_caches.hasCachedEnhanced())
+        createCachedEnhanced();
+
+    if (!m_caches.overwriteFromCache(m_editState.is_enhanced_))
+        qWarning() << "Error overwriting" << m_photo->file().filePath() << "from cache";
+
+    // Have we been rotated and _not_ cropped?
+    if (m_photo->fileFormatHasOrientation() && (!m_editState.crop_rectangle_.isValid()) &&
+            m_editState.exposureCompensation_ == 0 &&
+            (m_editState.orientation_ != PhotoEditState::ORIGINAL_ORIENTATION)) {
+        // Yes; skip out on decoding and re-encoding the image.
+        handleSimpleMetadataRotation(m_editState);
+        return;
+    }
+
+    // TODO: we might be able to avoid reading/writing pixel data (and other
+    // more general optimizations) under certain conditions here.  Might be worth
+    // doing if it doesn't make the code too much worse.
+    //
+    // At the moment, we are skipping at least one decode and one encode in cases
+    // where a .jpeg file has been rotated, but not cropped, since rotation can be
+    // controlled by manipulating its metadata without having to modify pixel data;
+    // please see the method handle_simple_metadata_rotation() for details.
+
+    QImage image(m_photo->file().filePath(), m_photo->fileFormat().toStdString().c_str());
+    if (image.isNull()) {
+        qWarning() << "Error loading" << m_photo->file().filePath() << "for editing";
+        return;
+    }
+    PhotoMetadata* metadata = PhotoMetadata::fromFile(m_photo->file());
+
+    if (m_photo->fileFormatHasOrientation() &&
+            m_editState.orientation_ != PhotoEditState::ORIGINAL_ORIENTATION)
+        metadata->setOrientation(m_editState.orientation_);
+
+    if (m_photo->fileFormatHasOrientation() &&
+            metadata->orientation() != TOP_LEFT_ORIGIN)
+        image = image.transformed(metadata->orientationTransform());
+    else if (m_editState.orientation_ != PhotoEditState::ORIGINAL_ORIENTATION &&
+             m_editState.orientation_ != TOP_LEFT_ORIGIN)
+        image = image.transformed(
+                    OrientationCorrection::fromOrientation(m_editState.orientation_).toTransform());
+
+    if (m_editState.crop_rectangle_.isValid())
+        image = image.copy(m_editState.crop_rectangle_);
+
+    // exposure compensation
+    if (m_editState.exposureCompensation_ != 0.0) {
+        image = compensateExposure(image, m_editState.exposureCompensation_);
+    }
+
+    // exposure compensation
+    if (!m_editState.colorBalance_.isNull()) {
+        const QVector4D &v = m_editState.colorBalance_;
+        image = doColorBalance(image, v.x(), v.y(), v.z(), v.w());
+    }
+
+    QSize new_size = image.size();
+
+    // We need to apply the reverse transformation so that when we reload the
+    // file and reapply the transformation it comes out correctly.
+    if (m_photo->fileFormatHasOrientation() &&
+            metadata->orientation() != TOP_LEFT_ORIGIN)
+        image = image.transformed(metadata->orientationTransform().inverted());
+
+    bool saved = image.save(m_photo->file().filePath(),  m_photo->fileFormat().toStdString().c_str(), 90);
+    if (saved && m_photo->fileFormatHasMetadata())
+        saved = metadata->save();
+    if (!saved)
+        qWarning() << "Error saving edited" << m_photo->file().filePath();
+
+    delete metadata;
+
+    Q_EMIT newSize(new_size);
+}
+
+/*!
+ * \brief PhotoEditThread::handleSimpleMetadataRotation
+ * Handler for the case of an image whose only change is to its
+ * orientation; used to skip re-encoding of JPEGs.
+ * \param state
+ */
+void PhotoEditThread::handleSimpleMetadataRotation(const PhotoEditState& state)
+{
+    PhotoMetadata* metadata = PhotoMetadata::fromFile(m_photo->file());
+    metadata->setOrientation(state.orientation_);
+
+    metadata->save();
+    delete(metadata);
+
+    OrientationCorrection orig_correction =
+            OrientationCorrection::fromOrientation(m_photo->originalOrientation());
+    OrientationCorrection dest_correction =
+            OrientationCorrection::fromOrientation(state.orientation_);
+
+    QSize new_size = m_photo->originalSize();
+    int angle = dest_correction.getNormalizedRotationDifference(orig_correction);
+
+    if ((angle == 90) || (angle == 270)) {
+        new_size = m_photo->originalSize().transposed();
+    }
+
+    Q_EMIT newSize(new_size);
+}
+
+/*!
+ * \brief PhotoEditThread::createCachedEnhanced
+ */
+void PhotoEditThread::createCachedEnhanced()
+{
+    if (!m_caches.cacheEnhancedFromOriginal()) {
+        qWarning() << "Error creating enhanced file for" << m_photo->file().filePath();
+        return;
+    }
+
+    QFileInfo to_enhance = m_photo->enhancedFile();
+    PhotoMetadata* metadata = PhotoMetadata::fromFile(to_enhance);
+
+    QImage unenhanced_img(to_enhance.filePath(), m_photo->fileFormat().toStdString().c_str());
+    int width = unenhanced_img.width();
+    int height = unenhanced_img.height();
+
+    QImage sample_img = (unenhanced_img.width() > 400) ?
+                unenhanced_img.scaledToWidth(400) : unenhanced_img;
+
+    AutoEnhanceTransformation enhance_txn = AutoEnhanceTransformation(sample_img);
+
+    QImage::Format dest_format = unenhanced_img.format();
+
+    // Can't write into indexed images, due to a limitation in Qt.
+    if (dest_format == QImage::Format_Indexed8)
+        dest_format = QImage::Format_RGB32;
+
+    QImage enhanced_image(width, height, dest_format);
+
+    for (int j = 0; j < height; j++) {
+        for (int i = 0; i < width; i++) {
+            QColor px = enhance_txn.transformPixel(
+                        QColor(unenhanced_img.pixel(i, j)));
+            enhanced_image.setPixel(i, j, px.rgb());
+        }
+    }
+
+    bool saved = enhanced_image.save(to_enhance.filePath(),
+                                     m_photo->fileFormat().toStdString().c_str(), 90);
+    if (saved && m_photo->fileFormatHasMetadata())
+        saved = metadata->save();
+    if (!saved) {
+        qWarning() << "Error saving enhanced file for" << m_photo->file().filePath();
+        m_caches.discardCachedEnhanced();
+    }
+
+    delete metadata;
+}
+
+/*!
+ * \brief PhotoEditThread::compensateExposure Compensates the exposure
+ * Compensating the exposure is a change in brightnes
+ * \param image Image to change the brightnes
+ * \param compansation -1.0 is total dark, +1.0 is total bright
+ * \return The image with adjusted brightnes
+ */
+QImage PhotoEditThread::compensateExposure(const QImage &image, qreal compansation)
+{
+    int shift = qBound(-255, (int)(255*compansation), 255);
+    QImage result(image.width(), image.height(), image.format());
+
+    for (int j = 0; j < image.height(); j++) {
+        for (int i = 0; i <image.width(); i++) {
+            QColor px = image.pixel(i, j);
+            int red = qBound(0, px.red() + shift, 255);
+            int green = qBound(0, px.green() + shift, 255);
+            int blue = qBound(0, px.blue() + shift, 255);
+            result.setPixel(i, j, qRgb(red, green, blue));
+        }
+    }
+
+    return result;
+}
+
+/*!
+ * \brief PhotoEditThread::colorBalance
+ * \param image
+ * \param brightness 0 is total dark, 1 is as the original, grater than 1 is brigther
+ * \param contrast from 0 maybe 5. 1 is as the original
+ * \param saturation from 0 maybe 5. 1 is as the original
+ * \param hue from 0 to 360. 0 and 360 is as the original
+ * \return
+ */
+QImage PhotoEditThread::doColorBalance(const QImage &image, qreal brightness, qreal contrast, qreal saturation, qreal hue)
+{
+    QImage result(image.width(), image.height(), image.format());
+
+    ColorBalance cb(brightness, contrast, saturation, hue);
+
+    for (int j = 0; j < image.height(); j++) {
+        for (int i = 0; i <image.width(); i++) {
+            QColor px = image.pixel(i, j);
+            QColor tpx = cb.transformPixel(px);
+            result.setPixel(i, j, tpx.rgb());
+        }
+    }
+
+    return result;
+}
+

=== added file 'src/photo/photo-edit-thread.h'
--- src/photo/photo-edit-thread.h	1970-01-01 00:00:00 +0000
+++ src/photo/photo-edit-thread.h	2013-07-26 16:08:26 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GALLERY_PHOTO_EDIT_THREAD_H_
+#define GALLERY_PHOTO_EDIT_THREAD_H_
+
+#include "photo-caches.h"
+#include "photo-edit-state.h"
+
+// util
+#include "orientation.h"
+
+#include <QImage>
+#include <QThread>
+#include <QUrl>
+
+class Photo;
+
+/*!
+ * \brief The PhotoEditThread class
+ */
+class PhotoEditThread: public QThread
+{
+    Q_OBJECT
+public:
+    PhotoEditThread(Photo *photo, const PhotoEditState& editState);
+
+    const PhotoEditState& editState() const;
+    Orientation oldOrientation() const;
+
+Q_SIGNALS:
+    void newSize(QSize size);
+    void resetToOriginalSize();
+
+protected:
+    void run() Q_DECL_OVERRIDE;
+
+private:
+    void createCachedEnhanced();
+    QImage compensateExposure(const QImage& image, qreal compansation);
+    QImage doColorBalance(const QImage& image, qreal brightness, qreal contrast, qreal saturation, qreal hue);
+    void handleSimpleMetadataRotation(const PhotoEditState& state);
+
+    Photo *m_photo;
+    PhotoEditState m_editState;
+    PhotoCaches m_caches;
+    Orientation m_oldOrientation;
+};
+
+#endif

=== modified file 'src/photo/photo.cpp'
--- src/photo/photo.cpp	2013-07-05 08:12:31 +0000
+++ src/photo/photo.cpp	2013-07-26 16:08:26 +0000
@@ -23,6 +23,7 @@
 
 #include "photo.h"
 #include "photo-edit-state.h"
+#include "photo-edit-thread.h"
 
 // database
 #include "database.h"
@@ -185,6 +186,7 @@
 Photo::Photo(const QFileInfo& file)
     : MediaSource(file),
       m_editRevision(0),
+      m_editThread(0),
       m_caches(file),
       m_originalSize(),
       m_originalOrientation(TOP_LEFT_ORIGIN),
@@ -201,6 +203,10 @@
  */
 Photo::~Photo()
 {
+    if (m_editThread) {
+        m_editThread->wait();
+        finishEditing();
+    }
     delete(d_ptr);
 }
 
@@ -347,13 +353,15 @@
 void Photo::undo()
 {
     Q_D(Photo);
-    Orientation old_orientation = orientation();
+    if (busy()) {
+        qWarning() << "Don't start edit operation, while another one is running";
+        return;
+    }
 
     PhotoEditState prev = d->editStack()->current();
     PhotoEditState next = d->editStack()->undo();
     if (next != prev) {
-        save(next, old_orientation);
-        emit editStackChanged();
+        asyncEdit(next);
     }
 }
 
@@ -363,13 +371,15 @@
 void Photo::redo()
 {
     Q_D(Photo);
-    Orientation old_orientation = orientation();
+    if (busy()) {
+        qWarning() << "Don't start edit operation, while another one is running";
+        return;
+    }
 
     PhotoEditState prev = d->editStack()->current();
     PhotoEditState next = d->editStack()->redo();
     if (next != prev) {
-        save(next, old_orientation);
-        emit editStackChanged();
+        asyncEdit(next);
     }
 }
 
@@ -556,6 +566,14 @@
 }
 
 /*!
+ * \brief Photo::resetToOriginalSize set the size to the one of the orifinal photo
+ */
+void Photo::resetToOriginalSize()
+{
+    setSize(originalSize(PhotoEditState::ORIGINAL_ORIENTATION));
+}
+
+/*!
  * \brief Photo::currentState
  * \return
  */
@@ -607,26 +625,43 @@
  */
 void Photo::makeUndoableEdit(const PhotoEditState& state)
 {
+    if (busy()) {
+        qWarning() << "Don't start edit operation, while another one is running";
+        return;
+    }
+
     Q_D(Photo);
-    Orientation old_orientation = orientation();
-
     d->editStack()->pushEdit(state);
-    save(state, old_orientation);
-    emit editStackChanged();
+    asyncEdit(state);
 }
 
 /*!
- * \brief Photo::save
- * \param state
- * \param oldOrientation
+ * \brief Photo::asyncEdit does edit the photo according to the given state
+ * in a background task
+ * \param state the new editing state
  */
-void Photo::save(const PhotoEditState& state, Orientation oldOrientation)
+void Photo::asyncEdit(const PhotoEditState& state)
 {
     setBusy(true);
-    editFile(state);
+    m_editThread = new PhotoEditThread(this, state);
+    connect(m_editThread, SIGNAL(finished()), this, SLOT(finishEditing()));
+    connect(m_editThread, SIGNAL(newSize(QSize)), this, SLOT(setSize(QSize)));
+    connect(m_editThread, SIGNAL(resetToOriginalSize()), this, SLOT(resetToOriginalSize()));
+    m_editThread->start();
+}
+
+/*!
+ * \brief Photo::finishEditing do all the updates once the editing is done
+ */
+void Photo::finishEditing()
+{
+    if (!m_editThread || m_editThread->isRunning())
+        return;
+
+    const PhotoEditState &state = m_editThread->editState();
     GalleryManager::instance()->database()->getPhotoEditTable()->setEditState(id(), state);
 
-    if (orientation() != oldOrientation)
+    if (orientation() != m_editThread->oldOrientation())
         emit orientationChanged();
     notifyDataChanged();
 
@@ -635,244 +670,10 @@
     emit galleryPathChanged();
     emit galleryPreviewPathChanged();
     emit galleryThumbnailPathChanged();
+    m_editThread->deleteLater();
+    m_editThread = 0;
     setBusy(false);
-}
-
-/*!
- * \brief Photo::handleSimpleMetadataRotation
- * Handler for the case of an image whose only change is to its
- * orientation; used to skip re-encoding of JPEGs.
- * \param state
- */
-void Photo::handleSimpleMetadataRotation(const PhotoEditState& state)
-{
-    PhotoMetadata* metadata = PhotoMetadata::fromFile(file());
-    metadata->setOrientation(state.orientation_);
-
-    metadata->save();
-    delete(metadata);
-
-    OrientationCorrection orig_correction =
-            OrientationCorrection::fromOrientation(m_originalOrientation);
-    OrientationCorrection dest_correction =
-            OrientationCorrection::fromOrientation(state.orientation_);
-
-    QSize new_size = m_originalSize;
-    int angle = dest_correction.getNormalizedRotationDifference(orig_correction);
-
-    if ((angle == 90) || (angle == 270)) {
-        new_size = m_originalSize.transposed();
-    }
-
-    setSize(new_size);
-}
-
-/*!
- * \brief Photo::editFile
- * \param state
- */
-void Photo::editFile(const PhotoEditState& state)
-{
-    // As a special case, if editing to the original version, we simply restore
-    // from the original and call it a day.
-    if (state.isOriginal()) {
-        if (!m_caches.restoreOriginal())
-            qDebug("Error restoring original for %s", qPrintable(file().filePath()));
-        else
-            setSize(originalSize(PhotoEditState::ORIGINAL_ORIENTATION));
-
-        // As a courtesy, when the original goes away, we get rid of the other
-        // cached files too.
-        m_caches.discardCachedEnhanced();
-        return;
-    }
-
-    if (!m_caches.cacheOriginal())
-        qDebug("Error caching original for %s", qPrintable(file().filePath()));
-
-    if (state.is_enhanced_ && !m_caches.hasCachedEnhanced())
-        createCachedEnhanced();
-
-    if (!m_caches.overwriteFromCache(state.is_enhanced_))
-        qDebug("Error overwriting %s from cache", qPrintable(file().filePath()));
-
-    // Have we been rotated and _not_ cropped?
-    if (fileFormatHasOrientation() && (!state.crop_rectangle_.isValid()) &&
-            state.exposureCompensation_ == 0 &&
-            (state.orientation_ != PhotoEditState::ORIGINAL_ORIENTATION)) {
-        // Yes; skip out on decoding and re-encoding the image.
-        handleSimpleMetadataRotation(state);
-        return;
-    }
-
-    // TODO: we might be able to avoid reading/writing pixel data (and other
-    // more general optimizations) under certain conditions here.  Might be worth
-    // doing if it doesn't make the code too much worse.
-    //
-    // At the moment, we are skipping at least one decode and one encode in cases
-    // where a .jpeg file has been rotated, but not cropped, since rotation can be
-    // controlled by manipulating its metadata without having to modify pixel data;
-    // please see the method handle_simple_metadata_rotation() for details.
-
-    QImage image(file().filePath(), m_fileFormat.toStdString().c_str());
-    if (image.isNull()) {
-        qDebug("Error loading %s for editing", qPrintable(file().filePath()));
-        return;
-    }
-    PhotoMetadata* metadata = PhotoMetadata::fromFile(file());
-
-    if (fileFormatHasOrientation() &&
-            state.orientation_ != PhotoEditState::ORIGINAL_ORIENTATION)
-        metadata->setOrientation(state.orientation_);
-
-    if (fileFormatHasOrientation() &&
-            metadata->orientation() != TOP_LEFT_ORIGIN)
-        image = image.transformed(metadata->orientationTransform());
-    else if (state.orientation_ != PhotoEditState::ORIGINAL_ORIENTATION &&
-             state.orientation_ != TOP_LEFT_ORIGIN)
-        image = image.transformed(
-                    OrientationCorrection::fromOrientation(state.orientation_).toTransform());
-
-    // Cache this here so we may be able to avoid another JPEG decode later just
-    // to find the dimensions.
-    if (!m_originalSize.isValid())
-        m_originalSize = image.size();
-
-    if (state.crop_rectangle_.isValid())
-        image = image.copy(state.crop_rectangle_);
-
-    // exposure compensation
-    if (state.exposureCompensation_ != 0.0) {
-        image = compensateExposure(image, state.exposureCompensation_);
-    }
-
-    // exposure compensation
-    if (!state.colorBalance_.isNull()) {
-        const QVector4D &v = state.colorBalance_;
-        image = doColorBalance(image, v.x(), v.y(), v.z(), v.w());
-    }
-
-    QSize new_size = image.size();
-
-    // We need to apply the reverse transformation so that when we reload the
-    // file and reapply the transformation it comes out correctly.
-    if (fileFormatHasOrientation() &&
-            metadata->orientation() != TOP_LEFT_ORIGIN)
-        image = image.transformed(metadata->orientationTransform().inverted());
-
-    bool saved = image.save(file().filePath(), m_fileFormat.toStdString().c_str(), 90);
-    if (saved && fileFormatHasMetadata())
-        saved = metadata->save();
-    if (!saved)
-        qDebug("Error saving edited %s", qPrintable(file().filePath()));
-
-    delete metadata;
-
-    setSize(new_size);
-}
-
-/*!
- * \brief Photo::createCachedEnhanced
- */
-void Photo::createCachedEnhanced()
-{
-    if (!m_caches.cacheEnhancedFromOriginal()) {
-        qDebug("Error creating enhanced file for %s", qPrintable(file().filePath()));
-        return;
-    }
-
-    QFileInfo to_enhance = m_caches.enhancedFile();
-    PhotoMetadata* metadata = PhotoMetadata::fromFile(to_enhance);
-
-    QImage unenhanced_img(to_enhance.filePath(), m_fileFormat.toStdString().c_str());
-    int width = unenhanced_img.width();
-    int height = unenhanced_img.height();
-
-    QImage sample_img = (unenhanced_img.width() > 400) ?
-                unenhanced_img.scaledToWidth(400) : unenhanced_img;
-
-    AutoEnhanceTransformation enhance_txn = AutoEnhanceTransformation(sample_img);
-
-    QImage::Format dest_format = unenhanced_img.format();
-
-    // Can't write into indexed images, due to a limitation in Qt.
-    if (dest_format == QImage::Format_Indexed8)
-        dest_format = QImage::Format_RGB32;
-
-    QImage enhanced_image(width, height, dest_format);
-
-    for (int j = 0; j < height; j++) {
-        //QApplication::processEvents();
-        for (int i = 0; i < width; i++) {
-            QColor px = enhance_txn.transformPixel(
-                        QColor(unenhanced_img.pixel(i, j)));
-            enhanced_image.setPixel(i, j, px.rgb());
-        }
-    }
-
-    bool saved = enhanced_image.save(to_enhance.filePath(),
-                                     m_fileFormat.toStdString().c_str(), 99);
-    if (saved && fileFormatHasMetadata())
-        saved = metadata->save();
-    if (!saved) {
-        qDebug("Error saving enhanced file for %s", qPrintable(file().filePath()));
-        m_caches.discardCachedEnhanced();
-    }
-
-    delete metadata;
-}
-
-/*!
- * \brief Photo::compensateExposure Compensates the exposure
- * Compensating the exposure is a change in brightnes
- * \param image Image to change the brightnes
- * \param compansation -1.0 is total dark, +1.0 is total bright
- * \return The image with adjusted brightnes
- */
-QImage Photo::compensateExposure(const QImage &image, qreal compansation)
-{
-    int shift = qBound(-255, (int)(255*compansation), 255);
-    QImage result(image.width(), image.height(), image.format());
-
-    for (int j = 0; j < image.height(); j++) {
-        QApplication::processEvents();
-        for (int i = 0; i <image.width(); i++) {
-            QColor px = image.pixel(i, j);
-            int red = qBound(0, px.red() + shift, 255);
-            int green = qBound(0, px.green() + shift, 255);
-            int blue = qBound(0, px.blue() + shift, 255);
-            result.setPixel(i, j, qRgb(red, green, blue));
-        }
-    }
-
-    return result;
-}
-
-/*!
- * \brief Photo::colorBalance
- * \param image
- * \param brightness 0 is total dark, 1 is as the original, grater than 1 is brigther
- * \param contrast from 0 maybe 5. 1 is as the original
- * \param saturation from 0 maybe 5. 1 is as the original
- * \param hue from 0 to 360. 0 and 360 is as the original
- * \return
- */
-QImage Photo::doColorBalance(const QImage &image, qreal brightness, qreal contrast, qreal saturation, qreal hue)
-{
-    QImage result(image.width(), image.height(), image.format());
-
-    ColorBalance cb(brightness, contrast, saturation, hue);
-
-    for (int j = 0; j < image.height(); j++) {
-        QApplication::processEvents();
-        for (int i = 0; i <image.width(); i++) {
-            QColor px = image.pixel(i, j);
-            QColor tpx = cb.transformPixel(px);
-            result.setPixel(i, j, tpx.rgb());
-        }
-    }
-
-    return result;
+    emit editStackChanged();
 }
 
 /*!
@@ -901,6 +702,15 @@
 }
 
 /*!
+ * \brief Photo::fileFormat returns the file format as QString
+ * \return
+ */
+const QString &Photo::fileFormat() const
+{
+    return m_fileFormat;
+}
+
+/*!
  * \brief Photo::fileFormatHasMetadata
  * \return
  */
@@ -927,3 +737,22 @@
 {
     m_originalOrientation = orientation;
 }
+
+/*!
+ * \brief Photo::originalOrientation returns the original orientation
+ * \return
+ */
+Orientation Photo::originalOrientation() const
+{
+    return m_originalOrientation;
+}
+
+/*!
+ * \brief Photo::originalSize
+ * \return
+ */
+const QSize &Photo::originalSize()
+{
+    originalSize(PhotoEditState::ORIGINAL_ORIENTATION);
+    return m_originalSize;
+}

=== modified file 'src/photo/photo.h'
--- src/photo/photo.h	2013-06-17 12:57:21 +0000
+++ src/photo/photo.h	2013-07-26 16:08:26 +0000
@@ -31,6 +31,7 @@
 #include "orientation.h"
 
 class PhotoEditState;
+class PhotoEditThread;
 class PhotoPrivate;
 
 /*!
@@ -81,6 +82,12 @@
     Q_INVOKABLE void crop(QVariant vrect);
 
     void setOriginalOrientation(Orientation orientation);
+    Orientation originalOrientation() const;
+    const QSize &originalSize();
+
+    const QString &fileFormat() const;
+    bool fileFormatHasMetadata() const;
+    bool fileFormatHasOrientation() const;
 
 signals:
     void editStackChanged();
@@ -88,22 +95,21 @@
 protected:
     virtual void destroySource(bool destroyBacking, bool asOrphan);
 
+private Q_SLOTS:
+    void resetToOriginalSize();
+    void finishEditing();
+
 private:
     const PhotoEditState& currentState() const;
     QSize originalSize(Orientation orientation);
     void makeUndoableEdit(const PhotoEditState& state);
-    void save(const PhotoEditState& state, Orientation oldOrientation);
+    void asyncEdit(const PhotoEditState& state);
     void editFile(const PhotoEditState& state);
-    void createCachedEnhanced();
-    QImage compensateExposure(const QImage& image, qreal compansation);
-    QImage doColorBalance(const QImage& image, qreal brightness, qreal contrast, qreal saturation, qreal hue);
     void appendPathParams(QUrl* url, Orientation orientation, const int sizeLevel) const;
-    void handleSimpleMetadataRotation(const PhotoEditState& state);
-    bool fileFormatHasMetadata() const;
-    bool fileFormatHasOrientation() const;
 
     QString m_fileFormat;
     int m_editRevision; // How many times the pixel data has been modified by us.
+    PhotoEditThread *m_editThread;
     PhotoCaches m_caches;
 
     // We cache this data to avoid an image read at various times.

=== modified file 'tests/unittests/stubs/photo_stub.cpp'
--- tests/unittests/stubs/photo_stub.cpp	2013-06-17 12:57:21 +0000
+++ tests/unittests/stubs/photo_stub.cpp	2013-07-26 16:08:26 +0000
@@ -159,3 +159,12 @@
 {
     m_originalOrientation = orientation;
 }
+
+void Photo::resetToOriginalSize()
+{
+}
+
+void Photo::finishEditing()
+{
+}
+