From f9aa4f95772efbf0eba8ec941c4013d9c2bc6782 Mon Sep 17 00:00:00 2001 From: TomTkacz Date: Mon, 10 Mar 2025 20:34:23 -0500 Subject: [PATCH] fixed import_image not generating in CLI --- src/gfx/generated_image.hpp | 1 + src/script/functions/image.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gfx/generated_image.hpp b/src/gfx/generated_image.hpp index 42941923..f7023a9c 100644 --- a/src/gfx/generated_image.hpp +++ b/src/gfx/generated_image.hpp @@ -408,6 +408,7 @@ public: Image generate(const Options&) const override; bool operator == (const GeneratedImage& that) const override; inline String toString() { return filepath; } + inline String ExternalImage::toCode() const override { return ""; } private: String filepath; }; diff --git a/src/script/functions/image.cpp b/src/script/functions/image.cpp index 927d529b..f799faa6 100644 --- a/src/script/functions/image.cpp +++ b/src/script/functions/image.cpp @@ -19,6 +19,7 @@ #include #include #include +#include // for MSE_CLI void parse_enum(const String&, ImageCombine& out); @@ -45,8 +46,12 @@ SCRIPT_FUNCTION(to_card_image) { } SCRIPT_FUNCTION(import_image) { + SCRIPT_PARAM(Set*, set); SCRIPT_PARAM(String, path); - return make_intrusive(path); + auto extImg = make_intrusive(path); + if (cli.haveConsole()) // makes sure generate() is called, but only once, when using the CLI + extImg->generate(GeneratedImage::Options(0, 0, set->stylesheet.get(), set)); + return extImg; } // ----------------------------------------------------------------------------- : Image functions