diff options
| author | Paul Elder <paul.elder@ideasonboard.com> | 2022-10-13 19:47:22 +0900 |
|---|---|---|
| committer | Paul Elder <paul.elder@ideasonboard.com> | 2022-10-19 21:05:43 +0900 |
| commit | bb394442abf0f1bcb70fa6a48e3949da79703a71 (patch) | |
| tree | 09bbdca10a72028eacddd7d9415a9267855387b9 /src | |
| parent | ca247829c3feea28d65b181fd0a5f76ff7120a15 (diff) | |
qcam, cam: Move DNGWriter from qcam to cam
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 <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cam/dng_writer.cpp (renamed from src/qcam/dng_writer.cpp) | 0 | ||||
| -rw-r--r-- | src/cam/dng_writer.h (renamed from src/qcam/dng_writer.h) | 0 | ||||
| -rw-r--r-- | src/cam/meson.build | 1 | ||||
| -rw-r--r-- | src/qcam/main_window.cpp | 2 | ||||
| -rw-r--r-- | src/qcam/meson.build | 2 |
5 files changed, 3 insertions, 2 deletions
diff --git a/src/qcam/dng_writer.cpp b/src/cam/dng_writer.cpp index 6dd7d0f4..6dd7d0f4 100644 --- a/src/qcam/dng_writer.cpp +++ b/src/cam/dng_writer.cpp diff --git a/src/qcam/dng_writer.h b/src/cam/dng_writer.h index 38f38f62..38f38f62 100644 --- a/src/qcam/dng_writer.h +++ b/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 <QToolButton> #include <QtDebug> +#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 |