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

also move IXUS 500 handling to ptp2 driver

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11206 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2008-07-10 09:21:59 +00:00
parent 68a5e1fb8f
commit 681f1435a4
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camlibs/canon/ChangeLog
View File

@@ -1,3 +1,7 @@
2008-07-10 Marcus Meissner <marcus@jet.franken.de>
* canon.c: Also handle IXUS 500 in the ptp2 driver only.
2008-05-16 Moreno Marzolla <moreno.marzolla@pd.infn.it>
* canon.c, library.c: Added beep and zoom configurations.

2
camlibs/canon/canon.c
View File

@@ -269,9 +269,11 @@ const struct canonCamModelData models[] = {
{"Canon:PowerShot S70 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30b1, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
{"Canon:PowerShot S60 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
{"Canon:PowerShot G6 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30b3, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
#if 0 /* also confirmed problematic by Ubuntu users, see https://bugs.launchpad.net/ubuntu/+source/libgphoto2/+bug/158119 */
{"Canon:Digital IXUS 500 (normal mode)",CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
{"Canon:PowerShot S500 Digital ELPH (normal mode)",CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
{"Canon:IXY Digital 500 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
#endif
{"Canon:PowerShot A75", CANON_CLASS_1, 0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
{"Canon:PowerShot SD110 Digital ELPH", CANON_CLASS_1, 0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
{"Canon:Digital IXUS IIs", CANON_CLASS_1, 0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},