mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Bug fixes identified by tstbackend

DEVEL_2_0_BRANCH-1
Peter Fales 2002-04-27 03:57:12 +00:00
rodzic b971a2cb59
commit 88e99b89de
2 zmienionych plików z 91 dodań i 48 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

94
backend/dc240.c
Wyświetl plik

@ -1010,19 +1010,20 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
{
SANE_Status status;
if (option < 0 || option >= NELEMS (sod))
return SANE_STATUS_INVAL; /* Unknown option ... */
/* Need to put this DBG line after the range check on option */
DBG (127, "control_option(handle=%p,opt=%s,act=%s,val=%p,info=%p)\n",
handle, sod[option].title,
(action ==
SANE_ACTION_SET_VALUE ? "SET" : (action ==
SANE_ACTION_GET_VALUE ? "GET" :
"SETAUTO")), value, (void *)info);
"SETAUTO")), value, (void *) info);
if (handle != MAGIC || !is_open)
return SANE_STATUS_INVAL; /* Unknown handle ... */
if (option < 0 || option >= NELEMS (sod))
return SANE_STATUS_INVAL; /* Unknown option ... */
switch (action)
{
case SANE_ACTION_SET_VALUE:
@ -1047,7 +1048,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
switch (option)
{
case DC240_OPT_IMAGE_NUMBER:
if (*(SANE_Word *) value <= Camera.pic_taken)
if (*(SANE_Word *) value <= Camera.pic_taken)
Camera.current_picture_number = *(SANE_Word *) value;
else
Camera.current_picture_number = Camera.pic_taken;
@ -1078,16 +1079,17 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
break;
case DC240_OPT_SNAP:
switch ( *(SANE_Bool *) value ) {
case SANE_TRUE:
dc240_opt_snap = SANE_TRUE;
break;
case SANE_FALSE:
dc240_opt_snap = SANE_FALSE;
break;
default:
return SANE_STATUS_INVAL;
}
switch (*(SANE_Bool *) value)
{
case SANE_TRUE:
dc240_opt_snap = SANE_TRUE;
break;
case SANE_FALSE:
dc240_opt_snap = SANE_FALSE;
break;
default:
return SANE_STATUS_INVAL;
}
/* Snap forces new image size and changes image range */
@ -1226,7 +1228,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
}
}
if (info && action == SANE_ACTION_SET_VALUE)
if (info && action == SANE_ACTION_SET_VALUE)
{
*info = myinfo;
myinfo = 0;
@ -1300,6 +1302,11 @@ METHODDEF (void) jpeg_skip_input_data (j_decompress_ptr cinfo, long num_bytes)
src->pub.bytes_in_buffer -= (size_t) num_bytes;
}
static SANE_Byte linebuffer[HIGHRES_WIDTH * 3];
static SANE_Int linebuffer_size = 0;
static SANE_Int linebuffer_index = 0;
METHODDEF (void)
jpeg_term_source (j_decompress_ptr UNUSEDARG cinfo)
{
@ -1443,6 +1450,8 @@ sane_start (SANE_Handle handle)
(void) jpeg_start_decompress (&cinfo);
row_stride = cinfo.output_width * cinfo.output_components;
linebuffer_size = 0;
linebuffer_index = 0;
}
Camera.scanning = SANE_TRUE; /* don't overlap scan requests */
@ -1450,10 +1459,6 @@ sane_start (SANE_Handle handle)
return SANE_STATUS_GOOD;
}
static SANE_Byte linebuffer[HIGHRES_WIDTH * 3];
static SANE_Int linebuffer_size = 0;
static SANE_Int linebuffer_index = 0;
SANE_Status
sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
SANE_Int max_length, SANE_Int * length)
@ -1461,7 +1466,7 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
SANE_Int lines = 0;
SANE_Char filename_buf[256];
if ( Camera.scanning == SANE_FALSE )
if (Camera.scanning == SANE_FALSE)
{
return SANE_STATUS_INVAL;
}
@ -1483,6 +1488,8 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
if (cinfo.output_scanline >= cinfo.output_height)
{
*length = 0;
/* clean up comms with the camera */
if (end_of_data (Camera.fd) == -1)
{
@ -1503,9 +1510,10 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
image_range.max--;
myinfo |= SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS;
strcpy((char *)filename_buf, strrchr((char *)name_buf+1,'\\')+1 );
strcpy(strrchr((char *)filename_buf,'.'),"JPG");
dir_delete ((SANE_String) filename_buf );
strcpy ((char *) filename_buf,
strrchr ((char *) name_buf + 1, '\\') + 1);
strcpy (strrchr ((char *) filename_buf, '.'), "JPG");
dir_delete ((SANE_String) filename_buf);
}
if (dc240_opt_autoinc)
@ -1548,8 +1556,36 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
void
sane_cancel (SANE_Handle UNUSEDARG handle)
{
unsigned char cancel_byte[] = { 0xe4 };
if (Camera.scanning)
{
/* Flush any pending data from the camera before continuing */
{
SANE_Int n;
SANE_Char flush[1024];
do
{
sleep (1);
n = read (Camera.fd, flush, 1024);
if (n > 0)
{
DBG (127, "%s: flushed %d bytes\n", "sane_cancel", n);
}
else
{
DBG (127, "%s: nothing to flush\n", "sane_cancel");
}
}
while (n > 0);
}
if (cinfo.output_scanline < cinfo.output_height)
{
write (Camera.fd, cancel_byte, 1);
}
Camera.scanning = SANE_FALSE; /* done with scan */
}
else
@ -1563,16 +1599,16 @@ sane_set_io_mode (SANE_Handle UNUSEDARG handle, SANE_Bool
/* sane_set_io_mode() is only valid during a scan */
if (Camera.scanning)
{
if ( non_blocking == SANE_FALSE )
{
if (non_blocking == SANE_FALSE)
{
return SANE_STATUS_GOOD;
}
else
{
{
return SANE_STATUS_UNSUPPORTED;
}
}
}
else
else
{
/* We aren't currently scanning */
return SANE_STATUS_INVAL;

45
backend/gphoto2.c
Wyświetl plik

@ -1014,6 +1014,10 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
{
SANE_Status status;
if (option < 0 || option >= NELEMS (sod))
return SANE_STATUS_INVAL; /* Unknown option ... */
/* Need to put this DBG line after the range check on option */
DBG (127, "control_option(handle=%p,opt=%s,act=%s,val=%p,info=%p)\n",
handle, sod[option].title,
(action ==
@ -1092,16 +1096,17 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
break;
case GPHOTO2_OPT_SNAP:
switch ( *(SANE_Bool *) value ) {
case SANE_TRUE:
gphoto2_opt_snap = SANE_TRUE;
break;
case SANE_FALSE:
gphoto2_opt_snap = SANE_FALSE;
break;
default:
return SANE_STATUS_INVAL;
}
switch (*(SANE_Bool *) value)
{
case SANE_TRUE:
gphoto2_opt_snap = SANE_TRUE;
break;
case SANE_FALSE:
gphoto2_opt_snap = SANE_FALSE;
break;
default:
return SANE_STATUS_INVAL;
}
/* Snap forces new image size and changes image range */
@ -1413,7 +1418,9 @@ sane_start (SANE_Handle handle)
CHECK_RET (gp_file_get_mime_type (data_file, &mime_type));
if (strcmp (GP_MIME_JPEG, mime_type) != 0)
{
DBG (0, "FIXME - Only jpeg files currently supported, can't do %s for file %s/%s\n",mime_type, cmdbuf, filename );
DBG (0,
"FIXME - Only jpeg files currently supported, can't do %s for file %s/%s\n",
mime_type, cmdbuf, filename);
return SANE_STATUS_INVAL;
}
@ -1452,7 +1459,7 @@ SANE_Status
sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
SANE_Int max_length, SANE_Int * length)
{
if ( Cam_data.scanning == SANE_FALSE )
if (Cam_data.scanning == SANE_FALSE)
{
return SANE_STATUS_INVAL;
}
@ -1523,16 +1530,16 @@ sane_set_io_mode (SANE_Handle UNUSEDARG handle, SANE_Bool
/* sane_set_io_mode() is only valid during a scan */
if (Cam_data.scanning)
{
if ( non_blocking == SANE_FALSE )
{
if (non_blocking == SANE_FALSE)
{
return SANE_STATUS_GOOD;
}
else
{
{
return SANE_STATUS_UNSUPPORTED;
}
}
}
else
else
{
/* We aren't currently scanning */
return SANE_STATUS_INVAL;
@ -1954,6 +1961,6 @@ converter_init (void)
parms.pixels_per_line = cinfo.output_width;
parms.lines = cinfo.output_height;
linebuffer_size=0;
linebuffer_index=0;
linebuffer_size = 0;
linebuffer_index = 0;
}