sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix offsets.

Browse source
This commit is contained in:
Hermann Kraus 2012-07-02 01:59:29 +02:00
parent 6e4915ef83
commit 228263727f
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/text/layout.cpp
View file

@ -50,7 +50,6 @@ void text_layout::break_lines()
void text_layout::shape_text()
{
UnicodeString const& text = itemizer.get_text();
uint32_t offset = 0; //in utf16 code points
glyphs_.reserve(text.length()); //Preallocate memory
@ -63,7 +62,7 @@ void text_layout::shape_text()
face_ptr face = *(face_set->begin()); //TODO: Implement font sets correctly
text_shaping shaper(face->get_face()); //TODO: Make this more efficient by caching this object in font_face
uint32_t chars = shaper.process_text(text, itr->start, itr->end, itr->rtl == UBIDI_DEFAULT_RTL, itr->script);
shaper.process_text(text, itr->start, itr->end, itr->rtl == UBIDI_DEFAULT_RTL, itr->script);
hb_buffer_t *buffer = shaper.get_buffer();
unsigned num_glyphs = hb_buffer_get_length(buffer);
@ -77,14 +76,13 @@ void text_layout::shape_text()
for (unsigned i=0; i<num_glyphs; i++)
{
glyph_info tmp;
tmp.char_index = offset + glyphs[i].cluster;
tmp.char_index = glyphs[i].cluster;
tmp.glyph_index = glyphs[i].codepoint;
tmp.width = positions[i].x_advance / 64.0;
tmp.face = face;
face->glyph_dimensions(tmp);
glyphs_.push_back(tmp);
}
offset += chars;
}
std::cout << "text_length: unicode chars: " << itemizer.get_text().length() << " glyphs: " << glyphs_.size() << "\n";
std::vector<glyph_info>::const_iterator itr2 = glyphs_.begin(), end2 = glyphs_.end();

2
src/text/shaping.cpp
View file

@ -58,7 +58,7 @@ uint32_t text_shaping::process_text(UnicodeString const& text, unsigned start, u
hb_buffer_reset(buffer_);
uint32_t length = text.length();
std::cout << "process_text: length: " << length << " start: " << start << " end: " << end << "\n";
std::cout << "process_text: length: " << length << " start: " << start << " end: " << end << "rtl:" << rtl << "\n";
hb_buffer_add_utf16(buffer_, text.getBuffer(), length, start, end-start);
hb_buffer_set_direction(buffer_, rtl?HB_DIRECTION_RTL:HB_DIRECTION_LTR);