organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-7848 normalize-append will never modify first-suffix if second begins with a has-boundary-before character; leave safeMiddle empty in that case

Browse source 
X-SVN-Rev: 30020
This commit is contained in:
Markus Scherer 2011-05-04 13:44:04 +00:00
parent 7aaca9b950
commit af43054b4e
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/common/normalizer2impl.cpp
View file

@ -1281,9 +1281,7 @@ void Normalizer2Impl::composeAndAppend(const UChar *src, const UChar *limit,
UErrorCode &errorCode) const {
if(!buffer.isEmpty()) {
const UChar *firstStarterInSrc=findNextCompBoundary(src, limit);
if(src==firstStarterInSrc) {
buffer.copyReorderableSuffixTo(safeMiddle);
} else {
if(src!=firstStarterInSrc) {
const UChar *lastStarterInDest=findPreviousCompBoundary(buffer.getStart(),
buffer.getLimit());
int32_t destSuffixLength=(int32_t)(buffer.getLimit()-lastStarterInDest);
@ -1667,9 +1665,7 @@ void Normalizer2Impl::makeFCDAndAppend(const UChar *src, const UChar *limit,
UErrorCode &errorCode) const {
if(!buffer.isEmpty()) {
const UChar *firstBoundaryInSrc=findNextFCDBoundary(src, limit);
if(src==firstBoundaryInSrc) {
buffer.copyReorderableSuffixTo(safeMiddle);
} else {
if(src!=firstBoundaryInSrc) {
const UChar *lastBoundaryInDest=findPreviousFCDBoundary(buffer.getStart(),
buffer.getLimit());
int32_t destSuffixLength=(int32_t)(buffer.getLimit()-lastBoundaryInDest);