Skip to content

Commit 79adf5e

Browse files
authored
Merge branch 'feat/core/9121-regex-map-epic-ldml' into feat/resources/7042-add-pcm-epic-ldml
2 parents c7b6787 + ab29171 commit 79adf5e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

core/src/kmx/kmx_plus.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ struct COMP_KMXPLUS_TRAN_GROUP {
272272
struct COMP_KMXPLUS_TRAN_TRANSFORM {
273273
KMXPLUS_STR from;
274274
KMXPLUS_STR to;
275-
KMXPLUS_ELEM mapFrom;
276-
KMXPLUS_ELEM mapTo;
275+
KMXPLUS_STR mapFrom; // variable name
276+
KMXPLUS_STR mapTo; // variable name
277277
};
278278

279279
struct COMP_KMXPLUS_TRAN_REORDER {

core/src/ldml/ldml_transforms.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,9 @@ transforms::load(
796796
const kmx::COMP_KMXPLUS_TRAN_TRANSFORM *element = tranHelper.getTransform(group->index + itemNumber);
797797
const std::u32string fromStr = kmx::u16string_to_u32string(kplus.strs->get(element->from));
798798
const std::u32string toStr = kmx::u16string_to_u32string(kplus.strs->get(element->to));
799-
newGroup.emplace_back(fromStr, toStr, element->mapFrom, element->mapTo, kplus); // creating a transform_entry
799+
KMX_DWORD mapFrom = element->mapFrom; // copy, because of alignment
800+
KMX_DWORD mapTo = element->mapTo; // copy, because of alignment
801+
newGroup.emplace_back(fromStr, toStr, mapFrom, mapTo, kplus); // creating a transform_entry
800802
}
801803
transforms->addGroup(newGroup);
802804
} else if (group->type == LDML_TRAN_GROUP_TYPE_REORDER) {

0 commit comments

Comments
 (0)