Imported Upstream version 0.14.2+dfsg1

This commit is contained in:
Sebastian Ramacher 2016-05-24 21:53:01 +02:00
parent fb3990e9e5
commit 41a01dbf05
529 changed files with 25112 additions and 2336 deletions

View file

@ -34,7 +34,8 @@ uint32_t texbuf_w = 2048, texbuf_h = 2048;
static struct obs_source_info freetype2_source_info = {
.id = "text_ft2_source",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO |
OBS_SOURCE_CUSTOM_DRAW,
.get_name = ft2_source_get_name,
.create = ft2_source_create,
.destroy = ft2_source_destroy,
@ -200,6 +201,7 @@ static void ft2_source_render(void *data, gs_effect_t *effect)
if (srcdata == NULL) return;
if (srcdata->tex == NULL || srcdata->vbuf == NULL) return;
if (srcdata->text == NULL || *srcdata->text == 0) return;
gs_reset_blend_state();
if (srcdata->outline_text) draw_outlines(srcdata);
@ -366,7 +368,7 @@ static void ft2_source_update(void *data, obs_data_t *settings)
bfree(srcdata->texbuf);
srcdata->texbuf = NULL;
}
srcdata->texbuf = bzalloc(texbuf_w * texbuf_h * 4);
srcdata->texbuf = bzalloc(texbuf_w * texbuf_h);
if (srcdata->font_face)
cache_standard_glyphs(srcdata);