Merge lp://qastaging/~tkluck/simple-scan/fix-cropping-slowness into lp://qastaging/~simple-scan-team/simple-scan/trunk

Proposed by Timo Kluck
Status: Merged
Merged at revision: 648
Proposed branch: lp://qastaging/~tkluck/simple-scan/fix-cropping-slowness
Merge into: lp://qastaging/~simple-scan-team/simple-scan/trunk
Diff against target: 221 lines (+113/-17)
1 file modified
src/autosave-manager.vala (+113/-17)
To merge this branch: bzr merge lp://qastaging/~tkluck/simple-scan/fix-cropping-slowness
Reviewer Review Type Date Requested Status
Timo Kluck (community) Needs Resubmitting
Robert Ancell Needs Fixing
Review via email: mp+181986@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

You need to merge with trunk - this branch has merge conflicts.

review: Needs Fixing
Revision history for this message
Robert Ancell (robert-ancell) wrote :

I haven't looked in detail, but does this code migrate from the old format correctly?

Revision history for this message
Timo Kluck (tkluck) wrote :

Good point; I don't think it does. I'll come up with something.

636. By Timo Kluck

Separate updating of autosave pixels from other updates

637. By Timo Kluck

Use files instead of blobs to autosave pixel data

638. By Timo Kluck

remove previous version of autosave database

Revision history for this message
Timo Kluck (tkluck) wrote :

Rebased and handles version upgrade now.

review: Needs Resubmitting
Revision history for this message
Timo Kluck (tkluck) wrote :

Sorry, I was trying to say I'm hereby resubmitting, not tell myself to resubmit this...

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