kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2019-08-05 20:44:55 +09:00
parent fca14bfdea 16d806ff92
commit 391c645d12
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/ector/software/ector_software_rasterizer.c
View File

@ -664,7 +664,7 @@ void ector_software_thread_init(Ector_Software_Thread *thread)
SW_FT_Stroker_New(&thread->stroker);
SW_FT_Stroker_Set(thread->stroker, 1 << 6,
SW_FT_STROKER_LINECAP_BUTT, SW_FT_STROKER_LINEJOIN_MITER, 0);
SW_FT_STROKER_LINECAP_BUTT, SW_FT_STROKER_LINEJOIN_MITER, 0x4<<16);
}
void ector_software_rasterizer_init(Software_Rasterizer *rasterizer)
@ -692,6 +692,10 @@ void ector_software_rasterizer_stroke_set(Ector_Software_Thread *thread,
SW_FT_Stroker_LineJoin join;
int stroke_width;
double scale_factor = 1.0;
//TODO: The interface to change the value of the miter_limit is not yet ready.
SW_FT_Fixed miter_limit = 0x4<<16;
if (m)
{
// get the minimum scale factor from matrix
@ -728,7 +732,7 @@ void ector_software_rasterizer_stroke_set(Ector_Software_Thread *thread,
join = SW_FT_STROKER_LINEJOIN_MITER;
break;
}
SW_FT_Stroker_Set(thread->stroker, stroke_width, cap, join, 0);
SW_FT_Stroker_Set(thread->stroker, stroke_width, cap, join, miter_limit);
}
static void

2
src/static_libs/vg_common/vg_common_json.c
View File

@ -381,7 +381,7 @@ _update_vg_tree(Efl_Canvas_Vg_Container *root, const LOTLayerNode *layer, int de
{
ctree = efl_add(EFL_CANVAS_VG_CONTAINER_CLASS, root);
efl_key_data_set(root, key, ctree);
if (clayer->name) efl_key_data_set(ctree, "_lot_node_name", clayer->name);
if (clayer->keypath) efl_key_data_set(ctree, "_lot_node_name", clayer->keypath);
}
#if DEBUG
for (int i = 0; i < depth; i++) printf(" ");