diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-01-25 20:30:53 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-01-25 20:30:53 +0000 |
| commit | a3ee73043c5dc7c28b5717fd971917627a7214f2 (patch) | |
| tree | 4249bb9b1b0debbe19c6df749f8d045bcc39a055 /camlibs/dimera/dimera3500.c | |
| parent | ccd327a379d7885389f57f0e8304c4cce948921f (diff) | |
| download | libgphoto2-a3ee73043c5dc7c28b5717fd971917627a7214f2.tar.gz | |
* removed CameraFileInfoFile.name, adjusted users
and callers.
* added filename argument to put_file_func,
set_info_noop and set_file_noop functions.
adjusted all camlibs
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11773 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/dimera/dimera3500.c')
| -rw-r--r-- | camlibs/dimera/dimera3500.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c index 42f0e40f7..20d52ea45 100644 --- a/camlibs/dimera/dimera3500.c +++ b/camlibs/dimera/dimera3500.c @@ -347,9 +347,8 @@ static int get_info_func (CameraFilesystem *fs, const char *folder, const char * info->preview.width = 64; info->preview.height = 48; - info->file.fields = GP_FILE_INFO_ALL; + info->file.fields = GP_FILE_INFO_TYPE|GP_FILE_INFO_PERMISSIONS|GP_FILE_INFO_WIDTH|GP_FILE_INFO_HEIGHT|GP_FILE_INFO_SIZE; strcpy(info->file.type, GP_MIME_PPM); - strcpy(info->file.name, filename); info->file.permissions = GP_FILE_PERM_READ; if (std_res) { @@ -398,9 +397,7 @@ static int camera_capture_preview(Camera *camera, CameraFile *file, GPContext *c data = Dimera_Preview( &size, camera, context); if (!data) return GP_ERROR; - gp_file_set_data_and_size (file, data, size); - - return GP_OK; + return gp_file_set_data_and_size (file, data, size); } static int camera_summary (Camera *camera, CameraText *summary, GPContext *context) { |