summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr.Smile <vabnick@gmail.com>2017-09-19 20:36:50 +0300
committerDr.Smile <vabnick@gmail.com>2019-05-19 20:18:51 +0300
commit06b6548732a651fa61ebd372c915aec55dd77006 (patch)
treea04736678c296261204d02cc79eddab748d2f307
parentfa49852cd7fbab79653e62e1e52cedeb33a536ea (diff)
downloadlibass-06b6548732a651fa61ebd372c915aec55dd77006.tar.bz2
libass-06b6548732a651fa61ebd372c915aec55dd77006.tar.xz
font: remove unused field
-rw-r--r--libass/ass_font.c13
-rw-r--r--libass/ass_font.h4
-rw-r--r--libass/ass_render.c3
3 files changed, 5 insertions, 15 deletions
diff --git a/libass/ass_font.c b/libass/ass_font.c
index 95ae335..3693be3 100644
--- a/libass/ass_font.c
+++ b/libass/ass_font.c
@@ -249,7 +249,6 @@ ASS_Font *ass_font_new(Cache *font_cache, ASS_Library *library,
font->desc.vertical = desc->vertical;
font->scale_x = font->scale_y = 1.;
- font->v.x = font->v.y = 0;
font->size = 0.;
int error = add_face(fontsel, font, 0);
@@ -264,17 +263,12 @@ ASS_Font *ass_font_new(Cache *font_cache, ASS_Library *library,
}
/**
- * \brief Set font transformation matrix and shift vector
+ * \brief Set font transformation matrix
**/
-void ass_font_set_transform(ASS_Font *font, double scale_x,
- double scale_y, FT_Vector *v)
+void ass_font_set_transform(ASS_Font *font, double scale_x, double scale_y)
{
font->scale_x = scale_x;
font->scale_y = scale_y;
- if (v) {
- font->v.x = v->x;
- font->v.y = v->y;
- }
}
void ass_face_set_size(FT_Face face, double size)
@@ -597,12 +591,11 @@ FT_Glyph ass_font_get_glyph(ASS_Font *font, uint32_t ch, int face_index,
ass_strike_outline_glyph(face, font, glyph, deco & DECO_UNDERLINE,
deco & DECO_STRIKETHROUGH);
- // Apply scaling and shift
+ // Apply scaling
FT_Matrix scale = { double_to_d16(font->scale_x), 0, 0,
double_to_d16(font->scale_y) };
FT_Outline *outl = &((FT_OutlineGlyph) glyph)->outline;
FT_Outline_Transform(outl, &scale);
- FT_Outline_Translate(outl, font->v.x, font->v.y);
glyph->advance.x *= font->scale_x;
return glyph;
diff --git a/libass/ass_font.h b/libass/ass_font.h
index 843a01e..b7bfc10 100644
--- a/libass/ass_font.h
+++ b/libass/ass_font.h
@@ -54,7 +54,6 @@ struct ass_font {
ASS_ShaperFontData *shaper_priv;
int n_faces;
double scale_x, scale_y; // current transform
- FT_Vector v; // current shift
double size;
};
@@ -62,8 +61,7 @@ void charmap_magic(ASS_Library *library, FT_Face face);
ASS_Font *ass_font_new(Cache *font_cache, ASS_Library *library,
FT_Library ftlibrary, ASS_FontSelector *fontsel,
ASS_FontDesc *desc);
-void ass_font_set_transform(ASS_Font *font, double scale_x,
- double scale_y, FT_Vector *v);
+void ass_font_set_transform(ASS_Font *font, double scale_x, double scale_y);
void ass_face_set_size(FT_Face face, double size);
void ass_font_set_size(ASS_Font *font, double size);
void ass_font_get_asc_desc(ASS_Font *font, uint32_t ch, int *asc,
diff --git a/libass/ass_render.c b/libass/ass_render.c
index 69c4439..4ac5798 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1046,8 +1046,7 @@ get_outline_glyph(ASS_Renderer *priv, GlyphInfo *info)
} else {
ass_face_set_size(info->font->faces[info->face_index],
info->font_size);
- ass_font_set_transform(info->font, info->scale_x,
- info->scale_y, NULL);
+ ass_font_set_transform(info->font, info->scale_x, info->scale_y);
FT_Glyph glyph =
ass_font_get_glyph(info->font,
info->symbol, info->face_index, info->glyph_index,