kopia lustrzana https://gitlab.com/sane-project/frontends
Don't remove imput tags that haven't been added. Don't hang when EOF and
non-blocking. Henning Meier-Geinitz <henning@meier-geinitz.de>DEVEL_2_0_BRANCH-1
rodzic
fd73a53e6a
commit
f5b92b13df
|
@ -1,3 +1,8 @@
|
||||||
|
2002-04-06 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||||
|
|
||||||
|
* src/preview.c src/xscanimage.c: Don't remove imput tags that
|
||||||
|
haven't been added. Don't hang when EOF and non-blocking.
|
||||||
|
|
||||||
2002-04-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
2002-04-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||||
|
|
||||||
* src/preview.c: Used guint types instead of u_int. Set order of pixels
|
* src/preview.c: Used guint types instead of u_int. Set order of pixels
|
||||||
|
|
|
@ -542,8 +542,17 @@ input_available (gpointer data, gint source, GdkInputCondition cond)
|
||||||
display_image (p);
|
display_image (p);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gdk_input_remove (p->input_tag);
|
if (p->input_tag < 0)
|
||||||
p->input_tag = -1;
|
{
|
||||||
|
display_maybe (p);
|
||||||
|
while (gtk_events_pending ())
|
||||||
|
gtk_main_iteration ();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gdk_input_remove (p->input_tag);
|
||||||
|
p->input_tag = -1;
|
||||||
|
}
|
||||||
scan_start (p);
|
scan_start (p);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -557,8 +566,18 @@ input_available (gpointer data, gint source, GdkInputCondition cond)
|
||||||
scan_done (p);
|
scan_done (p);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!len)
|
if (!len) /* out of data for now */
|
||||||
break; /* out of data for now */
|
{
|
||||||
|
if (p->input_tag < 0)
|
||||||
|
{
|
||||||
|
display_maybe (p);
|
||||||
|
while (gtk_events_pending ())
|
||||||
|
gtk_main_iteration ();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
switch (p->params.format)
|
switch (p->params.format)
|
||||||
{
|
{
|
||||||
|
|
|
@ -602,8 +602,16 @@ input_available (gpointer data, gint source, GdkInputCondition cond)
|
||||||
{
|
{
|
||||||
if (!scan_win.param.last_frame)
|
if (!scan_win.param.last_frame)
|
||||||
{
|
{
|
||||||
gdk_input_remove (scan_win.input_tag);
|
if (scan_win.input_tag < 0)
|
||||||
scan_win.input_tag = -1;
|
{
|
||||||
|
while (gtk_events_pending ())
|
||||||
|
gtk_main_iteration ();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gdk_input_remove (scan_win.input_tag);
|
||||||
|
scan_win.input_tag = -1;
|
||||||
|
}
|
||||||
scan_start ();
|
scan_start ();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -617,8 +625,18 @@ input_available (gpointer data, gint source, GdkInputCondition cond)
|
||||||
scan_done ();
|
scan_done ();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!len)
|
if (!len) /* out of data for now */
|
||||||
break; /* out of data for now */
|
{
|
||||||
|
if (scan_win.input_tag < 0)
|
||||||
|
{
|
||||||
|
while (gtk_events_pending ())
|
||||||
|
gtk_main_iteration ();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
scan_win.bytes_read += len;
|
scan_win.bytes_read += len;
|
||||||
progress_update (scan_win.progress,
|
progress_update (scan_win.progress,
|
||||||
scan_win.bytes_read / (gfloat) scan_win.num_bytes);
|
scan_win.bytes_read / (gfloat) scan_win.num_bytes);
|
||||||
|
|
Ładowanie…
Reference in New Issue