Skip to content

Freetype fixes #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kierank wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Freetype fixes #1240

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54cfac6
upipe_freetype: index a glyph bitmap by its pitch
kierank Aug 26, 2026
67f2c65
upipe_freetype: fix the horizontal position of a bounding box
kierank Aug 26, 2026
2aeb36f
upipe_freetype: do not read uninitialised values
kierank Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions lib/upipe-freetype/upipe_freetype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ static int upipe_freetype_load_face(struct upipe *upipe)
return UBASE_ERR_INVALID;

FTC_ScalerRec scaler;
memset(&scaler, 0, sizeof (scaler));

@funman funman Sep 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does FTC_ScalerRec scaler = { 0 }; work?

scaler.face_id = upipe_freetype->font;
scaler.width = upipe_freetype->pixel_size;
scaler.height = upipe_freetype->pixel_size;
Expand Down Expand Up @@ -660,7 +661,7 @@ static bool upipe_freetype_handle(struct upipe *upipe, struct uref *uref,
&type, index, &sbit, NULL))
continue;

int left, top, width, height, xadvance, yadvance;
int left, top, width, height, pitch, xadvance, yadvance;
unsigned char *buffer;
if (!sbit->buffer) {
if (FTC_ImageCache_Lookup(upipe_freetype->img_cache,
Expand All @@ -675,6 +676,7 @@ static bool upipe_freetype_handle(struct upipe *upipe, struct uref *uref,
top = slot->top;
width = slot->bitmap.width;
height = slot->bitmap.rows;
pitch = slot->bitmap.pitch;
xadvance = glyph->advance.x;
yadvance = glyph->advance.y;
buffer = slot->bitmap.buffer;
Expand All @@ -684,6 +686,7 @@ static bool upipe_freetype_handle(struct upipe *upipe, struct uref *uref,
top = sbit->top;
width = sbit->width;
height = sbit->height;
pitch = sbit->pitch;
/* scale to 16.16 */
xadvance = sbit->xadvance << 16;
yadvance = sbit->yadvance << 16;
Expand All @@ -700,7 +703,7 @@ static bool upipe_freetype_handle(struct upipe *upipe, struct uref *uref,
if (ypos + j < 0 || ypos + j >= vsize)
continue;

uint8_t px = buffer[j * width + i] * upipe_freetype->foreground[3] / 0xff;
uint8_t px = buffer[j * pitch + i] * upipe_freetype->foreground[3] / 0xff;

#define DO_PLANE(Plane, Val) \
if (Plane.p) { \
Expand Down Expand Up @@ -943,6 +946,7 @@ static int _upipe_freetype_get_bbox(struct upipe *upipe,
FT_Bool use_kerning = FT_HAS_KERNING(upipe_freetype->face);
FT_UInt previous = 0;
FT_Pos yMax = 0;
bool first = true;
int64_t width = 0;

for (size_t i = 0; str[i] != '\0';) {
Expand Down Expand Up @@ -976,8 +980,10 @@ static int _upipe_freetype_get_bbox(struct upipe *upipe,
FT_BBox ft_bbox;
FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_PIXELS, &ft_bbox);

if (!i)
if (first) {
bbox.x = ft_bbox.xMin;
first = false;
}
if (ft_bbox.yMin < bbox.y)
bbox.y = ft_bbox.yMin;
if (ft_bbox.yMax > yMax)
Expand All @@ -989,7 +995,6 @@ static int _upipe_freetype_get_bbox(struct upipe *upipe,

if (yMax > bbox.y)
bbox.height = yMax - bbox.y;
bbox.height = yMax - bbox.y;

if (width > 0)
/* get width ceil and downscale 16.16 integer */
Expand Down Expand Up @@ -1042,10 +1047,9 @@ static int _upipe_freetype_get_advance(struct upipe *upipe,
}

FT_Fixed advance;
FT_Get_Advance(upipe_freetype->face, index, FT_LOAD_NO_SCALE,
&advance);

total_advance += advance;
if (!FT_Get_Advance(upipe_freetype->face, index, FT_LOAD_NO_SCALE,
&advance))
total_advance += advance;

previous = index;
}
Expand Down
Loading