diff options
| author | Julien BLACHE <jblache@debian.org> | 2008-11-26 22:35:41 +0100 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@mapreri.org> | 2014-10-03 14:05:48 +0000 |
| commit | b85ae08349167bed47c71ed7ace8acd275b9ab22 (patch) | |
| tree | 94694d586ca7782fb453bf07c5251e02b52843d9 /src/xsane-viewer.c | |
| parent | e5485fc0e6e11763f1e4d309c5ccced01802974d (diff) | |
| parent | dc7150ada6000f0c8e6ee61da9598573d3b63b7f (diff) | |
Imported Debian patch 0.996-1debian/0.996-1
Diffstat (limited to 'src/xsane-viewer.c')
| -rw-r--r-- | src/xsane-viewer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xsane-viewer.c b/src/xsane-viewer.c index 57abd98..3ca14f6 100644 --- a/src/xsane-viewer.c +++ b/src/xsane-viewer.c @@ -2536,14 +2536,14 @@ static int xsane_viewer_read_image(Viewer *v) width = image_info.image_width * v->zoom + 26; height = image_info.image_height * v->zoom + 136; - if (width > gdk_screen_width()) + if (width >= gdk_screen_width()) { - width = gdk_screen_width(); + width = gdk_screen_width()-1; } - if (height > gdk_screen_height()) + if (height >= gdk_screen_height()) { - height = gdk_screen_height(); + height = gdk_screen_height()-1; } #ifdef HAVE_GTK2 @@ -2756,14 +2756,14 @@ static int xsane_viewer_read_image(Viewer *v) width = image_info.image_width * v->zoom + 26; height = image_info.image_height * v->zoom + 136; - if (width > gdk_screen_width()) + if (width >= gdk_screen_width()) { - width = gdk_screen_width(); + width = gdk_screen_width()-1; } - if (height > gdk_screen_height()) + if (height >= gdk_screen_height()) { - height = gdk_screen_height(); + height = gdk_screen_height()-1; } #ifdef HAVE_GTK2 |