← Back to branch summary

~ubuntu-branches/ubuntu/saucy/shotwell/saucy

« back to all changes in this revision

Viewing changes to src/PhotoPage.vala

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2013-04-04 19:11:05 UTC
  • mfrom: (1.2.19)
  • Revision ID: package-import@ubuntu.com-20130404191105-0mn24vyf1eqik51e
Tags: 0.14.1-0ubuntu1
New upstream bugfix version

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/PhotoPage.vala
1386
1386
 
1387
1387
    private void swap_in_original() {
1388
1388
        Gdk.Pixbuf? original;
1389
 
 
1390
 
        try {
1391
 
            original = get_photo().get_unmodified_pixbuf(cache.get_scaling(), true);
1392
 
 
1393
 
            if (original == null)
1394
 
                return;
1395
 
        }
1396
 
        catch (Error e) {
 
1389
        
 
1390
        original =
 
1391
            get_photo().get_original_orientation().rotate_pixbuf(get_photo().get_prefetched_copy());
 
1392
        
 
1393
        if (original == null)
1397
1394
            return;
1398
 
        }
1399
1395
        
1400
1396
        // store what's currently displayed only for the duration of the shift pressing
1401
1397
        swapped = get_unscaled_pixbuf();