← Back to branch summary

~ubuntu-branches/ubuntu/maverick/simple-scan/maverick-updates

« back to all changes in this revision

Viewing changes to src/simple-scan.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-08-16 16:28:25 UTC
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: james.westby@ubuntu.com-20100816162825-ocvr4x7o8w683v2n
Tags: upstream-2.31.90.1
Import upstream version 2.31.90.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/simple-scan.c
86
86
append_page ()
87
87
{
88
88
    Page *page;
89
 
    Orientation orientation = TOP_TO_BOTTOM;
 
89
    ScanDirection scan_direction = TOP_TO_BOTTOM;
90
90
    gboolean do_crop = FALSE;
91
91
    gchar *named_crop = NULL;
92
92
    gint width = 100, height = 100, dpi = 100, cx, cy, cw, ch;
101
101
  
102
102
    /* Copy info from previous page */
103
103
    if (page) {
104
 
        orientation = page_get_orientation (page);
 
104
        scan_direction = page_get_scan_direction (page);
105
105
        width = page_get_width (page);
106
106
        height = page_get_height (page);
107
107
        dpi = page_get_dpi (page);
113
113
        }
114
114
    }
115
115
 
116
 
    page = book_append_page (book, width, height, dpi, orientation);
 
116
    page = book_append_page (book, width, height, dpi, scan_direction);
117
117
    if (do_crop) {
118
118
        if (named_crop)  {
119
119
            page_set_named_crop (page, named_crop);
205
205
 
206
206
    /* Add a new page */
207
207
    page = append_page ();
208
 
    page_set_scan_area (page, info->width, info->height, info->dpi);
 
208
    page_set_page_info (page, info);
209
209
 
210
210
    /* Get ICC color profile */
211
211
    /* FIXME: The ICC profile could change */