diff --git a/3rdParty/brotli/CMakeLists.txt b/3rdParty/brotli/CMakeLists.txt index e99afb6..e31818c 100644 --- a/3rdParty/brotli/CMakeLists.txt +++ b/3rdParty/brotli/CMakeLists.txt @@ -9,6 +9,7 @@ FetchContent_Declare( GIT_REPOSITORY ${BROTLI_REPO} GIT_TAG v1.1.0 GIT_SHALLOW TRUE + EXCLUDE_FROM_ALL ) set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) diff --git a/3rdParty/rapidyaml/CMakeLists.txt b/3rdParty/rapidyaml/CMakeLists.txt index 0ff1d0a..8fbeda8 100644 --- a/3rdParty/rapidyaml/CMakeLists.txt +++ b/3rdParty/rapidyaml/CMakeLists.txt @@ -11,4 +11,6 @@ FetchContent_Declare( GIT_TAG v0.9.0 GIT_SHALLOW FALSE # ensure submodules are checked out ) +set(C4CORE_INSTALL OFF CACHE BOOL "" FORCE) +set(RYML_INSTALL OFF CACHE BOOL "" FORCE) FetchContent_MakeAvailable(ryml) \ No newline at end of file diff --git a/openVulkanoCpp/Image/ExifBuilder.cpp b/openVulkanoCpp/Image/ExifBuilder.cpp index 42f6bcd..15f3756 100644 --- a/openVulkanoCpp/Image/ExifBuilder.cpp +++ b/openVulkanoCpp/Image/ExifBuilder.cpp @@ -311,11 +311,6 @@ namespace OpenVulkano::Image altitude = std::abs(level); } - void ExifBuilder::SetTime(std::time_t timestamp) - { - dateTaken = StringFromTime(timestamp); - } - std::vector ExifBuilder::Build() { std::vector result; @@ -487,15 +482,9 @@ namespace OpenVulkano::Image return result; } - std::string ExifBuilder::StringFromTime(std::time_t time) - { - return fmt::format("{:%Y:%m:%d %H:%M:%S}", fmt::localtime(time)); - } - std::string ExifBuilder::GetCurrentTimestamp() { auto now = std::chrono::system_clock::now(); - std::time_t currentTime = std::chrono::system_clock::to_time_t(now); - return StringFromTime(currentTime); + return fmt::format("{:%Y:%m:%d %H:%M:%S}", now); // TODO convert to local time } } diff --git a/openVulkanoCpp/Image/ExifBuilder.hpp b/openVulkanoCpp/Image/ExifBuilder.hpp index 951e7e8..4e1f9d4 100644 --- a/openVulkanoCpp/Image/ExifBuilder.hpp +++ b/openVulkanoCpp/Image/ExifBuilder.hpp @@ -87,10 +87,8 @@ namespace OpenVulkano::Image void SetResolution(uint32_t dpi = 72) { xResolution = yResolution = dpi; resolutionUnit = 2;} void SetOrientation(float orientationRad); - void SetTime(std::time_t timestamp); // Typical usage is -> jpeg_write_marker(cinfo, JPEG_APP0 + 1, exif_data.data(), exif_data.size()); [[nodiscard]] std::vector Build(); - [[nodiscard]] static std::string StringFromTime(std::time_t time); [[nodiscard]] static std::string GetCurrentTimestamp(); }; } diff --git a/openVulkanoCpp/Image/XmpBuilder.cpp b/openVulkanoCpp/Image/XmpBuilder.cpp index 8132c00..5b8e8cf 100644 --- a/openVulkanoCpp/Image/XmpBuilder.cpp +++ b/openVulkanoCpp/Image/XmpBuilder.cpp @@ -104,15 +104,6 @@ namespace OpenVulkano::Image { return SetCreateDate(fmt::format("{:%FT%T%Ez}", std::chrono::system_clock::now())); } - - [[maybe_unused]] XmpBuilder& XmpBuilder::SetCreateDate(const std::time_t time) - { - #ifdef WIN32 - return SetCreateDate(fmt::format("{:%FT%T%Ez}", std::chrono::system_clock::from_time_t(time))); - #else - return SetCreateDate(fmt::format("{:%FT%T%Ez}", fmt::localtime(time))); - #endif - } [[maybe_unused]] XmpBuilder& XmpBuilder::SetCreateDate(const std::string& createDate) { diff --git a/openVulkanoCpp/Image/XmpBuilder.hpp b/openVulkanoCpp/Image/XmpBuilder.hpp index 58da7f6..db34dda 100644 --- a/openVulkanoCpp/Image/XmpBuilder.hpp +++ b/openVulkanoCpp/Image/XmpBuilder.hpp @@ -30,7 +30,6 @@ namespace OpenVulkano::Image [[maybe_unused]] XmpBuilder& SetFocalLength(float focalLengthMM); [[maybe_unused]] XmpBuilder& SetExposureTime(double exposureTime); [[maybe_unused]] XmpBuilder& SetCreateDateNow(); - [[maybe_unused]] XmpBuilder& SetCreateDate(const std::time_t time); [[maybe_unused]] XmpBuilder& SetCreateDate(const std::string& createDate); [[maybe_unused]] std::string Close() { return Finalize(); }