]>
Commit | Line | Data |
---|---|---|
3792ff88 JB |
1 | --- camwire2-2.0.0-Source/camwire/camwire_handle.h.orig 2015-05-21 23:48:01.000000000 +0200 |
2 | +++ camwire2-2.0.0-Source/camwire/camwire_handle.h 2019-08-08 15:40:40.958729338 +0200 | |
3 | @@ -74,11 +74,11 @@ | |
4 | /* This is the Camwire handle type. */ | |
5 | ||
6 | ||
7 | -inline Camera_handle camwire_handle_get_camera(const Camwire_handle c_handle); | |
8 | +Camera_handle camwire_handle_get_camera(const Camwire_handle c_handle); | |
9 | /* Returns the dc1394camera_t camera handle for the given camwire | |
10 | handle. Needed by many dc1394 functions in Camwire. */ | |
11 | ||
12 | -inline User_handle camwire_bus_get_userdata(const Camwire_handle c_handle); | |
13 | +User_handle camwire_bus_get_userdata(const Camwire_handle c_handle); | |
14 | /* Returns a pointer to the user data structure for the given camwire | |
15 | handle. Needed for internal status maintenance in Camwire. */ | |
16 | ||
17 | --- camwire2-2.0.0-Source/camwire/camwirebus.c.orig 2015-05-21 23:39:48.000000000 +0200 | |
18 | +++ camwire2-2.0.0-Source/camwire/camwirebus.c 2019-08-08 15:41:09.205242980 +0200 | |
19 | @@ -203,7 +203,7 @@ | |
20 | Returns the dc1394camera_t camera handle for the given camwire | |
21 | handle. Needed by many dc1394 functions in Camwire. | |
22 | */ | |
23 | -inline Camera_handle camwire_handle_get_camera(const Camwire_handle c_handle) | |
24 | +Camera_handle camwire_handle_get_camera(const Camwire_handle c_handle) | |
25 | { | |
26 | return c_handle->camera; | |
27 | } | |
28 | @@ -213,7 +213,7 @@ | |
29 | Returns a pointer to the user data structure for the given camwire | |
30 | handle. Needed for internal status maintenance in Camwire. | |
31 | */ | |
32 | -inline User_handle camwire_bus_get_userdata( | |
33 | +User_handle camwire_bus_get_userdata( | |
34 | const Camwire_handle c_handle) | |
35 | { | |
36 | return c_handle->userdata; | |
37 | --- camwire2-2.0.0-Source/examples/measureconf_1394.c.orig 2012-01-10 23:20:53.000000000 +0100 | |
38 | +++ camwire2-2.0.0-Source/examples/measureconf_1394.c 2019-08-08 15:47:50.856400383 +0200 | |
39 | @@ -202,7 +202,6 @@ | |
40 | const int mode); | |
41 | /* inline static int fixed_image_size(const dc1394video_mode_t video_mode); */ | |
42 | inline static int variable_image_size(const dc1394video_mode_t video_mode); | |
43 | -inline dc1394camera_t * get_camera(const Camwire_handle c_handle); | |
44 | ||
45 | ||
46 | /* |