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

2001-12-21 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

Browse Source 
* dc240.c:
          (camera_init): Kill some warnings.
          (camera_capture): Tell the filesystem about the new file.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3558 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-12-21 16:45:45 +00:00
parent 8f622a9e4a
commit da90f34a78
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camlibs/kodak/dc240/ChangeLog
View File

@@ -1,3 +1,9 @@
2001-12-21 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* dc240.c:
(camera_init): Kill some warnings.
(camera_capture): Tell the filesystem about the new file.
2001-12-20 Hubert Figuiere <hfiguiere@teaser.fr>
* library.c (dc240_load_status_data_to_table, dc240_get_status):

20
camlibs/kodak/dc240/dc240.c
View File

@@ -147,10 +147,22 @@ static int
camera_capture (Camera *camera, CameraCaptureType type,
CameraFilePath *path)
{
int result;
if (type != GP_CAPTURE_IMAGE)
return (GP_ERROR_NOT_SUPPORTED);
return dc240_capture(camera, path);
/* Capture the image */
result = dc240_capture (camera, path);
if (result < 0)
return (result);
/* Tell the filesystem about it */
result = gp_filesystem_append (camera->fs, path->folder, path->name);
if (result < 0)
return (result);
return (GP_OK);
}
static int
@@ -229,7 +241,7 @@ camera_init (Camera *camera)
gp_filesystem_set_file_funcs (camera->fs, get_file_func,
delete_file_func, camera);
ret = gp_port_settings_get (camera->port, &settings);
ret = gp_port_get_settings (camera->port, &settings);
if (ret < 0)
return (ret);
switch (camera->port->type) {
@@ -254,11 +266,11 @@ camera_init (Camera *camera)
return (GP_ERROR_UNKNOWN_PORT);
}
ret = gp_port_settings_set (camera->port, settings);
ret = gp_port_set_settings (camera->port, settings);
if (ret < 0)
return (ret);
ret = gp_port_timeout_set (camera->port, TIMEOUT);
ret = gp_port_set_timeout (camera->port, TIMEOUT);
if (ret < 0)
return (ret);