Merge lp://staging/~fboucault/ubuntu-ui-extras/editor_with_halide into lp://staging/ubuntu-ui-extras

Proposed by Florian Boucault
Status: Needs review
Proposed branch: lp://staging/~fboucault/ubuntu-ui-extras/editor_with_halide
Merge into: lp://staging/ubuntu-ui-extras
Prerequisite: lp://staging/~fboucault/ubuntu-ui-extras/fix_exif_orientation
Diff against target: 3538 lines (+962/-2077)
29 files modified
debian/control (+1/-0)
modules/Ubuntu/Components/Extras/PhotoEditor.qml (+301/-122)
modules/Ubuntu/Components/Extras/PhotoEditor/ActionsBar.qml (+6/-0)
modules/Ubuntu/Components/Extras/PhotoEditor/BusyIndicator.qml (+10/-7)
modules/Ubuntu/Components/Extras/PhotoEditor/CropInteractor.qml (+21/-32)
modules/Ubuntu/Components/Extras/PhotoEditor/EditStack.qml (+0/-134)
modules/Ubuntu/Components/Extras/PhotoEditor/EditorAction.qml (+48/-0)
modules/Ubuntu/Components/Extras/PhotoEditor/ExifOrientation.qml (+32/-0)
modules/Ubuntu/Components/Extras/PhotoEditor/FunctionStateSaver.qml (+56/-0)
modules/Ubuntu/Components/Extras/PhotoEditor/FunctionTransform.qml (+77/-0)
modules/Ubuntu/Components/Extras/plugin/CMakeLists.txt (+8/-4)
modules/Ubuntu/Components/Extras/plugin/components.cpp (+4/-4)
modules/Ubuntu/Components/Extras/plugin/photoeditor/file-utils.cpp (+4/-0)
modules/Ubuntu/Components/Extras/plugin/photoeditor/file-utils.h (+4/-0)
modules/Ubuntu/Components/Extras/plugin/photoeditor/generator_transform.cpp (+65/-0)
modules/Ubuntu/Components/Extras/plugin/photoeditor/halide_common.h (+91/-0)
modules/Ubuntu/Components/Extras/plugin/photoeditor/halide_generators_common.h (+63/-0)
modules/Ubuntu/Components/Extras/plugin/photoeditor/imaging.cpp (+0/-363)
modules/Ubuntu/Components/Extras/plugin/photoeditor/imaging.h (+0/-169)
modules/Ubuntu/Components/Extras/plugin/photoeditor/orientation.cpp (+0/-152)
modules/Ubuntu/Components/Extras/plugin/photoeditor/orientation.h (+0/-64)
modules/Ubuntu/Components/Extras/plugin/photoeditor/photo-data.cpp (+0/-275)
modules/Ubuntu/Components/Extras/plugin/photoeditor/photo-data.h (+0/-92)
modules/Ubuntu/Components/Extras/plugin/photoeditor/photo-edit-thread.cpp (+0/-185)
modules/Ubuntu/Components/Extras/plugin/photoeditor/photo-edit-thread.h (+0/-56)
modules/Ubuntu/Components/Extras/plugin/photoeditor/photo-metadata.cpp (+72/-235)
modules/Ubuntu/Components/Extras/plugin/photoeditor/photo-metadata.h (+51/-38)
tests/unittests/sampledata.qrc (+1/-1)
tests/unittests/tst_PhotoEditorPhoto.cpp (+47/-144)
To merge this branch: bzr merge lp://staging/~fboucault/ubuntu-ui-extras/editor_with_halide
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Ugo Riboni Pending
Review via email: mp+261622@code.staging.launchpad.net

Commit message

PhotoEditor: use Halide instead of custom editing functions.

To post a comment you must log in.
76. By Florian Boucault

Fixed deb dependencies.

Revision history for this message
Florian Boucault (fboucault) wrote :
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
77. By Florian Boucault

Fix for long loading when editing starts.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
78. By Florian Boucault

Enclosed classes into PhotoEditor namespace as to not conflict with Gallery's version of the same classes.

79. By Florian Boucault

Enable function as late as possible.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

79. By Florian Boucault

Enable function as late as possible.

78. By Florian Boucault

Enclosed classes into PhotoEditor namespace as to not conflict with Gallery's version of the same classes.

77. By Florian Boucault

Fix for long loading when editing starts.

76. By Florian Boucault

Fixed deb dependencies.

75. By Florian Boucault

PhotoEditor: use Halide instead of custom editing functions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches