Attachment #41625 for bug #67238

View | Details | Raw Unified | Return to bug 67238
Collapse All | Expand All

Lines 184-189 Link Here

(-)camlibs/canon/canon.c (+9 lines)
184	/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */	187	/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */
185	{"Canon:PowerShot G5 (normal mode)", CANON_PS_G5, 0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},	188	{"Canon:PowerShot G5 (normal mode)", CANON_PS_G5, 0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
186	{"Canon:PowerShot A80 (normal mode)",CANON_PS_A80, 0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},	189	{"Canon:PowerShot A80 (normal mode)",CANON_PS_A80, 0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		190	{"Canon:PowerShot S60 (normal mode)", CANON_PS_S60, 0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		191	{"Canon:Digital IXUS 500 (normal mode)",CANON_PS_S500, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		192	{"Canon:PowerShot A75", CANON_PS_A75, 0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		193	{"Canon:PowerShot A400", CANON_PS_A400, 0x0DA9, 0x30b7, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		194	{"Canon:PowerShot A310", CANON_PS_A310, 0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		195	{"Canon:PowerShot S410 (normal mode)",CANON_PS_S410, 0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		196	{"Canon:Digital IXUS 430 (normal mode)",CANON_PS_S410, 0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		197	{"Canon:PowerShot A95 (normal mode)",CANON_PS_A95, 0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
		198	{"Canon:PowerShot A85 (normal mode)",CANON_PS_A85, 0x04A9, 0x30be, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
187		199
188	{NULL}	200	{NULL}
189	/* INDENT-ON */	201	/* INDENT-ON */

Lines 68-74 Link Here

(-)camlibs/canon/canon.h (+17 lines)
68	* @CANON_PS_A50: PowerShot A50	68	* @CANON_PS_A50: PowerShot A50
69	* @CANON_PS_A60: PowerShot A60	69	* @CANON_PS_A60: PowerShot A60
70	* @CANON_PS_A70: PowerShot A70	70	* @CANON_PS_A70: PowerShot A70
		71	* @CANON_PS_A75: PowerShot A75
		72	* @CANON_PS_A85: PowerShot A95
71	* @CANON_PS_A80: PowerShot A80	73	* @CANON_PS_A80: PowerShot A80
		74	* @CANON_PS_A95: PowerShot A95
72	* @CANON_PS_PRO70: PowerShot Pro70	75	* @CANON_PS_PRO70: PowerShot Pro70
73	* @CANON_PS_S10: PowerShot S10	76	* @CANON_PS_S10: PowerShot S10
74	* @CANON_PS_S20: PowerShot S20	77	* @CANON_PS_S20: PowerShot S20
Lines 91-101 Link Here
91	* @CANON_PS_A300: PowerShot A300	94	* @CANON_PS_A300: PowerShot A300
92	* @CANON_PS_S200: PowerShot S200, Digital IXUS v2	95	* @CANON_PS_S200: PowerShot S200, Digital IXUS v2
93	* @CANON_PS_S330: Digital IXUS 330	96	* @CANON_PS_S330: Digital IXUS 330
		97	* @CANON_PS_S410: Digital IXUS 430
		98	* @CANON_PS_S500: Digital IXUS 500
94	* @CANON_PS_S45: PowerShot S45	99	* @CANON_PS_S45: PowerShot S45
		100	* @CANON_PS_S60: PowerShot S60
95	* @CANON_PS_G3: PowerShot G3	101	* @CANON_PS_G3: PowerShot G3
96	* @CANON_PS_G5: PowerShot G5	102	* @CANON_PS_G5: PowerShot G5
97	* @CANON_PS_S230: PowerShot S230, Digital IXUS v3	103	* @CANON_PS_S230: PowerShot S230, Digital IXUS v3
98	* @CANON_MV630I: MV630i camcorder	104	* @CANON_MV630I: MV630i camcorder
		105	* @CANON_MV650I: MV650i camcorder
99	* @CANON_EOS_10D: EOS 10D	106	* @CANON_EOS_10D: EOS 10D
100	* @CANON_OPT_10: Optura 10	107	* @CANON_OPT_10: Optura 10
101	* @CANON_OPT_20: Optura 20	108	* @CANON_OPT_20: Optura 20
Lines 109-114 Link Here
109	* @CANON_PS_S50: PowerShot S50	116	* @CANON_PS_S50: PowerShot S50
110	* @CANON_PS_S400: PowerShot S400, Digital IXUS 400	117	* @CANON_PS_S400: PowerShot S400, Digital IXUS 400
111	* @CANON_PS_SD100: PowerShot SD100, Digital IXUS II	118	* @CANON_PS_SD100: PowerShot SD100, Digital IXUS II
		119	* @CANON_PS_A400: PowerShot A400
112	*	120	*
113	* Enumeration of all camera types currently supported.	121	* Enumeration of all camera types currently supported.
114	*	122	*
Lines 119-125 Link Here
119	CANON_PS_A50,	127	CANON_PS_A50,
120	CANON_PS_A60,	128	CANON_PS_A60,
121	CANON_PS_A70,	129	CANON_PS_A70,
		130	CANON_PS_A75,
122	CANON_PS_A80,	131	CANON_PS_A80,
		132	CANON_PS_A85,
		133	CANON_PS_A95,
123	CANON_PS_S10,	134	CANON_PS_S10,
124	CANON_PS_S20,	135	CANON_PS_S20,
125	CANON_PS_S30,	136	CANON_PS_S30,
Lines 141-151 Link Here
141	CANON_PS_A100,	152	CANON_PS_A100,
142	CANON_PS_A200,	153	CANON_PS_A200,
143	CANON_PS_A300,	154	CANON_PS_A300,
		155	CANON_PS_A310,
		156	CANON_PS_A400,
144	CANON_PS_S50,	157	CANON_PS_S50,
145	CANON_PS_S45,	158	CANON_PS_S45,
146	CANON_PS_G3,	159	CANON_PS_G3,
147	CANON_PS_S230,	160	CANON_PS_S230,
148	CANON_MV630I,	161	CANON_MV630I,
		162	CANON_MV650I,
149	CANON_EOS_10D,	163	CANON_EOS_10D,
150	CANON_OPT_200,	164	CANON_OPT_200,
151	/* In Mac OS Image Capture, but not yet seen in the wild. */	165	/* In Mac OS Image Capture, but not yet seen in the wild. */
Lines 156-161 Link Here
156	CANON_PS_UNK5,	170	CANON_PS_UNK5,
157	/* other cameras */	171	/* other cameras */
158	CANON_PS_S400,	172	CANON_PS_S400,
		173	CANON_PS_S410,
		174	CANON_PS_S60,
		175	CANON_PS_S500,
159	CANON_PS_SD100,	176	CANON_PS_SD100,
160	CANON_EOS_300D,	177	CANON_EOS_300D,
161	CANON_PS_G5,	178	CANON_PS_G5,

Return to bug 67238