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

cosmetix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6705 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Hans Ulrich Niedermann
2003-09-03 00:18:29 +00:00
parent 37ac7c3c5d
commit 52c2eeded4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
camlibs/canon/library.c
View File

@@ -579,11 +579,11 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
}
#endif /* HAVE_EXIF */
if (*thumbname == '\0') {
/* file internal thumbnail */
/* file internal thumbnail */
ret = canon_int_get_thumbnail (camera, canon_path, &data,
&datalen, context);
} else {
/* extra thumbnail file */
/* extra thumbnail file */
ret = canon_int_get_file (camera, thumbname, &data, &datalen,
context);
}
@@ -635,7 +635,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
}
/* do different things with the data fetched above */
/* FIXME: For which file type(s) should we gp_file_set_name (file, filename);*? */
/* FIXME: For which file type(s) should we gp_file_set_name(file,filename) ? */
switch (type) {
case GP_FILE_TYPE_PREVIEW:
/* Either this camera model does not support EXIF,
@@ -645,7 +645,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
* in data.
*/
ret = canon_int_extract_jpeg_thumb (data, datalen, &thumbdata, &datalen, context);
if (thumbdata != NULL) {
/* free old data */
free (data);
@@ -683,7 +683,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
gp_file_set_mime_type (file, GP_MIME_JPEG);
gp_file_set_data_and_size (file, data, datalen);
break;
#endif /* HAVE_EXIF */
#endif /* HAVE_EXIF */
default:
/* this case should've been caught above anyway */
if (data)