Message ID | 20211229222258.12691-1-laurent.pinchart@ideasonboard.com |
---|---|
State | Accepted |
Commit | 46b32fa0e48aed16778c6e8d324d65473fbd06b7 |
Headers | show |
Series |
|
Related | show |
Hi Laurent, Thank you for the patch On 12/30/21 3:52 AM, Laurent Pinchart wrote: > The ASSERT() macro integrates with the logging infrastructure, use it to > replace assert(). > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com> > --- > src/libcamera/controls.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp > index 0d8c0a5c39c9..03ac6345247c 100644 > --- a/src/libcamera/controls.cpp > +++ b/src/libcamera/controls.cpp > @@ -527,7 +527,7 @@ ControlInfo::ControlInfo(Span<const ControlValue> values, > ControlInfo::ControlInfo(std::set<bool> values, bool def) > : min_(false), max_(true), def_(def), values_({ false, true }) > { > - assert(values.count(def) && values.size() == 2); > + ASSERT(values.count(def) && values.size() == 2); > } > > /** > > base-commit: 030e6f389e2d0fa3f10a47634f3609378ccaf70e > prerequisite-patch-id: 2c7bab8c8f15090cf10a19aaed62e33de1264351 > prerequisite-patch-id: 10478d16a049f895236c9b7bafcbe6d3a9b69ef9 > prerequisite-patch-id: f6f3784841cc8648c6b6cfdd12b7903751856f75 > prerequisite-patch-id: 41c39d0df627b7c1856cc8bc4d099f408983d6cd > prerequisite-patch-id: 80397d3462f248e4ca0e9f3bcb2d793178b03142 > prerequisite-patch-id: 490c8f45203ef4d2281bddf2b36855ed99e1b2a4 > prerequisite-patch-id: 06537d8dd2471934bca5772ddb6556a85a32ee9c > prerequisite-patch-id: e1c7842e5c488f6d3790a9c45b69974d8624dce4 > prerequisite-patch-id: 55a68f42975a115ab642766965a5e6c8f2c07026 > prerequisite-patch-id: 8601bcfa3c7da8d9984ac08e182610b5b52cbba9 > prerequisite-patch-id: 8bb54baf7b5a46c0d14606c2f1020e943633954e > prerequisite-patch-id: f9b1926bdaa91bb4879b8e28f6849df8d6a9ae64 > prerequisite-patch-id: 2c928f3693350ad60bff02897240e379ab8fab1a
Quoting Laurent Pinchart (2021-12-29 22:22:58) > The ASSERT() macro integrates with the logging infrastructure, use it to > replace assert(). > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > src/libcamera/controls.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp > index 0d8c0a5c39c9..03ac6345247c 100644 > --- a/src/libcamera/controls.cpp > +++ b/src/libcamera/controls.cpp > @@ -527,7 +527,7 @@ ControlInfo::ControlInfo(Span<const ControlValue> values, > ControlInfo::ControlInfo(std::set<bool> values, bool def) > : min_(false), max_(true), def_(def), values_({ false, true }) > { > - assert(values.count(def) && values.size() == 2); > + ASSERT(values.count(def) && values.size() == 2); > } > > /** > > base-commit: 030e6f389e2d0fa3f10a47634f3609378ccaf70e > prerequisite-patch-id: 2c7bab8c8f15090cf10a19aaed62e33de1264351 > prerequisite-patch-id: 10478d16a049f895236c9b7bafcbe6d3a9b69ef9 > prerequisite-patch-id: f6f3784841cc8648c6b6cfdd12b7903751856f75 > prerequisite-patch-id: 41c39d0df627b7c1856cc8bc4d099f408983d6cd > prerequisite-patch-id: 80397d3462f248e4ca0e9f3bcb2d793178b03142 > prerequisite-patch-id: 490c8f45203ef4d2281bddf2b36855ed99e1b2a4 > prerequisite-patch-id: 06537d8dd2471934bca5772ddb6556a85a32ee9c > prerequisite-patch-id: e1c7842e5c488f6d3790a9c45b69974d8624dce4 > prerequisite-patch-id: 55a68f42975a115ab642766965a5e6c8f2c07026 > prerequisite-patch-id: 8601bcfa3c7da8d9984ac08e182610b5b52cbba9 > prerequisite-patch-id: 8bb54baf7b5a46c0d14606c2f1020e943633954e > prerequisite-patch-id: f9b1926bdaa91bb4879b8e28f6849df8d6a9ae64 > prerequisite-patch-id: 2c928f3693350ad60bff02897240e379ab8fab1a > -- > Regards, > > Laurent Pinchart >
diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 0d8c0a5c39c9..03ac6345247c 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -527,7 +527,7 @@ ControlInfo::ControlInfo(Span<const ControlValue> values, ControlInfo::ControlInfo(std::set<bool> values, bool def) : min_(false), max_(true), def_(def), values_({ false, true }) { - assert(values.count(def) && values.size() == 2); + ASSERT(values.count(def) && values.size() == 2); } /**
The ASSERT() macro integrates with the logging infrastructure, use it to replace assert(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/libcamera/controls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 030e6f389e2d0fa3f10a47634f3609378ccaf70e prerequisite-patch-id: 2c7bab8c8f15090cf10a19aaed62e33de1264351 prerequisite-patch-id: 10478d16a049f895236c9b7bafcbe6d3a9b69ef9 prerequisite-patch-id: f6f3784841cc8648c6b6cfdd12b7903751856f75 prerequisite-patch-id: 41c39d0df627b7c1856cc8bc4d099f408983d6cd prerequisite-patch-id: 80397d3462f248e4ca0e9f3bcb2d793178b03142 prerequisite-patch-id: 490c8f45203ef4d2281bddf2b36855ed99e1b2a4 prerequisite-patch-id: 06537d8dd2471934bca5772ddb6556a85a32ee9c prerequisite-patch-id: e1c7842e5c488f6d3790a9c45b69974d8624dce4 prerequisite-patch-id: 55a68f42975a115ab642766965a5e6c8f2c07026 prerequisite-patch-id: 8601bcfa3c7da8d9984ac08e182610b5b52cbba9 prerequisite-patch-id: 8bb54baf7b5a46c0d14606c2f1020e943633954e prerequisite-patch-id: f9b1926bdaa91bb4879b8e28f6849df8d6a9ae64 prerequisite-patch-id: 2c928f3693350ad60bff02897240e379ab8fab1a