NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: includes: Formatting improvements

Browse source 
The LSP autoformatter doesn't like some of the current formatting, let's
make it happier.  Note that not all of its suggestions were accepted
because readability is preferred and adjusting .clang-format may not be
easy or possible.

Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Milan Zamazal 2024-09-02 17:42:11 +02:00 • committed by Laurent Pinchart
parent e2cace52d5
commit ac1c57fcf5
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/base/utils.h
View file

@ -12,8 +12,8 @@
#include <iterator> #include <iterator>
#include <ostream> #include <ostream>
#include <sstream> #include <sstream>
#include <string>
#include <string.h> #include <string.h>
#include <string>
#include <sys/time.h> #include <sys/time.h>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>

7
include/libcamera/internal/ipa_data_serializer.h
View file

@ -18,6 +18,7 @@
#include <libcamera/control_ids.h> #include <libcamera/control_ids.h>
#include <libcamera/framebuffer.h> #include <libcamera/framebuffer.h>
#include <libcamera/geometry.h> #include <libcamera/geometry.h>
#include <libcamera/ipa/ipa_interface.h> #include <libcamera/ipa/ipa_interface.h>
#include "libcamera/internal/control_serializer.h" #include "libcamera/internal/control_serializer.h"
@ -161,7 +162,7 @@ public:
std::vector<SharedFD>::const_iterator fdIter = fdsBegin; std::vector<SharedFD>::const_iterator fdIter = fdsBegin;
for (uint32_t i = 0; i < vecLen; i++) { for (uint32_t i = 0; i < vecLen; i++) {
uint32_t sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd); uint32_t sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);
uint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd); uint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);
dataIter += 8; dataIter += 8;
ret[i] = IPADataSerializer<V>::deserialize(dataIter, ret[i] = IPADataSerializer<V>::deserialize(dataIter,
@ -268,7 +269,7 @@ public:
std::vector<SharedFD>::const_iterator fdIter = fdsBegin; std::vector<SharedFD>::const_iterator fdIter = fdsBegin;
for (uint32_t i = 0; i < mapLen; i++) { for (uint32_t i = 0; i < mapLen; i++) {
uint32_t sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd); uint32_t sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);
uint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd); uint32_t sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);
dataIter += 8; dataIter += 8;
K key = IPADataSerializer<K>::deserialize(dataIter, K key = IPADataSerializer<K>::deserialize(dataIter,
@ -280,7 +281,7 @@ public:
dataIter += sizeofData; dataIter += sizeofData;
fdIter += sizeofFds; fdIter += sizeofFds;
sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd); sizeofData = readPOD<uint32_t>(dataIter, 0, dataEnd);
sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd); sizeofFds = readPOD<uint32_t>(dataIter, 4, dataEnd);
dataIter += 8; dataIter += 8;
const V value = IPADataSerializer<V>::deserialize(dataIter, const V value = IPADataSerializer<V>::deserialize(dataIter,