diff -u gscan2pdf-0.9.29/debian/changelog gscan2pdf-0.9.29/debian/changelog --- gscan2pdf-0.9.29/debian/changelog +++ gscan2pdf-0.9.29/debian/changelog @@ -1,3 +1,10 @@ +gscan2pdf (0.9.29-1ubuntu0.1) karmic-proposed; urgency=low + + * Note resolution from libsane-perl frontend + LP: #424249 (locks when trying to save as PDF) + + -- Jeffrey Ratcliffe Fri, 22 Jan 2010 10:33:43 +0100 + gscan2pdf (0.9.29-1) unstable; urgency=low * New upstream release. only in patch2: unchanged: --- gscan2pdf-0.9.29.orig/bin/gscan2pdf +++ gscan2pdf-0.9.29/bin/gscan2pdf @@ -5430,6 +5430,8 @@ # If the scan can't be loaded then blow the scanning dialog away and # show an error + $SETTING{resolution} = defined($SETTING{resolution}) ? $SETTING{resolution} : 72; + print "importing scan with resolution=$SETTING{resolution}\n" if $debug; my $index = import_scan ( File::Spec->catdir($SETTING{session}, "out$n.pnm"), $n, 'Portable anymap', $SETTING{resolution}, TRUE @@ -7141,6 +7143,9 @@ my ($widget, $val); $val = $opt->{val}; +# Note resolution default + $SETTING{resolution} = $val if ($opt->{name} eq SANE_NAME_SCAN_RESOLUTION); + # CheckButton if ($opt->{type} == SANE_TYPE_BOOL) { $widget = Gtk2::CheckButton -> new; @@ -7321,6 +7326,10 @@ unless ($gui_updating) { $gui_updating = TRUE; my ($option, $val) = each(%{$defaults[$i]}); + +# Note resolution default + $SETTING{resolution} = $val if ($option eq SANE_NAME_SCAN_RESOLUTION); + my $widget = $optnamei{$option}; if ($widget->isa('Gtk2::CheckButton')) { if ($widget->get_active != $val) { @@ -7390,6 +7399,9 @@ sub set_option { my ($i, $val, @widgets) = @_; +# Note resolution + $SETTING{resolution} = $val if ($widgets[$i]->{option_name} eq SANE_NAME_SCAN_RESOLUTION); + # Cache option push @{$SETTING{default}{$shash{$sane_thread}{device}}}, {$widgets[$i]->{option_name} => $val};