Skip to content

Commit 4a130f9

Browse files
committed
utils: mojom: Fix build error caused by the mojom tool update
The update to the mojom tool in commit d17de86 causes build errors with gcc 12.2 release builds. One such error is: In file included from src/libcamera/proxy/worker/raspberrypi_ipa_proxy_worker.cpp:18: In static member function ‘static libcamera::ipa::RPi::ProcessParams libcamera::IPADataSerializer<libcamera::ipa::RPi::ProcessParams>::deserialize(std::vector<unsigned char>::const_iterator, std::vector<unsigned char>::const_iterator, libcamera::ControlSerializer*)’, inlined from ‘void IPAProxyRPiWorker::readyRead()’ at src/libcamera/proxy/worker/raspberrypi_ipa_proxy_worker.cpp:302:70: include/libcamera/ipa/raspberrypi_ipa_serializer.h:1172:32: error: ‘*(uint32_t*)((char*)&ret + offsetof(libcamera::ipa::RPi::ProcessParams, libcamera::ipa::RPi::ProcessParams::buffers.libcamera::ipa::RPi::BufferIds::bayer))’ may be used uninitialized [-Werror=maybe-uninitialized] 1172 | return ret; The failure is caused by the new auto-generated IPA interface not initialising POD types to a default value. This is because the updated mojom library uses a new mojom.ValueKind class to represent POD types, whereas the interface generator script uses the mojom.Kind class, which is correct for the older mojom library. Fix this breakage by switching the interface generator script to use mojom.ValueKind to test for POD types. Fixes: d17de86 ("utils: ipc: Update mojo") Signed-off-by: Naushir Patuck <[email protected]>
1 parent e41f899 commit 4a130f9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

utils/ipc/generators/mojom_libcamera_generator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def ParamsCommaSep(l):
7272
def GetDefaultValue(element):
7373
if element.default is not None:
7474
return element.default
75-
if type(element.kind) == mojom.Kind:
75+
if type(element.kind) == mojom.ValueKind:
7676
return '0'
7777
if IsFlags(element):
7878
return ''

0 commit comments

Comments
 (0)