From a8d4210cf2685836398ae87c13b2cd6143993436 Mon Sep 17 00:00:00 2001 From: TennesseeTrash Date: Sun, 8 Jun 2025 14:50:26 +0200 Subject: [PATCH 1/2] Clean up includes --- Libraries/Kanimaji/Include/Kanimaji/Error.hpp | 2 ++ Libraries/Kanimaji/Source/Kanimaji.cpp | 1 + Libraries/Kanimaji/Source/SVG.cpp | 1 + Libraries/Kanimaji/Source/SVG.hpp | 2 -- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Libraries/Kanimaji/Include/Kanimaji/Error.hpp b/Libraries/Kanimaji/Include/Kanimaji/Error.hpp index 79762d1..5f1f974 100644 --- a/Libraries/Kanimaji/Include/Kanimaji/Error.hpp +++ b/Libraries/Kanimaji/Include/Kanimaji/Error.hpp @@ -1,7 +1,9 @@ #ifndef KANIMAJI_ERROR_HPP #define KANIMAJI_ERROR_HPP +#include #include +#include namespace Kanimaji { diff --git a/Libraries/Kanimaji/Source/Kanimaji.cpp b/Libraries/Kanimaji/Source/Kanimaji.cpp index 8c8335b..7869e94 100644 --- a/Libraries/Kanimaji/Source/Kanimaji.cpp +++ b/Libraries/Kanimaji/Source/Kanimaji.cpp @@ -1,3 +1,4 @@ +#include "Kanimaji/Error.hpp" #include "Kanimaji/Kanimaji.hpp" #include "Kanimaji/Settings.hpp" #include "SVG.hpp" diff --git a/Libraries/Kanimaji/Source/SVG.cpp b/Libraries/Kanimaji/Source/SVG.cpp index b0f1a72..d2a7a0e 100644 --- a/Libraries/Kanimaji/Source/SVG.cpp +++ b/Libraries/Kanimaji/Source/SVG.cpp @@ -1,3 +1,4 @@ +#include "Kanimaji/Error.hpp" #include "SVG.hpp" #include diff --git a/Libraries/Kanimaji/Source/SVG.hpp b/Libraries/Kanimaji/Source/SVG.hpp index 3682a7d..6ed8704 100644 --- a/Libraries/Kanimaji/Source/SVG.hpp +++ b/Libraries/Kanimaji/Source/SVG.hpp @@ -1,8 +1,6 @@ #ifndef KANIMAJI_SVG_HPP #define KANIMAJI_SVG_HPP -#include "Kanimaji/Error.hpp" - #include #include #include From 99ba5b4fd9d709481f2f5a0b97e0b62a6863d703 Mon Sep 17 00:00:00 2001 From: TennesseeTrash Date: Sun, 8 Jun 2025 14:52:20 +0200 Subject: [PATCH 2/2] Re-enable arguments in KanimajiTool --- Tools/KanimajiTool/Main.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Tools/KanimajiTool/Main.cpp b/Tools/KanimajiTool/Main.cpp index 67564f2..ca7cb91 100644 --- a/Tools/KanimajiTool/Main.cpp +++ b/Tools/KanimajiTool/Main.cpp @@ -4,19 +4,19 @@ int main(const int argc, const char *argv[]) { - //if (argc != 3) { - // std::println("Usage: KanimajiTool SOURCE DESTINATION\n\n" - // "SOURCE - Path to a file from the KanjiVG dataset.\n" - // "DESTINATION - Path to write the animated SVG.\n" - // ); - // return 1; - //} + if (argc != 3) { + std::println("Usage: KanimajiTool SOURCE DESTINATION\n\n" + "SOURCE - Path to a file from the KanjiVG dataset.\n" + "DESTINATION - Path to write the animated SVG.\n" + ); + return 1; + } try { - Kanimaji::AnimateFile("084b8.svg", "084b8-out.svg"); + Kanimaji::AnimateFile(argv[1], argv[2]); } catch (const std::exception& e) { - std::println("Could not animate the input file"); + std::println("Could not animate {}: {}", argv[1], argv[2]); return 1; }