diff options
author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-15 16:15:12 +0100 |
---|---|---|
committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-25 16:11:08 +0100 |
commit | 27aff949fbc1b9aabfc594bbfd6f94be55a086ec (patch) | |
tree | 9ddbc2462a685a6db3ed33f09ed7a493376439d6 /src/android/jpeg | |
parent | 6410d1d37c1ea9d1d168840a7ba063facb0bc9d6 (diff) |
libcamera/base: Move extended base functionality
Move the functionality for the following components to the new
base support library:
- BoundMethod
- EventDispatcher
- EventDispatcherPoll
- Log
- Message
- Object
- Signal
- Semaphore
- Thread
- Timer
While it would be preferable to see these split to move one component
per commit, these components are all interdependent upon each other,
which leaves us with one big change performing the move for all of them.
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src/android/jpeg')
-rw-r--r-- | src/android/jpeg/encoder_libjpeg.cpp | 3 | ||||
-rw-r--r-- | src/android/jpeg/exif.cpp | 3 | ||||
-rw-r--r-- | src/android/jpeg/post_processor_jpeg.cpp | 4 | ||||
-rw-r--r-- | src/android/jpeg/thumbnailer.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index f006e1d1..e6358ca9 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -16,12 +16,13 @@ #include <unistd.h> #include <vector> +#include <libcamera/base/log.h> + #include <libcamera/camera.h> #include <libcamera/formats.h> #include <libcamera/pixel_format.h> #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp index 747f1cfa..0ba4cb85 100644 --- a/src/android/jpeg/exif.cpp +++ b/src/android/jpeg/exif.cpp @@ -14,10 +14,9 @@ #include <tuple> #include <uchar.h> +#include <libcamera/base/log.h> #include <libcamera/base/utils.h> -#include "libcamera/internal/log.h" - using namespace libcamera; LOG_DEFINE_CATEGORY(EXIF) diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp index 058ccc99..0e93f365 100644 --- a/src/android/jpeg/post_processor_jpeg.cpp +++ b/src/android/jpeg/post_processor_jpeg.cpp @@ -14,9 +14,9 @@ #include "encoder_libjpeg.h" #include "exif.h" -#include <libcamera/formats.h> +#include <libcamera/base/log.h> -#include "libcamera/internal/log.h" +#include <libcamera/formats.h> using namespace libcamera; using namespace std::chrono_literals; diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp index f709d343..5cb00744 100644 --- a/src/android/jpeg/thumbnailer.cpp +++ b/src/android/jpeg/thumbnailer.cpp @@ -7,9 +7,9 @@ #include "thumbnailer.h" -#include <libcamera/formats.h> +#include <libcamera/base/log.h> -#include "libcamera/internal/log.h" +#include <libcamera/formats.h> using namespace libcamera; |