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

* library.c: Fixed a small problem that caused objects of undefined

Browse Source 
type not beeing downloadable. Now they are downloadable if the Thumb
        type is known.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7209 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Mariusz Woloszyn
2004-05-29 12:13:15 +00:00
parent f5eb78bf10
commit 996db6fed3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camlibs/ptp2/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-05-29 Mariusz Woloszyn
* library.c: Fixed a small problem that caused objects of undefined
type not beeing downloadable. Now they are downloadable if the Thumb
type is known.
2004-05-24 Marcus Meissner <marcus@jet.franken.de>
* library.c: Added Canon PowerShot SD110.

6
camlibs/ptp2/library.c
View File

@@ -1063,9 +1063,11 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
/* we do not allow downloading unknown type files as in most
cases they are special file (like firmware or control) which
sometimes _cannot_ be downloaded. doing so we avoid errors.*/
if ((oi->ObjectFormat == PTP_OFC_Undefined) ||
(oi->ObjectFormat == PTP_OFC_Association))
if (oi->ObjectFormat == PTP_OFC_Association ||
(oi->ObjectFormat == PTP_OFC_Undefined &&
oi->ThumbFormat == PTP_OFC_Undefined))
return (GP_ERROR_NOT_SUPPORTED);
size=oi->ObjectCompressedSize;
CPR (context, ptp_getobject(&camera->pl->params,
camera->pl->params.handles.Handler[object_id],