owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworked internal namespaces

Browse Source
This commit is contained in:
emeric
2024-03-12 23:11:29 +01:00
parent 17905ae952 4b7c4295ec
commit 41992f235e
501 changed files with 12675 additions and 12702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/image/CMakeLists.txt
+1 -1
View File
@@ -12,7 +12,7 @@ target_include_directories(lmsimage PRIVATE
)
target_link_libraries(lmsimage PUBLIC
lmsutils
lmscore
std::filesystem
)
src/libs/image/impl/graphicsmagick/JPEGImage.cpp
+3 -3
View File
@@ -21,9 +21,9 @@
#include "RawImage.hpp"
#include "image/Exception.hpp"
#include "utils/ILogger.hpp"
#include "core/ILogger.hpp"
namespace Image::GraphicsMagick
namespace lms::image::GraphicsMagick
{
JPEGImage::JPEGImage(const RawImage& rawImage, unsigned quality)
{
@@ -37,7 +37,7 @@ namespace Image::GraphicsMagick
catch (Magick::Exception& e)
{
LMS_LOG(COVER, ERROR, "Caught Magick exception: " << e.what());
throw ImageException {std::string {"Magick read error: "} + e.what()};
throw Exception {std::string {"Magick read error: "} + e.what()};
}
}
src/libs/image/impl/graphicsmagick/JPEGImage.hpp
+1 -1
View File
@@ -27,7 +27,7 @@
#include "image/IEncodedImage.hpp"
namespace Image::GraphicsMagick
namespace lms::image::GraphicsMagick
{
class RawImage;
class JPEGImage : public IEncodedImage
src/libs/image/impl/graphicsmagick/RawImage.cpp
+9 -9
View File
@@ -23,9 +23,9 @@
#include "JPEGImage.hpp"
#include "image/Exception.hpp"
#include "utils/ILogger.hpp"
#include "core/ILogger.hpp"
namespace Image
namespace lms::image
{
std::unique_ptr<IRawImage> decodeImage(const std::byte* encodedData, std::size_t encodedDataSize)
{
@@ -56,7 +56,7 @@ namespace Image
}
}
namespace Image::GraphicsMagick
namespace lms::image::GraphicsMagick
{
RawImage::RawImage(const std::byte* encodedData, std::size_t encodedDataSize)
@@ -73,12 +73,12 @@ RawImage::RawImage(const std::byte* encodedData, std::size_t encodedDataSize)
catch (Magick::Warning& e)
{
LMS_LOG(COVER, WARNING, "Caught Magick warning: " << e.what());
throw ImageException {std::string {"Magick read warning: "} + e.what()};
throw Exception {std::string {"Magick read warning: "} + e.what()};
}
catch (Magick::Exception& e)
{
LMS_LOG(COVER, ERROR, "Caught Magick exception: " << e.what());
throw ImageException {std::string {"Magick read error: "} + e.what()};
throw Exception {std::string {"Magick read error: "} + e.what()};
}
}
@@ -95,12 +95,12 @@ RawImage::RawImage(const std::filesystem::path& p)
catch (Magick::Warning& e)
{
LMS_LOG(COVER, WARNING, "Caught Magick warning: " << e.what());
throw ImageException {std::string {"Magick read warning: "} + e.what()};
throw Exception {std::string {"Magick read warning: "} + e.what()};
}
catch (Magick::Exception& e)
{
LMS_LOG(COVER, ERROR, "Caught Magick exception: " << e.what());
throw ImageException {std::string {"Magick read error: "} + e.what()};
throw Exception {std::string {"Magick read error: "} + e.what()};
}
}
@@ -114,7 +114,7 @@ RawImage::resize(ImageSize width)
catch (Magick::Exception& e)
{
LMS_LOG(COVER, ERROR, "Caught Magick exception while resizing: " << e.what());
throw ImageException {std::string {"Magick resize error: "} + e.what()};
throw Exception {std::string {"Magick resize error: "} + e.what()};
}
}
@@ -130,5 +130,5 @@ RawImage::getMagickImage() const
return _image;
}
} // namespace Image::GraphicsMagick
} // namespace lms::image::GraphicsMagick
src/libs/image/impl/graphicsmagick/RawImage.hpp
+1 -1
View File
@@ -31,7 +31,7 @@
#include "image/IEncodedImage.hpp"
#include "image/IRawImage.hpp"
namespace Image::GraphicsMagick
namespace lms::image::GraphicsMagick
{
class RawImage : public IRawImage
{
src/libs/image/impl/stb/JPEGImage.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#include "image/Exception.hpp"
#include "RawImage.hpp"
namespace Image::STB
namespace lms::image::STB
{
JPEGImage::JPEGImage(const RawImage& rawImage, unsigned quality)
{
@@ -40,7 +40,7 @@ namespace Image::STB
if (stbi_write_jpg_to_func(writeCb, &_data, rawImage.getWidth(), rawImage.getHeight(), 3, rawImage.getData(), quality) == 0)
{
_data.clear();
throw ImageException {"Failed to export in jpeg format!"};
throw Exception {"Failed to export in jpeg format!"};
}
}
src/libs/image/impl/stb/JPEGImage.hpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include "image/IEncodedImage.hpp"
namespace Image::STB
namespace lms::image::STB
{
class RawImage;
class JPEGImage : public IEncodedImage
src/libs/image/impl/stb/RawImage.cpp
+6 -6
View File
@@ -34,7 +34,7 @@
#include "image/Exception.hpp"
namespace Image
namespace lms::image
{
std::unique_ptr<IRawImage> decodeImage(const std::byte* encodedData, std::size_t encodedDataSize)
{
@@ -51,14 +51,14 @@ namespace Image
}
}
namespace Image::STB
namespace lms::image::STB
{
RawImage::RawImage(const std::byte* encodedData, std::size_t encodedDataSize)
{
int n;
_data = UniquePtrFree{ ::stbi_load_from_memory(reinterpret_cast<const stbi_uc*>(encodedData), encodedDataSize, &_width, &_height, &n, 3), std::free };
if (!_data)
throw ImageException{ "Cannot load image from memory: " + std::string{ ::stbi_failure_reason() } };
throw Exception{ "Cannot load image from memory: " + std::string{ ::stbi_failure_reason() } };
}
RawImage::RawImage(const std::filesystem::path& p)
@@ -66,7 +66,7 @@ namespace Image::STB
int n;
_data = UniquePtrFree{ stbi_load(p.string().c_str(), &_width, &_height, &n, 3), std::free };
if (!_data)
throw ImageException{ "Cannot load image from file: " + std::string{ ::stbi_failure_reason() } };
throw Exception{ "Cannot load image from file: " + std::string{ ::stbi_failure_reason() } };
}
void RawImage::resize(ImageSize width)
@@ -88,13 +88,13 @@ namespace Image::STB
UniquePtrFree resizedData{ reinterpret_cast<unsigned char*>(malloc(width * height * 3)), std::free };
if (!resizedData)
throw ImageException{ "Cannot allocate memory for resized image!" };
throw Exception{ "Cannot allocate memory for resized image!" };
if (::stbir_resize_uint8_srgb(reinterpret_cast<const unsigned char*>(_data.get()), _width, _height, 0,
reinterpret_cast<unsigned char*>(resizedData.get()), width, height, 0,
3, STBIR_ALPHA_CHANNEL_NONE, 0) == 0)
{
throw ImageException{ "Failed to resize image:" + std::string{ ::stbi_failure_reason() } };
throw Exception{ "Failed to resize image:" + std::string{ ::stbi_failure_reason() } };
}
_data = std::move(resizedData);
src/libs/image/impl/stb/RawImage.hpp
+1 -1
View File
@@ -29,7 +29,7 @@
#include "image/IEncodedImage.hpp"
#include "image/IRawImage.hpp"
namespace Image::STB
namespace lms::image::STB
{
class RawImage : public IRawImage
{
src/libs/image/include/image/Exception.hpp
+4 -5
View File
@@ -19,16 +19,15 @@
#pragma once
#include "utils/Exception.hpp"
#include "core/Exception.hpp"
namespace Image
namespace lms::image
{
// internal use only
class ImageException : public LmsException
class Exception : public core::LmsException
{
public:
using LmsException::LmsException;
};
} // namespace Cover
} // namespace lms::cover
src/libs/image/include/image/IEncodedImage.hpp
+2 -3
View File
@@ -22,7 +22,7 @@
#include <cstddef>
#include <string_view>
namespace Image
namespace lms::image
{
using ImageSize = std::size_t;
@@ -35,6 +35,5 @@ namespace Image
virtual std::size_t getDataSize() const = 0;
virtual std::string_view getMimeType() const = 0;
};
} // namespace Cover
}
src/libs/image/include/image/IRawImage.hpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include "image/IEncodedImage.hpp"
namespace Image
namespace lms::image
{
class IRawImage
{