1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- kipi-plugins/kameraklient/gpcamera.cpp.orig Sat Dec 16 15:12:23 2006
+++ kipi-plugins/kameraklient/gpcamera.cpp Sat Dec 16 15:16:23 2006
@@ -561,7 +561,7 @@
}
int GPCamera::autoDetect(QString& model, QString& port) {
- ::CameraList camList;
+ ::CameraList *camList;
CameraAbilitiesList *abilList;
GPPortInfoList *infoList;
const char *camModel_, *camPort_;
@@ -569,27 +569,29 @@
context = gp_context_new ();
+ gp_list_new (&camList);
gp_abilities_list_new (&abilList);
gp_abilities_list_load (abilList, context);
gp_port_info_list_new (&infoList);
gp_port_info_list_load (infoList);
- gp_abilities_list_detect (abilList, infoList, &camList, context);
+ gp_abilities_list_detect (abilList, infoList, camList, context);
gp_abilities_list_free (abilList);
gp_port_info_list_free (infoList);
gp_context_unref( context );
- int count = gp_list_count (&camList);
+ int count = gp_list_count (camList);
if (count<=0) {
return -1;
}
for (int i = 0; i < count; i++) {
- gp_list_get_name (&camList, i, &camModel_);
- gp_list_get_value (&camList, i, &camPort_);
+ gp_list_get_name (camList, i, &camModel_);
+ gp_list_get_value (camList, i, &camPort_);
}
model = camModel_;
port = camPort_;
+ gp_list_unref (camList);
return 0;
}
|
