summaryrefslogtreecommitdiff
path: root/src/simple-scan.c
diff options
context:
space:
mode:
authorAlessio Treglia <alessio@debian.org>2010-08-16 14:20:18 +0200
committerAlessio Treglia <alessio@debian.org>2010-08-16 14:20:18 +0200
commit37152f58469b7595694f7c42555d21d5198e3672 (patch)
tree5f23e309f8923a417fcc7e177a95bef584362fa7 /src/simple-scan.c
parent2a72bdeb81030847462135698e1cbff1c685ee18 (diff)
parentbbf22aaaa2fd5fe725a979f801472d52a1323242 (diff)
Merge commit 'upstream/2.31.90.1'
Diffstat (limited to 'src/simple-scan.c')
-rw-r--r--src/simple-scan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 54236ae..bb7e036 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -86,7 +86,7 @@ static Page *
append_page ()
{
Page *page;
- Orientation orientation = TOP_TO_BOTTOM;
+ ScanDirection scan_direction = TOP_TO_BOTTOM;
gboolean do_crop = FALSE;
gchar *named_crop = NULL;
gint width = 100, height = 100, dpi = 100, cx, cy, cw, ch;
@@ -101,7 +101,7 @@ append_page ()
/* Copy info from previous page */
if (page) {
- orientation = page_get_orientation (page);
+ scan_direction = page_get_scan_direction (page);
width = page_get_width (page);
height = page_get_height (page);
dpi = page_get_dpi (page);
@@ -113,7 +113,7 @@ append_page ()
}
}
- page = book_append_page (book, width, height, dpi, orientation);
+ page = book_append_page (book, width, height, dpi, scan_direction);
if (do_crop) {
if (named_crop) {
page_set_named_crop (page, named_crop);
@@ -205,7 +205,7 @@ scanner_page_info_cb (Scanner *scanner, ScanPageInfo *info)
/* Add a new page */
page = append_page ();
- page_set_scan_area (page, info->width, info->height, info->dpi);
+ page_set_page_info (page, info);
/* Get ICC color profile */
/* FIXME: The ICC profile could change */