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

Don't require a port to be specified when using the "Directory Browse" 

camera, and allow pictures larger than the "resolution" specified in
the config file.
DEVEL_2_0_BRANCH-1
Peter Fales 2002-01-15 04:44:35 +00:00
rodzic af52ccacd5
commit 5f56702871
1 zmienionych plików z 26 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

25
backend/gphoto2.c
Wyświetl plik

@ -406,10 +406,13 @@ init_gphoto2 (void)
CHECK_RET (gp_port_info_list_load (il)); CHECK_RET (gp_port_info_list_load (il));
if ( strcmp (Cam_data.port, "Browse") != 0 )
{
port = gp_port_info_list_lookup_path (il, Cam_data.port); port = gp_port_info_list_lookup_path (il, Cam_data.port);
CHECK_RET (gp_port_info_list_get_info (il, port, &info)); CHECK_RET (gp_port_info_list_get_info (il, port, &info));
CHECK_RET (gp_camera_set_port_info (camera, info)); CHECK_RET (gp_camera_set_port_info (camera, info));
gp_port_info_list_free (il); gp_port_info_list_free (il);
}
DBG (4, "init_gphoto2: about to initialize port\n"); DBG (4, "init_gphoto2: about to initialize port\n");
/* /*
@ -711,6 +714,17 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
/* Special case: Force port to special value for the
* "Directory Browse" camera - overriding anything in
* the config file - or more likely when not specified
* in the config file.
*/
if ( strcmp(Cam_data.camera_name, "Directory Browse") == 0 )
{
Cam_data.port = "Browse";
}
sod[GPHOTO2_OPT_IMAGE_SELECTION].title = strdup (buf); sod[GPHOTO2_OPT_IMAGE_SELECTION].title = strdup (buf);
} }
else if (strcmp (dev_name, "dumpinquiry") == 0) else if (strcmp (dev_name, "dumpinquiry") == 0)
@ -1297,12 +1311,17 @@ sane_start (SANE_Handle handle)
converter_init (); converter_init ();
/* Check if a linebuffer has been allocated. Assumes that highres_width /* Check if a linebuffer has been allocated. If we had one
* is also large enough to hold a lowres or thumbnail image * previously, free it up and allocate one for (possibly) new
* size. parms.bytes_per_line is set by converter_init()
*/ */
if (linebuffer == NULL) if (linebuffer == NULL)
{ {
linebuffer = malloc (highres_width * 3); linebuffer = malloc (parms.bytes_per_line);
}
else {
free(linebuffer);
linebuffer = malloc (parms.bytes_per_line);
} }
if (linebuffer == NULL) if (linebuffer == NULL)
{ {