NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

apps: Replace HAVE_DNG with HAVE_TIFF

Browse source 
Support for DNG capture is conditioned by the availability of libtiff,
which is indicated by the HAVE_TIFF macro set by meson. The dng_writer.h
header then defines HAVE_DNG, which is used in a couple of places to
conditionally compile DNG-related code. Most of the other locations
where conditional compilation is required use HAVE_TIFF.

Using both HAVE_TIFF and HAVE_DNG is confusing. HAVE_DNG would be a
better name, but as the macro is defined in dng_writer.h, it would
require all files that need to test for DNG support to include that
header. Failure to include it (directly or indirectly) would result in
the code covered by the macro to be silently disabled.

To avoid the confusion, standardize on using HAVE_TIFF everywhere and
drop HAVE_DNG.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2024-09-25 13:52:58 +03:00
parent 761545407c
commit 2e47324860
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/apps/common/dng_writer.h
View file

@ -8,7 +8,6 @@
#pragma once #pragma once
#ifdef HAVE_TIFF #ifdef HAVE_TIFF
#define HAVE_DNG
#include <libcamera/camera.h> #include <libcamera/camera.h>
#include <libcamera/controls.h> #include <libcamera/controls.h>

4
src/apps/qcam/main_window.cpp
View file

@ -211,7 +211,7 @@ int MainWindow::createToolbars()
action->setShortcut(QKeySequence::SaveAs); action->setShortcut(QKeySequence::SaveAs);
connect(action, &QAction::triggered, this, &MainWindow::saveImageAs); connect(action, &QAction::triggered, this, &MainWindow::saveImageAs);
#ifdef HAVE_DNG #ifdef HAVE_TIFF
/* Save Raw action. */ /* Save Raw action. */
action = toolbar_->addAction(QIcon::fromTheme("camera-photo", action = toolbar_->addAction(QIcon::fromTheme("camera-photo",
QIcon(":aperture.svg")), QIcon(":aperture.svg")),
@ -646,7 +646,7 @@ void MainWindow::captureRaw()
void MainWindow::processRaw(FrameBuffer *buffer, void MainWindow::processRaw(FrameBuffer *buffer,
[[maybe_unused]] const ControlList &metadata) [[maybe_unused]] const ControlList &metadata)
{ {
#ifdef HAVE_DNG #ifdef HAVE_TIFF
QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation); QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
QString filename = QFileDialog::getSaveFileName(this, "Save DNG", defaultPath, QString filename = QFileDialog::getSaveFileName(this, "Save DNG", defaultPath,
"DNG Files (*.dng)"); "DNG Files (*.dng)");