[libcamera-devel] libcamera: Fix typo in a function name for camera lens class
diff mbox series

Message ID 20220309152614.776224-1-jeanmichel.hautbois@ideasonboard.com
State Accepted
Commit ed13310b1fe4c531d6a830c69fbbe0b544d805bd
Headers show
Series
  • [libcamera-devel] libcamera: Fix typo in a function name for camera lens class
Related show

Commit Message

Jean-Michel Hautbois March 9, 2022, 3:26 p.m. UTC
The CameraLens class implements a function named "setFocusPostion".
There is a typo here, fix it.
While at it fix it in the IPU3 IPA as it is used only here.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
---
 include/libcamera/internal/camera_lens.h | 2 +-
 src/libcamera/camera_lens.cpp            | 2 +-
 src/libcamera/pipeline/ipu3/ipu3.cpp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Nicolas Dufresne via libcamera-devel March 9, 2022, 3:31 p.m. UTC | #1
Quoting Jean-Michel Hautbois via libcamera-devel (2022-03-09 15:26:14)
> The CameraLens class implements a function named "setFocusPostion".
> There is a typo here, fix it.
> While at it fix it in the IPU3 IPA as it is used only here.
> 
> Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>


Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  include/libcamera/internal/camera_lens.h | 2 +-
>  src/libcamera/camera_lens.cpp            | 2 +-
>  src/libcamera/pipeline/ipu3/ipu3.cpp     | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/libcamera/internal/camera_lens.h b/include/libcamera/internal/camera_lens.h
> index 6f2ea1bc..ff4d066e 100644
> --- a/include/libcamera/internal/camera_lens.h
> +++ b/include/libcamera/internal/camera_lens.h
> @@ -24,7 +24,7 @@ public:
>         ~CameraLens();
>  
>         int init();
> -       int setFocusPostion(int32_t position);
> +       int setFocusPosition(int32_t position);
>  
>         const std::string &model() const { return model_; }
>  
> diff --git a/src/libcamera/camera_lens.cpp b/src/libcamera/camera_lens.cpp
> index 189cb025..810fcffa 100644
> --- a/src/libcamera/camera_lens.cpp
> +++ b/src/libcamera/camera_lens.cpp
> @@ -84,7 +84,7 @@ int CameraLens::init()
>   *
>   * \return 0 on success or -EINVAL otherwise
>   */
> -int CameraLens::setFocusPostion(int32_t position)
> +int CameraLens::setFocusPosition(int32_t position)
>  {
>         ControlList lensCtrls(subdev_->controls());
>         lensCtrls.set(V4L2_CID_FOCUS_ABSOLUTE, static_cast<int32_t>(position));
> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> index 6c5617cd..03259d0e 100644
> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp
> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
> @@ -1267,7 +1267,7 @@ void IPU3CameraData::queueFrameAction(unsigned int id,
>                 const ControlValue &focusValue =
>                         lensControls.get(V4L2_CID_FOCUS_ABSOLUTE);
>  
> -               focusLens->setFocusPostion(focusValue.get<int32_t>());
> +               focusLens->setFocusPosition(focusValue.get<int32_t>());
>  
>                 break;
>         }
> -- 
> 2.32.0
>
Nicolas Dufresne via libcamera-devel March 9, 2022, 3:59 p.m. UTC | #2
On Wed, Mar 09, 2022 at 03:31:58PM +0000, Kieran Bingham via libcamera-devel wrote:
> Quoting Jean-Michel Hautbois via libcamera-devel (2022-03-09 15:26:14)
> > The CameraLens class implements a function named "setFocusPostion".
> > There is a typo here, fix it.
> > While at it fix it in the IPU3 IPA as it is used only here.

It's not really "while at it", if you didn't compilation would fail :-)
I'd drop this last sentence.

> > Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
> 
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Likewise,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> > ---
> >  include/libcamera/internal/camera_lens.h | 2 +-
> >  src/libcamera/camera_lens.cpp            | 2 +-
> >  src/libcamera/pipeline/ipu3/ipu3.cpp     | 2 +-
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/include/libcamera/internal/camera_lens.h b/include/libcamera/internal/camera_lens.h
> > index 6f2ea1bc..ff4d066e 100644
> > --- a/include/libcamera/internal/camera_lens.h
> > +++ b/include/libcamera/internal/camera_lens.h
> > @@ -24,7 +24,7 @@ public:
> >         ~CameraLens();
> >  
> >         int init();
> > -       int setFocusPostion(int32_t position);
> > +       int setFocusPosition(int32_t position);
> >  
> >         const std::string &model() const { return model_; }
> >  
> > diff --git a/src/libcamera/camera_lens.cpp b/src/libcamera/camera_lens.cpp
> > index 189cb025..810fcffa 100644
> > --- a/src/libcamera/camera_lens.cpp
> > +++ b/src/libcamera/camera_lens.cpp
> > @@ -84,7 +84,7 @@ int CameraLens::init()
> >   *
> >   * \return 0 on success or -EINVAL otherwise
> >   */
> > -int CameraLens::setFocusPostion(int32_t position)
> > +int CameraLens::setFocusPosition(int32_t position)
> >  {
> >         ControlList lensCtrls(subdev_->controls());
> >         lensCtrls.set(V4L2_CID_FOCUS_ABSOLUTE, static_cast<int32_t>(position));
> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> > index 6c5617cd..03259d0e 100644
> > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp
> > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
> > @@ -1267,7 +1267,7 @@ void IPU3CameraData::queueFrameAction(unsigned int id,
> >                 const ControlValue &focusValue =
> >                         lensControls.get(V4L2_CID_FOCUS_ABSOLUTE);
> >  
> > -               focusLens->setFocusPostion(focusValue.get<int32_t>());
> > +               focusLens->setFocusPosition(focusValue.get<int32_t>());
> >  
> >                 break;
> >         }

Patch
diff mbox series

diff --git a/include/libcamera/internal/camera_lens.h b/include/libcamera/internal/camera_lens.h
index 6f2ea1bc..ff4d066e 100644
--- a/include/libcamera/internal/camera_lens.h
+++ b/include/libcamera/internal/camera_lens.h
@@ -24,7 +24,7 @@  public:
 	~CameraLens();
 
 	int init();
-	int setFocusPostion(int32_t position);
+	int setFocusPosition(int32_t position);
 
 	const std::string &model() const { return model_; }
 
diff --git a/src/libcamera/camera_lens.cpp b/src/libcamera/camera_lens.cpp
index 189cb025..810fcffa 100644
--- a/src/libcamera/camera_lens.cpp
+++ b/src/libcamera/camera_lens.cpp
@@ -84,7 +84,7 @@  int CameraLens::init()
  *
  * \return 0 on success or -EINVAL otherwise
  */
-int CameraLens::setFocusPostion(int32_t position)
+int CameraLens::setFocusPosition(int32_t position)
 {
 	ControlList lensCtrls(subdev_->controls());
 	lensCtrls.set(V4L2_CID_FOCUS_ABSOLUTE, static_cast<int32_t>(position));
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 6c5617cd..03259d0e 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -1267,7 +1267,7 @@  void IPU3CameraData::queueFrameAction(unsigned int id,
 		const ControlValue &focusValue =
 			lensControls.get(V4L2_CID_FOCUS_ABSOLUTE);
 
-		focusLens->setFocusPostion(focusValue.get<int32_t>());
+		focusLens->setFocusPosition(focusValue.get<int32_t>());
 
 		break;
 	}