]>
Commit | Line | Data |
---|---|---|
42338f77 JB |
1 | --- camwire2-2.0.0-Source/camwire/camwire.c.orig 2015-05-21 23:38:31.000000000 +0200 |
2 | +++ camwire2-2.0.0-Source/camwire/camwire.c 2023-07-09 13:17:11.497358571 +0200 | |
3 | @@ -3098,13 +3098,10 @@ int camwire_debug_print_status(const Cam | |
4 | else | |
5 | fprintf(stderr, " (null)\n"); | |
6 | fprintf(stderr, "features:"); | |
7 | - if (internal_status->feature_set.feature) | |
8 | { | |
9 | fprintf(stderr, "\n"); | |
10 | dc1394_feature_print_all(&(internal_status->feature_set), stderr); | |
11 | } | |
12 | - else | |
13 | - fprintf(stderr, " (null)\n"); | |
14 | fprintf(stderr, "frame:"); | |
15 | capture_frame = internal_status->frame; | |
16 | if (capture_frame) | |
17 | @@ -5130,7 +5128,7 @@ static uint32_t convert_framerate2numpac | |
18 | Returns the libdc1394 colour coding ID that supports the given pixel | |
19 | coding, or 0 on error. The coding_list argument must not be empty. | |
20 | */ | |
21 | -static uint32_t convert_pixelcoding2colorid(const Camwire_pixel coding, | |
22 | +static dc1394color_coding_t convert_pixelcoding2colorid(const Camwire_pixel coding, | |
23 | const dc1394color_codings_t *coding_list) | |
24 | { | |
25 | switch (coding) | |
26 | --- camwire2-2.0.0-Source/examples/cammonitor/cammonitor.c.orig 2023-07-09 13:33:19.929405910 +0200 | |
27 | +++ camwire2-2.0.0-Source/examples/cammonitor/cammonitor.c 2023-07-09 18:09:53.211009381 +0200 | |
28 | @@ -1817,7 +1817,7 @@ static int set_colour_corr(const Camwire | |
29 | Returns the colour correction coefficients obtained from the user, | |
30 | after setting the camera accordingly. | |
31 | */ | |
32 | -static void set_colour_coef(const Camwire_handle c_handle, double coef[]) | |
33 | +static void set_colour_coef(const Camwire_handle c_handle, double coef[9]) | |
34 | { | |
35 | int gotinput; | |
36 |