| Message ID | 20220630133902.321099-24-jacopo@jmondi.org |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series |
|
| Related | show |
Quoting Jacopo Mondi via libcamera-devel (2022-06-30 14:39:02) > The CameraLens class is tighly copuled with the camera sensor classes. /tighly/tightly/ /copuled/coupled/ I think this will make sense yes, but I don't know yet how abstract camera_lens will become. Anyway, this is probably useful for now so: Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > Move the camera_lens.cpp file in src/libcamera/camera_sensor. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > --- > src/libcamera/{ => camera_sensor}/camera_lens.cpp | 0 > src/libcamera/camera_sensor/meson.build | 1 + > src/libcamera/meson.build | 1 - > 3 files changed, 1 insertion(+), 1 deletion(-) > rename src/libcamera/{ => camera_sensor}/camera_lens.cpp (100%) > > diff --git a/src/libcamera/camera_lens.cpp b/src/libcamera/camera_sensor/camera_lens.cpp > similarity index 100% > rename from src/libcamera/camera_lens.cpp > rename to src/libcamera/camera_sensor/camera_lens.cpp > diff --git a/src/libcamera/camera_sensor/meson.build b/src/libcamera/camera_sensor/meson.build > index 991eeeeee29e..b38e3551f644 100644 > --- a/src/libcamera/camera_sensor/meson.build > +++ b/src/libcamera/camera_sensor/meson.build > @@ -1,6 +1,7 @@ > # SPDX-License-Identifier: CC0-1.0 > > libcamera_sources += files([ > + 'camera_lens.cpp', > 'camera_sensor.cpp', > 'camera_sensor_helper.cpp', > 'camera_sensor_properties.cpp', > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build > index 897fb259a894..dc8f55cf5057 100644 > --- a/src/libcamera/meson.build > +++ b/src/libcamera/meson.build > @@ -5,7 +5,6 @@ libcamera_sources = files([ > 'byte_stream_buffer.cpp', > 'camera.cpp', > 'camera_controls.cpp', > - 'camera_lens.cpp', > 'camera_manager.cpp', > 'color_space.cpp', > 'controls.cpp', > -- > 2.36.1 >
diff --git a/src/libcamera/camera_lens.cpp b/src/libcamera/camera_sensor/camera_lens.cpp similarity index 100% rename from src/libcamera/camera_lens.cpp rename to src/libcamera/camera_sensor/camera_lens.cpp diff --git a/src/libcamera/camera_sensor/meson.build b/src/libcamera/camera_sensor/meson.build index 991eeeeee29e..b38e3551f644 100644 --- a/src/libcamera/camera_sensor/meson.build +++ b/src/libcamera/camera_sensor/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: CC0-1.0 libcamera_sources += files([ + 'camera_lens.cpp', 'camera_sensor.cpp', 'camera_sensor_helper.cpp', 'camera_sensor_properties.cpp', diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 897fb259a894..dc8f55cf5057 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -5,7 +5,6 @@ libcamera_sources = files([ 'byte_stream_buffer.cpp', 'camera.cpp', 'camera_controls.cpp', - 'camera_lens.cpp', 'camera_manager.cpp', 'color_space.cpp', 'controls.cpp',
The CameraLens class is tighly copuled with the camera sensor classes. Move the camera_lens.cpp file in src/libcamera/camera_sensor. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> --- src/libcamera/{ => camera_sensor}/camera_lens.cpp | 0 src/libcamera/camera_sensor/meson.build | 1 + src/libcamera/meson.build | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename src/libcamera/{ => camera_sensor}/camera_lens.cpp (100%)