archive-gh-me/node-fontnik
1
0
Fork 0
mirror of https://github.com/mapbox/node-fontnik.git synced 2026-02-01 16:47:18 +00:00
Code Issues Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
Mike Morris 2014-04-18 16:23:44 -04:00
parent cad25d4944
commit d25d78b959
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/font_face.cpp
View File

@ -75,7 +75,7 @@ void font_face::glyph_dimensions(glyph_info &glyph) const {
// Transform with identity matrix and null vector.
// TODO: Is this necessary?
FT_Set_Transform(face_, 0, 0);
// FT_Set_Transform(face_, 0, 0);
if (FT_Load_Glyph(face_, glyph.glyph_index, FT_LOAD_NO_HINTING | FT_LOAD_RENDER)) return;
@ -90,19 +90,29 @@ void font_face::glyph_dimensions(glyph_info &glyph) const {
glyph.line_height = face_->size->metrics.height / 64.0;
// glyph.width = face_->glyph->advance.x / 64.0;
glyph.width = face_->glyph->bitmap.width;
glyph.height = face_->glyph->bitmap.rows;
/*
std::cout << "advance.x / 64.0: " << face_->glyph->advance.x / 64.0 <<
" advance.x >> 6: " << (face_->glyph->advance.x >> 6) <<
" bitmap.width: " << face_->glyph->bitmap.width <<
'\n';
*/
glyph.left = face_->glyph->bitmap_left;
glyph.top = face_->glyph->bitmap_top;
glyph.advance = face_->glyph->metrics.horiAdvance / 64.0;
FT_GlyphSlot slot = face_->glyph;
int width = slot->bitmap.width;
int height = slot->bitmap.rows;
glyph.width = width;
glyph.height = height;
glyph.left = slot->bitmap_left;
glyph.top = slot->bitmap_top;
glyph.advance = slot->metrics.horiAdvance / 64.0;
// Create a signed distance field (SDF) for the glyph bitmap.
if (glyph.width > 0) {
unsigned int buffered_width = glyph.width + 2 * buffer;
unsigned int buffered_height = glyph.height + 2 * buffer;
if (width > 0) {
unsigned int buffered_width = width + 2 * buffer;
unsigned int buffered_height = height + 2 * buffer;
unsigned char *distance = make_distance_map((unsigned char *)face_->glyph->bitmap.buffer, glyph.width, glyph.height, buffer);
unsigned char *distance = make_distance_map((unsigned char *)slot->bitmap.buffer, width, height, buffer);
glyph.bitmap.resize(buffered_width * buffered_height);
for (unsigned int y = 0; y < buffered_height; y++) {

11
src/harfbuzz_shaper.cpp
View File

@ -117,7 +117,16 @@ void harfbuzz_shaper::shape_text(text_line &line,
tmp.format = text_item.format;
// Overwrite default width with better value from HarfBuzz.
tmp.width = positions[i].x_advance / 64.0;
tmp.width = positions[i].x_advance >> 6;
/*
std::cout << "x_advance / 64.0: " <<
positions[i].x_advance / 64.0 <<
" x_advance >> 6: " <<
(positions[i].x_advance >> 6) <<
'\n';
*/
tmp.offset.set(positions[i].x_offset / 64.0,
positions[i].y_offset / 64.0);