Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Source and destination index mapping on the left side of the first transformation issue fixed

Browse Source
This commit is contained in:
Simon Rozman 2016-04-22 10:59:29 +02:00
parent a021dd31f7
commit 2e89edb62c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libZRCola/src/mapping.cpp
View File

@ -22,6 +22,11 @@
size_t ZRCola::mapping_vector::to_src(_In_ size_t dst) const size_t ZRCola::mapping_vector::to_src(_In_ size_t dst) const
{ {
if (empty()) {
// One-to-one mapping.
return dst;
}
for (size_type l = 0, r = size();;) { for (size_type l = 0, r = size();;) {
if (l < r) { if (l < r) {
size_type m = (l + r) / 2; size_type m = (l + r) / 2;
@ -38,8 +43,9 @@ size_t ZRCola::mapping_vector::to_src(_In_ size_t dst) const
const mapping &el = (*this)[l - 1]; const mapping &el = (*this)[l - 1];
return el.src + (dst - el.dst); return el.src + (dst - el.dst);
} else { } else {
// The destination character index is far left. // The destination character index is left of the first transformation.
return dst; const mapping &el = (*this)[0];
return std::min(dst, el.src);
} }
} }
} }
@ -47,6 +53,11 @@ size_t ZRCola::mapping_vector::to_src(_In_ size_t dst) const
size_t ZRCola::mapping_vector::to_dst(_In_ size_t src) const size_t ZRCola::mapping_vector::to_dst(_In_ size_t src) const
{ {
if (empty()) {
// One-to-one mapping.
return src;
}
for (size_type l = 0, r = size();;) { for (size_type l = 0, r = size();;) {
if (l < r) { if (l < r) {
size_type m = (l + r) / 2; size_type m = (l + r) / 2;
@ -63,8 +74,9 @@ size_t ZRCola::mapping_vector::to_dst(_In_ size_t src) const
const mapping &el = (*this)[l - 1]; const mapping &el = (*this)[l - 1];
return el.dst + (src - el.src); return el.dst + (src - el.src);
} else { } else {
// The source character index is far left. // The source character index is left of the first transformation.
return src; const mapping &el = (*this)[0];
return std::min(src, el.dst);
} }
} }
} }