add store_in_metadata image style property

src/data/format/file_to_text.h

@@ -0,0 +1,76 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make card games                |
+//| Copyright:    (C) Twan van Laarhoven and the other MSE developers          |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#pragma once
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+#include <fstream>
+
+// ----------------------------------------------------------------------------- : File to UTF8 Encoding
+
+inline std::string fileToUTF8(const std::string& filepath) {
+  // File to char
+  std::ifstream file(filepath, std::ios::binary);
+  file.unsetf(std::ios::skipws);
+  std::vector<unsigned char> buffer = std::vector<unsigned char>(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>());
+  int size = buffer.size();
+  if (size < 2) {
+    queue_message(MESSAGE_WARNING, _("File too small to encode"));
+    return "";
+  }
+  // All bytes that have a highest bit of 0 are valid UTF8 characters, so:
+  // Reset the highest bit of each byte, store these bits in additional bytes at the end
+  const unsigned char highest_bit = 1 << 7;
+  unsigned char added_byte = 0;
+  for (int i = 0, b = 0 ; i < size ; ++i, ++b) {
+    if (b == 7) {                         // Never set the highest bit of the added byte
+      buffer.push_back(added_byte);
+      b = 0;
+    }
+    unsigned char bit = 1 << b;
+    if ((buffer[i] & highest_bit) != 0) { // The highest bit of the buffer is set
+      buffer[i] &= ~highest_bit;          // Reset the highest bit of the buffer
+      added_byte |= bit;                  // Set the bit of the added byte
+    } else {
+      added_byte &= ~bit;                 // Reset the bit of the added byte
+    }
+  }
+  buffer.push_back(added_byte);
+  // Char to string
+  return std::string(buffer.begin(), buffer.end());
+}
+
+inline bool UTF8ToFile(const std::string& filepath, std::string& string) {
+  // String to char
+  std::vector<unsigned char> buffer(string.begin(), string.end());
+  int size = buffer.size();
+  if (size < 2) {
+    queue_message(MESSAGE_WARNING, _("File too small to decode"));
+    return false;
+  }
+  // Restore the highest bit of each byte
+  size = (size * 7) / 8;
+  const unsigned char highest_bit = 1 << 7;
+  unsigned char added_byte = buffer[size];
+  for (int i = 0, j = size, b = 0 ; i < size ; ++i, ++b) {
+    if (b == 7) {
+      ++j;
+      added_byte = buffer[j];
+      b = 0;
+    }
+    unsigned char bit = 1 << b;
+    if ((added_byte & bit) != 0) { // The bit of the added byte is set
+      buffer[i] |= highest_bit;    // Set the highest bit of the buffer
+    }
+  }
+  buffer.resize(size);
+  // Char to file
+  std::ofstream file(filepath, std::ios::out|std::ios::binary);
+  std::copy(buffer.cbegin(), buffer.cend(), std::ostream_iterator<unsigned char>(file));
+  return true;
+}

src/data/format/image.cpp

@@ -10,6 +10,7 @@
 #include <util/tagged_string.hpp>
 #include <data/format/formats.hpp>
 #include <data/format/clipboard.hpp>
+#include <data/format/file_to_text.h>
 #include <data/game.hpp>
 #include <data/field/image.hpp>
 #include <data/set.hpp>
@@ -18,8 +19,7 @@
 #include <data/settings.hpp>
 #include <script/functions/json.hpp>
 #include <gui/util.hpp>
-#include <render/card/viewer.hpp>
-#include <wx/filename.h>
+#include <render/card/viewer.hpp>
 
 class ZoomedUnrotatedDataViewer : public DataViewer {
 public:
@@ -136,16 +136,25 @@ Image export_image(const SetP& set, const CardP& card, const bool write_metadata
     boost::json::object cardv = mse_to_json(card, set.get());
     boost::json::object& cardv_data = cardv["data"].as_object();
     StyleSheetP stylesheet = set->stylesheetForP(card);
-    if (!settings.stylesheetSettingsFor(*stylesheet).card_notes_export()) cardv["notes"] = "";
+    if (!settings.stylesheetSettingsFor(*stylesheet).card_notes_export()) cardv["notes"] = "";
+    // iterate over all image fields
     for(IndexMap<FieldP, ValueP>::iterator it = card_data.begin() ; it != card_data.end() ; ++it) {
       ImageValue* value = dynamic_cast<ImageValue*>(it->get());
       if (value && !value->filename.empty()) {
         FieldP field = (*it)->fieldP;
-        StyleP style = stylesheet->card_style.at(field->index);
+        ImageStyle* style = dynamic_cast<ImageStyle*>(stylesheet->card_style.at(field->index).get());
         if (style) {
-          style->update(set->getContext(card));
-          std::string rect = style->getExternalRectString(zoom, angle_radians, bleed_pixels, width, height, 0).ToStdString();
-          cardv_data[field->name.ToStdString()] = rect;
+          style->update(set->getContext(card));
+          // store the entire image in the metadata
+          if (style->store_in_metadata()) {
+            std::string bytes = style->getExternalImageString(set, value);
+            cardv_data[field->name.ToStdString()] = bytes;
+          }
+          // store only crop coordinates
+          else {
+            std::string rect = style->getExternalRectString(zoom, angle_radians, bleed_pixels, width, height, 0);
+            cardv_data[field->name.ToStdString()] = rect;
+          }
         }
       }
     }
@@ -224,13 +233,20 @@ Image export_image( const SetP& set, const vector<CardP>& cards,
     for(IndexMap<FieldP, ValueP>::iterator it = card_data.begin() ; it != card_data.end() ; ++it) {
       ImageValue* value = dynamic_cast<ImageValue*>(it->get());
       if (value && !value->filename.empty()) {
-        FieldP field = (*it)->fieldP;
-        StyleP style = stylesheet->card_style.at(field->index);
+        FieldP field = (*it)->fieldP;
+        ImageStyle* style = dynamic_cast<ImageStyle*>(stylesheet->card_style.at(field->index).get());
         if (style) {
           style->update(set->getContext(card));
-          Rotation rotation();
-          std::string rect = style->getExternalRectString(zooms[i], angles[i], bleeds[i], widths[i], heights[i], offsets[i]).ToStdString();
-          cardv_data[field->name.ToStdString()] = rect;
+          // store the entire image in the metadata
+          if (style->store_in_metadata()) {
+            std::string bytes = style->getExternalImageString(set, value);
+            cardv_data[field->name.ToStdString()] = bytes;
+          }
+          // store only crop coordinates
+          else {
+            std::string rect = style->getExternalRectString(zooms[i], angles[i], bleeds[i], widths[i], heights[i], offsets[i]);
+            cardv_data[field->name.ToStdString()] = rect;
+          }
         }
       }
     }