diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-23 14:31:13 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-23 17:39:39 +0300 |
| commit | ca260d2f5337536e30d1b2501434bd2a93a3e72e (patch) | |
| tree | 7a8af9ad83101ceaae165614c6ae525f4499086f /test | |
| parent | bb5f8cf4951fc5813d60ab806c57c5b5d713f38c (diff) | |
libcamera: Standardise on C compatibility headers
Now that our usage of C compatibility header is documented, use them
consistently through the source code.
While at it, group the C and C++ include statements as defined in the
coding style, and fix a handful of #include ordering issues.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'test')
| -rw-r--r-- | test/ipa/ipa_interface_test.cpp | 3 | ||||
| -rw-r--r-- | test/media_device/media_device_print_test.cpp | 2 | ||||
| -rw-r--r-- | test/pipeline/ipu3/ipu3_pipeline_test.cpp | 1 | ||||
| -rw-r--r-- | test/v4l2_subdevice/test_formats.cpp | 2 | ||||
| -rw-r--r-- | test/v4l2_videodevice/capture_async.cpp | 4 | ||||
| -rw-r--r-- | test/v4l2_videodevice/controls.cpp | 2 | ||||
| -rw-r--r-- | test/v4l2_videodevice/formats.cpp | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 0bdeb167..cafc249b 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -6,13 +6,12 @@ */ #include <fcntl.h> +#include <iostream> #include <string.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -#include <iostream> - #include <libcamera/event_dispatcher.h> #include <libcamera/event_notifier.h> #include <libcamera/timer.h> diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp index 30d929b8..8dd8a151 100644 --- a/test/media_device/media_device_print_test.cpp +++ b/test/media_device/media_device_print_test.cpp @@ -4,8 +4,8 @@ * * media_device_print_test.cpp - Print out media devices */ -#include <iostream> +#include <iostream> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> diff --git a/test/pipeline/ipu3/ipu3_pipeline_test.cpp b/test/pipeline/ipu3/ipu3_pipeline_test.cpp index 8bfcd609..a5c6be09 100644 --- a/test/pipeline/ipu3/ipu3_pipeline_test.cpp +++ b/test/pipeline/ipu3/ipu3_pipeline_test.cpp @@ -6,7 +6,6 @@ */ #include <iostream> - #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> diff --git a/test/v4l2_subdevice/test_formats.cpp b/test/v4l2_subdevice/test_formats.cpp index e90c2c24..5cf5d566 100644 --- a/test/v4l2_subdevice/test_formats.cpp +++ b/test/v4l2_subdevice/test_formats.cpp @@ -5,8 +5,8 @@ * libcamera V4L2 Subdevice format handling test */ -#include <climits> #include <iostream> +#include <limits.h> #include "v4l2_subdevice.h" #include "v4l2_subdevice_test.h" diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index 17eb528b..442a4fe5 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -5,12 +5,12 @@ * libcamera V4L2 API tests */ +#include <iostream> + #include <libcamera/buffer.h> #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> -#include <iostream> - #include "thread.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 975c852b..42c653d4 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -5,8 +5,8 @@ * controls.cpp - V4L2 device controls handling test */ -#include <climits> #include <iostream> +#include <limits.h> #include "v4l2_videodevice.h" diff --git a/test/v4l2_videodevice/formats.cpp b/test/v4l2_videodevice/formats.cpp index ee7d357d..d504d178 100644 --- a/test/v4l2_videodevice/formats.cpp +++ b/test/v4l2_videodevice/formats.cpp @@ -5,8 +5,8 @@ * libcamera V4L2 device format handling test */ -#include <climits> #include <iostream> +#include <limits.h> #include "v4l2_videodevice.h" |