From patchwork Tue Oct 18 08:09:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 17618 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 7223BBD16B for ; Tue, 18 Oct 2022 08:09:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 351D362E15; Tue, 18 Oct 2022 10:09:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666080561; bh=JLIwmHpQIQCHjajdYrsUTAxrw7JtDh6lLXhvj40CkeE=; 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=c0qsTLWrSL6J5b2JDmCYpJYAJ9C7VaAJNcOTcpYTdpxAnr+jLKhLEXKxVGol+dczg /iWIfRVMv2UrCzuM34JqY5eOlVjGoP6g82QB7WLO86tmKLEzI0vWk/IUGu6btrXWPH LikdFCsKyrwyFH5pbj3gOlBEc/WXD8dla+7upH/xWqZI0wkpuo5+r4PTcot88kM7V7 i5c3mPwnOZh3cCEZ1Lo585CeJgaiD4apbMEtHQW3s4OS+WEa2emql/RrDq4/w+v7Lb ZDAhtgbXsN0muYLJwBYune1Ecplg9fiAD+Zqn/Y1uM439yXuwq9wnXykz+8OLRfRwd KCZW2ZXhKQJ4Q== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 221AA62E0A for ; Tue, 18 Oct 2022 10:09:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="r70t/NNW"; dkim-atps=neutral Received: from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp [175.177.42.159]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 53DF88CC; Tue, 18 Oct 2022 10:09:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1666080558; bh=JLIwmHpQIQCHjajdYrsUTAxrw7JtDh6lLXhvj40CkeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r70t/NNWxRawsPBDj9R7MkicYDk0rL1W0G9r0sy1t3pAjpIjqdXwNravgVhdSZzUg i7UT1NUjkWnUsDOPf1uHFvcl0I2TZaUSJMCJ7pB8QH0tGnIVmnTr4x5pP2SPZVETle CeO+b003wMcFW3uKvS23vGPngsu4ls5T58bots2k= To: libcamera-devel@lists.libcamera.org Date: Tue, 18 Oct 2022 17:09:06 +0900 Message-Id: <20221018080908.2841339-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221018080908.2841339-1-paul.elder@ideasonboard.com> References: <20221018080908.2841339-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/3] qcam, cam: Move DNGWriter from qcam to cam 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: Paul Elder via libcamera-devel From: Paul Elder Reply-To: Paul Elder Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" To prepare for adding DNG support to cam, move DNGWriter from qcam to cam so that we only have inclusions from qcam to cam and not the other way around. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- Changes in v2: - move libtiff dependency for cam to the next patch --- src/{qcam => cam}/dng_writer.cpp | 0 src/{qcam => cam}/dng_writer.h | 0 src/cam/meson.build | 1 + src/qcam/main_window.cpp | 2 +- src/qcam/meson.build | 2 +- 5 files changed, 3 insertions(+), 2 deletions(-) rename src/{qcam => cam}/dng_writer.cpp (100%) rename src/{qcam => cam}/dng_writer.h (100%) diff --git a/src/qcam/dng_writer.cpp b/src/cam/dng_writer.cpp similarity index 100% rename from src/qcam/dng_writer.cpp rename to src/cam/dng_writer.cpp diff --git a/src/qcam/dng_writer.h b/src/cam/dng_writer.h similarity index 100% rename from src/qcam/dng_writer.h rename to src/cam/dng_writer.h diff --git a/src/cam/meson.build b/src/cam/meson.build index 8259239f..9c766221 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -26,6 +26,7 @@ cam_cpp_args = [] libdrm = dependency('libdrm', required : false) libjpeg = dependency('libjpeg', required : false) libsdl2 = dependency('SDL2', required : false) +libtiff = dependency('libtiff-4', required : false) if libdrm.found() cam_cpp_args += [ '-DHAVE_KMS' ] diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index e0e5092e..f553ccb0 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -26,10 +26,10 @@ #include #include +#include "../cam/dng_writer.h" #include "../cam/image.h" #include "cam_select_dialog.h" -#include "dng_writer.h" #ifndef QT_NO_OPENGL #include "viewfinder_gl.h" #endif diff --git a/src/qcam/meson.build b/src/qcam/meson.build index 61861ea6..9f5759ff 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -49,7 +49,7 @@ if tiff_dep.found() qt5_cpp_args += ['-DHAVE_TIFF'] qcam_deps += [tiff_dep] qcam_sources += files([ - 'dng_writer.cpp', + '../cam/dng_writer.cpp', ]) endif