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

disabled canon fast directory

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10028 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2007-03-03 20:39:35 +00:00
parent 52445e17d2
commit deecca6ad2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camlibs/ptp2/ChangeLog
View File

@@ -1,3 +1,8 @@
2007-03-03 Marcus Meissner <marcus@jet.franken.de>
* library.c: Disable Canon fast directory retrieval,
since it reportedly fails with the Canon PowerShot A430.
2007-02-27 Marcus Meissner <marcus@jet.franken.de>
* library.c: If we have a Canon USB device, but with

5
camlibs/ptp2/library.c
View File

@@ -3613,7 +3613,11 @@ init_ptp_fs (Camera *camera, GPContext *context)
return PTP_RC_OK;
}
#if 0
/* CANON also has fast directory retrieval. And it is mostly complete, so we can use it as full replacement */
/* Unfortunately this fails on the PowerShot A430.
* And I don't want to whitelist everyone, because I just don't own all of them.
* *sigh* -Marcus */
if ((params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
ptp_operation_issupported(params,PTP_OC_CANON_GetDirectory))
@@ -3629,6 +3633,7 @@ init_ptp_fs (Camera *camera, GPContext *context)
}
/* fallthrough */
}
#endif
/* Microsoft/MTP also has fast directory retrieval. */
if ((params->deviceinfo.VendorExtensionID == PTP_VENDOR_MICROSOFT) &&