DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failure on Windows in paragraph.cc which was surfaced by enabling (#4434)

Browse Source 
Fixed failure on Windows in paragraph.cc which was surfaced by enabling flutter_tester.exe build on bots.
This commit is contained in:
Ben Konyi 2017-12-08 16:27:47 -08:00 committed by GitHub
parent e8526e6fd3
commit a817ee14cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
third_party/txt/src/txt/paragraph.cc vendored
View File

@ -268,8 +268,8 @@ bool Paragraph::ComputeBidiRuns() {
? UBIDI_DEFAULT_RTL
: UBIDI_DEFAULT_LTR;
UErrorCode status = U_ZERO_ERROR;
ubidi_setPara(bidi.get(), text_.data(), text_.size(), paraLevel, nullptr,
&status);
ubidi_setPara(bidi.get(), reinterpret_cast<const UChar*>(text_.data()),
text_.size(), paraLevel, nullptr, &status);
if (!U_SUCCESS(status))
return false;
@ -939,9 +939,11 @@ Paragraph::PositionWithAffinity Paragraph::GetGlyphPositionAtCoordinate(
const std::vector<GlyphPosition>& line_glyph_position =
glyph_lines_[y_index].positions;
if (line_glyph_position.empty()) {
int line_start_index = std::accumulate(
glyph_lines_.begin(), glyph_lines_.begin() + y_index, 0,
[](const int a, const GlyphLine& b) { return a + b.total_code_units; });
int line_start_index =
std::accumulate(glyph_lines_.begin(), glyph_lines_.begin() + y_index, 0,
[](const int a, const GlyphLine& b) {
return a + static_cast<int>(b.total_code_units);
});
return PositionWithAffinity(line_start_index, DOWNSTREAM);
}