From 437f9d63edf224bbb24709b57401e90c4de3923d Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 6 Jul 2024 14:12:58 +0200 Subject: [PATCH] Fixed build when using graphicmagicks backend --- approot/messages_fr.xml | 2 +- src/libs/image/impl/graphicsmagick/Image.cpp | 3 +++ src/libs/image/impl/graphicsmagick/JPEGImage.cpp | 3 +++ src/libs/image/impl/graphicsmagick/RawImage.cpp | 3 +++ src/libs/services/scanner/impl/FileScanQueue.cpp | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index a8e1fa29..4b77b59f 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -111,7 +111,7 @@ En cours de scan : étape {1}/{2} Association des images des artistes: {1}%... Vérification des fichiers dupliqués... {1} fichiers -Vérification des fichiers... {1}% +Vérification des fichiers supprimés... {1}% Compactage de la base de données... Calcul des statistiques... {1}% Découverte des fichiers : {1} fichiers diff --git a/src/libs/image/impl/graphicsmagick/Image.cpp b/src/libs/image/impl/graphicsmagick/Image.cpp index 920bed60..44a59786 100644 --- a/src/libs/image/impl/graphicsmagick/Image.cpp +++ b/src/libs/image/impl/graphicsmagick/Image.cpp @@ -21,6 +21,7 @@ #include +#include "RawImage.hpp" #include "core/ILogger.hpp" #include "core/ITraceLogger.hpp" @@ -28,11 +29,13 @@ namespace lms::image { std::unique_ptr decodeImage(const std::byte* encodedData, std::size_t encodedDataSize) { + LMS_SCOPED_TRACE_DETAILED("Image", "DecodeBuffer"); return std::make_unique(encodedData, encodedDataSize); } std::unique_ptr decodeImage(const std::filesystem::path& path) { + LMS_SCOPED_TRACE_DETAILED("Image", "DecodeFile"); return std::make_unique(path); } diff --git a/src/libs/image/impl/graphicsmagick/JPEGImage.cpp b/src/libs/image/impl/graphicsmagick/JPEGImage.cpp index 36b00d2c..94738b20 100644 --- a/src/libs/image/impl/graphicsmagick/JPEGImage.cpp +++ b/src/libs/image/impl/graphicsmagick/JPEGImage.cpp @@ -20,6 +20,7 @@ #include "JPEGImage.hpp" #include "core/ILogger.hpp" +#include "core/ITraceLogger.hpp" #include "image/Exception.hpp" #include "RawImage.hpp" @@ -28,6 +29,8 @@ namespace lms::image::GraphicsMagick { JPEGImage::JPEGImage(const RawImage& rawImage, unsigned quality) { + LMS_SCOPED_TRACE_DETAILED("Image", "WriteJPEG"); + try { Magick::Image image{ rawImage.getMagickImage() }; diff --git a/src/libs/image/impl/graphicsmagick/RawImage.cpp b/src/libs/image/impl/graphicsmagick/RawImage.cpp index d935d125..f3550478 100644 --- a/src/libs/image/impl/graphicsmagick/RawImage.cpp +++ b/src/libs/image/impl/graphicsmagick/RawImage.cpp @@ -25,6 +25,7 @@ #include #include "core/ILogger.hpp" +#include "core/ITraceLogger.hpp" #include "image/Exception.hpp" #include "JPEGImage.hpp" @@ -90,6 +91,8 @@ namespace lms::image::GraphicsMagick { try { + LMS_SCOPED_TRACE_DETAILED("Image", "Resize"); + _image.resize(Magick::Geometry{ static_cast(width), static_cast(width) }); } catch (Magick::Exception& e) diff --git a/src/libs/services/scanner/impl/FileScanQueue.cpp b/src/libs/services/scanner/impl/FileScanQueue.cpp index 6497d24c..0e083663 100644 --- a/src/libs/services/scanner/impl/FileScanQueue.cpp +++ b/src/libs/services/scanner/impl/FileScanQueue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Emeric Poupon + * Copyright (C) 2024 Emeric Poupon * * This file is part of LMS. *