Verified Commit 61046045 authored by Bernd Paysan's avatar Bernd Paysan
Browse files

Reverted metric precision

parent 69773c78

texture-font.c

+38 −38
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ texture_font_init(texture_font_t *self) 
    self->lcd_weights[3] = 0x40;

    self->lcd_weights[4] = 0x10;



    if (!texture_font_load_face(self, self->size))

    if (!texture_font_load_face(self, self->size * 100.f))

        return -1;



    self->underline_position = self->face->underline_position / (float)(HRESf*HRESf) * self->size;
@@ -229,9 +229,9 @@ texture_font_init(texture_font_t *self) 
    }



    metrics = self->face->size->metrics;

    self->ascender = (metrics.ascender) / 64.0;

    self->descender = (metrics.descender) / 64.0;

    self->height = (metrics.height) / 64.0;

    self->ascender = (metrics.ascender >> 6) / 100.f;

    self->descender = (metrics.descender >> 6) / 100.f;

    self->height = (metrics.height >> 6) / 100.f;

    self->linegap = self->height - self->ascender + self->descender;



    /* NULL is a special glyph */
@@ -401,6 +401,7 @@ texture_font_load_face( texture_font_t *self, float size ) 
			    __FILENAME__, __LINE__, FT_Errors[error].code, FT_Errors[error].message);

	    goto cleanup_face;

	}

    }



    if( texture_is_color_font( self ) ) {

	/* Select best size */
@@ -439,7 +440,6 @@ texture_font_load_face( texture_font_t *self, float size ) 
    }

    /* Set transform matrix */

    FT_Set_Transform(self->face, &matrix, NULL);

    }



    return 1;
@@ -749,7 +749,7 @@ cleanup_stroker: 
    for( i = 0; i < src_h; i++ )

    {

        //difference between width and pitch: https://www.freetype.org/freetype2/docs/reference/ft2-basic_types.html#FT_Bitmap

        memcpy( dst_ptr, src_ptr, ft_bitmap.width);

        memcpy( dst_ptr, src_ptr, ft_bitmap.width << (self->atlas->depth == 4 ? 2 : 0));

        dst_ptr += tgt_w * self->atlas->depth;

        src_ptr += ft_bitmap.pitch;

    }