Fixed build when using graphicmagicks backend
This commit is contained in:
@@ -111,7 +111,7 @@
|
|||||||
<message id="Lms.Admin.ScannerController.status-in-progress">En cours de scan : étape {1}/{2}</message>
|
<message id="Lms.Admin.ScannerController.status-in-progress">En cours de scan : étape {1}/{2}</message>
|
||||||
<message id="Lms.Admin.ScannerController.step-associating-artist-images">Association des images des artistes: {1}%...</message>
|
<message id="Lms.Admin.ScannerController.step-associating-artist-images">Association des images des artistes: {1}%...</message>
|
||||||
<message id="Lms.Admin.ScannerController.step-checking-for-duplicate-files">Vérification des fichiers dupliqués... {1} fichiers</message>
|
<message id="Lms.Admin.ScannerController.step-checking-for-duplicate-files">Vérification des fichiers dupliqués... {1} fichiers</message>
|
||||||
<message id="Lms.Admin.ScannerController.step-checking-for-removed-files">Vérification des fichiers... {1}%</message>
|
<message id="Lms.Admin.ScannerController.step-checking-for-removed-files">Vérification des fichiers supprimés... {1}%</message>
|
||||||
<message id="Lms.Admin.ScannerController.step-compact">Compactage de la base de données...</message>
|
<message id="Lms.Admin.ScannerController.step-compact">Compactage de la base de données...</message>
|
||||||
<message id="Lms.Admin.ScannerController.step-compute-cluster-stats">Calcul des statistiques... {1}%</message>
|
<message id="Lms.Admin.ScannerController.step-compute-cluster-stats">Calcul des statistiques... {1}%</message>
|
||||||
<message id="Lms.Admin.ScannerController.step-discovering-files">Découverte des fichiers : {1} fichiers</message>
|
<message id="Lms.Admin.ScannerController.step-discovering-files">Découverte des fichiers : {1} fichiers</message>
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
|
#include "RawImage.hpp"
|
||||||
#include "core/ILogger.hpp"
|
#include "core/ILogger.hpp"
|
||||||
#include "core/ITraceLogger.hpp"
|
#include "core/ITraceLogger.hpp"
|
||||||
|
|
||||||
@@ -28,11 +29,13 @@ namespace lms::image
|
|||||||
{
|
{
|
||||||
std::unique_ptr<IRawImage> decodeImage(const std::byte* encodedData, std::size_t encodedDataSize)
|
std::unique_ptr<IRawImage> decodeImage(const std::byte* encodedData, std::size_t encodedDataSize)
|
||||||
{
|
{
|
||||||
|
LMS_SCOPED_TRACE_DETAILED("Image", "DecodeBuffer");
|
||||||
return std::make_unique<GraphicsMagick::RawImage>(encodedData, encodedDataSize);
|
return std::make_unique<GraphicsMagick::RawImage>(encodedData, encodedDataSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<IRawImage> decodeImage(const std::filesystem::path& path)
|
std::unique_ptr<IRawImage> decodeImage(const std::filesystem::path& path)
|
||||||
{
|
{
|
||||||
|
LMS_SCOPED_TRACE_DETAILED("Image", "DecodeFile");
|
||||||
return std::make_unique<GraphicsMagick::RawImage>(path);
|
return std::make_unique<GraphicsMagick::RawImage>(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
#include "JPEGImage.hpp"
|
#include "JPEGImage.hpp"
|
||||||
|
|
||||||
#include "core/ILogger.hpp"
|
#include "core/ILogger.hpp"
|
||||||
|
#include "core/ITraceLogger.hpp"
|
||||||
#include "image/Exception.hpp"
|
#include "image/Exception.hpp"
|
||||||
|
|
||||||
#include "RawImage.hpp"
|
#include "RawImage.hpp"
|
||||||
@@ -28,6 +29,8 @@ namespace lms::image::GraphicsMagick
|
|||||||
{
|
{
|
||||||
JPEGImage::JPEGImage(const RawImage& rawImage, unsigned quality)
|
JPEGImage::JPEGImage(const RawImage& rawImage, unsigned quality)
|
||||||
{
|
{
|
||||||
|
LMS_SCOPED_TRACE_DETAILED("Image", "WriteJPEG");
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Magick::Image image{ rawImage.getMagickImage() };
|
Magick::Image image{ rawImage.getMagickImage() };
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
#include <magick/resource.h>
|
#include <magick/resource.h>
|
||||||
|
|
||||||
#include "core/ILogger.hpp"
|
#include "core/ILogger.hpp"
|
||||||
|
#include "core/ITraceLogger.hpp"
|
||||||
#include "image/Exception.hpp"
|
#include "image/Exception.hpp"
|
||||||
|
|
||||||
#include "JPEGImage.hpp"
|
#include "JPEGImage.hpp"
|
||||||
@@ -90,6 +91,8 @@ namespace lms::image::GraphicsMagick
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
LMS_SCOPED_TRACE_DETAILED("Image", "Resize");
|
||||||
|
|
||||||
_image.resize(Magick::Geometry{ static_cast<unsigned int>(width), static_cast<unsigned int>(width) });
|
_image.resize(Magick::Geometry{ static_cast<unsigned int>(width), static_cast<unsigned int>(width) });
|
||||||
}
|
}
|
||||||
catch (Magick::Exception& e)
|
catch (Magick::Exception& e)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2023 Emeric Poupon
|
* Copyright (C) 2024 Emeric Poupon
|
||||||
*
|
*
|
||||||
* This file is part of LMS.
|
* This file is part of LMS.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user