| Message ID | 20240508145131.1452305-1-paul.elder@ideasonboard.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series |
|
| Related | show |
On Wed, May 08, 2024 at 11:51:31PM +0900, Paul Elder wrote: > Remove a stray semicolon and fix the declaration of V4L2SubdeviceFormat > from class to struct as it should be, to fix compilation errors on clang > 17. > > Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> > --- > src/libcamera/pipeline/rkisp1/rkisp1_source.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_source.h b/src/libcamera/pipeline/rkisp1/rkisp1_source.h > index 5a49e9d3..67bc287f 100644 > --- a/src/libcamera/pipeline/rkisp1/rkisp1_source.h > +++ b/src/libcamera/pipeline/rkisp1/rkisp1_source.h > @@ -24,7 +24,7 @@ class DelayedControls; > class MediaEntity; > class SensorConfiguration; > class V4L2Subdevice; > -class V4L2SubdeviceFormat; > +struct V4L2SubdeviceFormat; > > class RkISP1Source > { > @@ -35,7 +35,7 @@ public: > int init(); > std::unique_ptr<DelayedControls> initDelayedControls(); > > - bool isTPG() const { return !!tpg_; }; > + bool isTPG() const { return !!tpg_; } There's no isTPG() upstream. > > const std::string &model() const { return model_; } > const std::string &id() const { return id_; }
On Wed, May 08, 2024 at 06:27:27PM +0300, Laurent Pinchart wrote: > On Wed, May 08, 2024 at 11:51:31PM +0900, Paul Elder wrote: > > Remove a stray semicolon and fix the declaration of V4L2SubdeviceFormat > > from class to struct as it should be, to fix compilation errors on clang > > 17. > > > > Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> > > --- > > src/libcamera/pipeline/rkisp1/rkisp1_source.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_source.h b/src/libcamera/pipeline/rkisp1/rkisp1_source.h > > index 5a49e9d3..67bc287f 100644 > > --- a/src/libcamera/pipeline/rkisp1/rkisp1_source.h > > +++ b/src/libcamera/pipeline/rkisp1/rkisp1_source.h > > @@ -24,7 +24,7 @@ class DelayedControls; > > class MediaEntity; > > class SensorConfiguration; > > class V4L2Subdevice; > > -class V4L2SubdeviceFormat; > > +struct V4L2SubdeviceFormat; > > > > class RkISP1Source > > { > > @@ -35,7 +35,7 @@ public: > > int init(); > > std::unique_ptr<DelayedControls> initDelayedControls(); > > > > - bool isTPG() const { return !!tpg_; }; > > + bool isTPG() const { return !!tpg_; } > > There's no isTPG() upstream. ...there's no RkISP1Source at all upstream... oops Paul > > > > > const std::string &model() const { return model_; } > > const std::string &id() const { return id_; }
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_source.h b/src/libcamera/pipeline/rkisp1/rkisp1_source.h index 5a49e9d3..67bc287f 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_source.h +++ b/src/libcamera/pipeline/rkisp1/rkisp1_source.h @@ -24,7 +24,7 @@ class DelayedControls; class MediaEntity; class SensorConfiguration; class V4L2Subdevice; -class V4L2SubdeviceFormat; +struct V4L2SubdeviceFormat; class RkISP1Source { @@ -35,7 +35,7 @@ public: int init(); std::unique_ptr<DelayedControls> initDelayedControls(); - bool isTPG() const { return !!tpg_; }; + bool isTPG() const { return !!tpg_; } const std::string &model() const { return model_; } const std::string &id() const { return id_; }
Remove a stray semicolon and fix the declaration of V4L2SubdeviceFormat from class to struct as it should be, to fix compilation errors on clang 17. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> --- src/libcamera/pipeline/rkisp1/rkisp1_source.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)