From a616dd007bd9ee34d60a46d4a739aace5919919e Mon Sep 17 00:00:00 2001
From: GenevensiS <66968533+G-e-n-e-v-e-n-s-i-S@users.noreply.github.com>
Date: Sun, 7 Dec 2025 00:42:32 +0100
Subject: [PATCH] restore use_user_settings in to_card_image

---
 src/data/format/image.cpp      |  2 +-
 src/script/functions/image.cpp | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/data/format/image.cpp b/src/data/format/image.cpp
index 70510fca..0cdaa7f8 100644
--- a/src/data/format/image.cpp
+++ b/src/data/format/image.cpp
@@ -199,7 +199,7 @@ void export_image(const SetP& set, const CardP& card, const String& filename) {
   const StyleSheet& stylesheet = set->stylesheetFor(card);
   StyleSheetSettings& stylesheet_settings = settings.stylesheetSettingsFor(stylesheet);
   double zoom = settings.exportZoomSettingsFor(stylesheet);
-  Radians angle = stylesheet_settings.card_normal_export() ? 0.0 : stylesheet_settings.card_angle() / 360.0 * 2.0 * M_PI;
+  Radians angle = stylesheet_settings.card_normal_export() ? 0.0 : deg_to_rad(stylesheet_settings.card_angle());
   Image img = export_image(set, card, zoom, angle);
   img.SaveFile(filename);
 }
diff --git a/src/script/functions/image.cpp b/src/script/functions/image.cpp
index 8c169519..8ca3b3c7 100644
--- a/src/script/functions/image.cpp
+++ b/src/script/functions/image.cpp
@@ -33,16 +33,21 @@ SCRIPT_FUNCTION(to_image) {
 SCRIPT_FUNCTION(to_card_image) {
   SCRIPT_PARAM(Set*, set);
   SCRIPT_PARAM(CardP, input);
-  SCRIPT_PARAM_DEFAULT(double, zoom, 100);
-  SCRIPT_PARAM_DEFAULT(Degrees, angle, 0);
+  SCRIPT_PARAM_DEFAULT(double, zoom, 100.0);
+  SCRIPT_PARAM_DEFAULT(Degrees, angle, 0.0);
   SCRIPT_PARAM_DEFAULT(bool, use_user_settings, false);
   if (use_user_settings) {
-    // Use the User's Preferences for Export Zoom and Angle settings.
-    return make_intrusive<ArbitraryImage>(export_image(set, input));
+    // Use the User's Preferences for Export Zoom and Angle settings.
+    const StyleSheet& stylesheet = set->stylesheetFor(input);
+    StyleSheetSettings& stylesheet_settings = settings.stylesheetSettingsFor(stylesheet);
+    zoom = settings.exportZoomSettingsFor(stylesheet);
+    angle = stylesheet_settings.card_normal_export() ? 0.0 : deg_to_rad(stylesheet_settings.card_angle());
   } else {
     // Use the provided (or defaulted) Zoom and Angle.
-    return make_intrusive<ArbitraryImage>(export_image(set, input, (zoom / 100), deg_to_rad(angle)));
+    zoom = zoom / 100.0;
+    angle = deg_to_rad(angle);
   }
+  return make_intrusive<ArbitraryImage>(export_image(set, input, zoom, angle));
 }
 
 SCRIPT_FUNCTION(import_image) {