darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use camera->model instead of init->model. This is in preparation of a removal of the CameraInit struct. We'll be using CameraPortInfo instead (hopefully).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1501 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-01-08 08:43:21 +00:00
parent 04eec0f531
commit b59e475cbc
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
camlibs/konica/library.c
View File

@@ -200,7 +200,7 @@ camera_init (Camera* camera, CameraInit* init)
for (i = 0; i < 2; i++) {
for (j = 0; ; j++) {
if (models[i][j] == NULL) break;
if (strcmp (models[i][j], init->model) == 0) {
if (strcmp (models[i][j], camera->model) == 0) {
if (i == 1) konica_data->image_id_long = TRUE;
break;
}

2
camlibs/panasonic/dc1000.c
View File

@@ -350,7 +350,7 @@ int camera_init (Camera *camera, CameraInit *init) {
dsc_t *dsc = NULL;
dsc_print_status(camera, "Initializing camera %s", init->model);
dsc_print_status(camera, "Initializing camera %s", camera->model);
/* First, set up all the function pointers */
camera->functions->id = camera_id;

42
camlibs/template/template.c
View File

@@ -32,27 +32,27 @@ int camera_abilities (CameraAbilitiesList *list) {
int camera_init (Camera *camera, CameraInit *init) {
/* First, set up all the function pointers */
camera->functions->id = camera_id;
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->file_put = camera_file_put;
camera->functions->file_delete = camera_file_delete;
camera->functions->config_get = camera_config_get;
camera->functions->config_set = camera_config_set;
camera->functions->folder_config_get = camera_folder_config_get;
camera->functions->folder_config_set = camera_folder_config_set;
camera->functions->file_config_get = camera_file_config_get;
camera->functions->file_config_set = camera_file_config_set;
camera->functions->capture = camera_capture;
camera->functions->summary = camera_summary;
camera->functions->manual = camera_manual;
camera->functions->about = camera_about;
camera->functions->result_as_string = camera_result_as_string;
camera->functions->id = camera_id;
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->file_put = camera_file_put;
camera->functions->file_delete = camera_file_delete;
camera->functions->config_get = camera_config_get;
camera->functions->config_set = camera_config_set;
camera->functions->folder_config_get = camera_folder_config_get;
camera->functions->folder_config_set = camera_folder_config_set;
camera->functions->file_config_get = camera_file_config_get;
camera->functions->file_config_set = camera_file_config_set;
camera->functions->capture = camera_capture;
camera->functions->summary = camera_summary;
camera->functions->manual = camera_manual;
camera->functions->about = camera_about;
camera->functions->result_as_string = camera_result_as_string;
return (GP_OK);
}