organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-05 21:45:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

[COLR] Move cycle-detection to the renderer instead of cairo

Browse source 
Alternative fix for https://github.com/harfbuzz/harfbuzz/issues/4375
This commit is contained in:
Behdad Esfahbod 2023-08-15 10:30:38 -06:00
parent 21a894f055
commit 0c80aec10b
5 changed files with 26 additions and 452 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/OT/Color/COLR/COLR.hh
View file

@ -69,6 +69,7 @@ public:
unsigned int palette_index;
hb_color_t foreground;
VarStoreInstancer &instancer;
hb_set_t current_glyphs;
int depth_left = HB_MAX_NESTING_LEVEL;
int edge_count = HB_COLRV1_MAX_EDGE_COUNT;
@ -2307,6 +2308,7 @@ struct COLR
&(this+varIdxMap),
hb_array (font->coords, font->num_coords));
hb_paint_context_t c (this, funcs, data, font, palette_index, foreground, instancer);
c.current_glyphs.add (glyph);
if (version == 1)
{
@ -2437,10 +2439,16 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const
{
TRACE_PAINT (this);
if (unlikely (c->current_glyphs.has (gid)))
return;
c->current_glyphs.add (gid);
c->funcs->push_inverse_root_transform (c->data, c->font);
if (c->funcs->color_glyph (c->data, gid, c->font))
{
c->funcs->pop_transform (c->data);
c->current_glyphs.del (gid);
return;
}
c->funcs->pop_transform (c->data);
@ -2463,6 +2471,8 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const
if (has_clip_box)
c->funcs->pop_clip (c->data);
c->current_glyphs.del (gid);
}
} /* namespace OT */

3
src/hb-cairo-utils.hh
View file

@ -30,14 +30,11 @@
#include "hb.hh"
#include "hb-cairo.h"
#include "hb-set.hh"
typedef struct
{
cairo_scaled_font_t *scaled_font;
cairo_t *cr;
hb_set_t current_glyphs;
hb_map_t *color_cache;
} hb_cairo_context_t;

8
src/hb-cairo.cc
View file

@ -176,11 +176,6 @@ hb_cairo_paint_color_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED,
hb_cairo_context_t *c = (hb_cairo_context_t *) paint_data;
cairo_t *cr = c->cr;
if (unlikely (c->current_glyphs.has (glyph)))
return true;
c->current_glyphs.add (glyph);
cairo_save (cr);
hb_position_t x_scale, y_scale;
@ -194,8 +189,6 @@ hb_cairo_paint_color_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED,
cairo_restore (cr);
c->current_glyphs.del (glyph);
return true;
}
@ -641,7 +634,6 @@ hb_cairo_render_color_glyph (cairo_scaled_font_t *scaled_font,
c.scaled_font = scaled_font;
c.cr = cr;
c.color_cache = (hb_map_t *) cairo_scaled_font_get_user_data (scaled_font, &color_cache_key);
c.current_glyphs.add (glyph);
hb_font_paint_glyph (font, glyph, hb_cairo_paint_get_funcs (), &c, palette, color);

17
src/hb-ft-colr.hh
View file

@ -105,6 +105,7 @@ struct hb_ft_paint_context_t
FT_Color *palette;
unsigned palette_index;
hb_color_t foreground;
hb_set_t current_glyphs;
int depth_left = HB_MAX_NESTING_LEVEL;
int edge_count = HB_COLRV1_MAX_EDGE_COUNT;
};
@ -320,19 +321,27 @@ _hb_ft_paint (hb_ft_paint_context_t *c,
break;
case FT_COLR_PAINTFORMAT_COLR_GLYPH:
{
hb_codepoint_t gid = paint.u.colr_glyph.glyphID;
if (unlikely (c->current_glyphs.has (gid)))
return;
c->current_glyphs.add (gid);
c->funcs->push_inverse_root_transform (c->data, c->font);
c->ft_font->lock.unlock ();
if (c->funcs->color_glyph (c->data, paint.u.colr_glyph.glyphID, c->font))
if (c->funcs->color_glyph (c->data, gid, c->font))
{
c->ft_font->lock.lock ();
c->funcs->pop_transform (c->data);
c->current_glyphs.del (gid);
return;
}
c->ft_font->lock.lock ();
c->funcs->pop_transform (c->data);
FT_OpaquePaint other_paint = {0};
if (FT_Get_Color_Glyph_Paint (ft_face, paint.u.colr_glyph.glyphID,
if (FT_Get_Color_Glyph_Paint (ft_face, gid,
FT_COLOR_NO_ROOT_TRANSFORM,
&other_paint))
{
@ -361,6 +370,8 @@ _hb_ft_paint (hb_ft_paint_context_t *c,
if (has_clip_box)
c->funcs->pop_clip (c->data);
c->current_glyphs.del (gid);
}
}
break;
@ -485,6 +496,7 @@ hb_ft_paint_glyph_colr (hb_font_t *font,
hb_ft_paint_context_t c (ft_font, font,
paint_funcs, paint_data,
palette, palette_index, foreground);
c.current_glyphs.add (gid);
bool is_bounded = true;
FT_ClipBox clip_box;
@ -508,6 +520,7 @@ hb_ft_paint_glyph_colr (hb_font_t *font,
hb_ft_paint_context_t ce (ft_font, font,
extents_funcs, &extents_data,
palette, palette_index, foreground);
ce.current_glyphs.add (gid);
ce.funcs->push_root_transform (ce.data, font);
ce.recurse (paint);
ce.funcs->pop_transform (ce.data);

440
test/api/results/bad-154
View file

@ -1,447 +1,9 @@
# random seed: R02S8a247191e9c73c84f166b360a40567c1
# random seed: R02S13f44c97ec7b03f792b3b9650a81b62a
# Start of hb tests
# Start of paint tests
# Start of ot tests
start clip rectangle 0 500 500 1e+03
start transform 1 0 0 1 0 0
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
start transform 1 0 -0 1 0 0
paint color glyph 154; acting as failed
end transform
start clip rectangle 0 500 500 1e+03
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
end transform
pop group mode 3
end clip
push group
start transform 1 0 -0 1 0 0
start clip glyph 159