From patchwork Thu Jun 30 13:39:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 16481 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 99C0BBE173 for ; Thu, 30 Jun 2022 13:40:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 401CB656B9; Thu, 30 Jun 2022 15:40:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1656596400; bh=XlMMPMSdM90NzYaaefA2qyMuByeK/vS93wawPT3IY5E=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=reGVuwkGsPyCZv3LRq2thwLPFOFf9XXQUNMBdfEqSl21h4UIR4db9IZ0WWqmim0Dx qQT03LzpGhe/r7gt1xak/7JcgP1URpJpgKuzjp20VeKpz9PA0kVtQkex5AnO3eWEWv wQ+u1WvDHsnooGS8AUbr0eb6U0b5J23EG9B3vLIeCxgiawMCx/fUakQFUp3RyAm2bZ Kyrbx7oKvGnB3bsNpd2/hMJ/E2/6l3QQEqo8bWXkzcgTxVFPTtS96rWMUnftsjO5Xl YyZHd3VPDsvNCwV9JRxy1gVtC7gYM0PlWgq2s+oUBAZdCp+lvpO5vieyVLdXHCFB4Z OjvXKPZME/2Qg== Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6A802656AE for ; Thu, 30 Jun 2022 15:39:54 +0200 (CEST) Received: (Authenticated sender: jacopo@jmondi.org) by mail.gandi.net (Postfix) with ESMTPSA id 955A9240005; Thu, 30 Jun 2022 13:39:53 +0000 (UTC) To: libcamera-devel@lists.libcamera.org Date: Thu, 30 Jun 2022 15:39:02 +0200 Message-Id: <20220630133902.321099-24-jacopo@jmondi.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220630133902.321099-1-jacopo@jmondi.org> References: <20220630133902.321099-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 23/23] libcamera: Move camera_lens.cpp in src/libcamera/camera_sensor X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jacopo Mondi via libcamera-devel From: Jacopo Mondi Reply-To: Jacopo Mondi Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Kieran Bingham --- 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',