Merge branch 'feat/core/9121-regex-map-epic-ldml' into feat/resources…

…/7042-add-pcm-epic-ldml
keymanapp · Aug 24, 2023 · 79adf5e · 79adf5e
2 parents c7b6787 + ab29171
commit 79adf5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/src/kmx/kmx_plus.h b/core/src/kmx/kmx_plus.h
@@ -272,8 +272,8 @@ struct COMP_KMXPLUS_TRAN_GROUP {
 struct COMP_KMXPLUS_TRAN_TRANSFORM {
     KMXPLUS_STR from;
     KMXPLUS_STR to;
-    KMXPLUS_ELEM mapFrom;
-    KMXPLUS_ELEM mapTo;
+    KMXPLUS_STR mapFrom; // variable name
+    KMXPLUS_STR mapTo;   // variable name
 };
 
 struct COMP_KMXPLUS_TRAN_REORDER {

diff --git a/core/src/ldml/ldml_transforms.cpp b/core/src/ldml/ldml_transforms.cpp
@@ -796,7 +796,9 @@ transforms::load(
         const kmx::COMP_KMXPLUS_TRAN_TRANSFORM *element = tranHelper.getTransform(group->index + itemNumber);
         const std::u32string fromStr                    = kmx::u16string_to_u32string(kplus.strs->get(element->from));
         const std::u32string toStr                      = kmx::u16string_to_u32string(kplus.strs->get(element->to));
-        newGroup.emplace_back(fromStr, toStr, element->mapFrom, element->mapTo, kplus);  // creating a transform_entry
+        KMX_DWORD mapFrom                               = element->mapFrom; // copy, because of alignment
+        KMX_DWORD mapTo                                 = element->mapTo;   // copy, because of alignment
+        newGroup.emplace_back(fromStr, toStr, mapFrom, mapTo, kplus);  // creating a transform_entry
       }
       transforms->addGroup(newGroup);
     } else if (group->type == LDML_TRAN_GROUP_TYPE_REORDER) {