From d2c27f1ec41e66f86854de9511166064ead73a97 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 19 Apr 2017 14:55:37 -0500 Subject: [PATCH] FS-10247: [mod_conference] Fit logo img to size of cropped video or mute image #resolve --- src/mod/applications/mod_conference/conference_video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 6dee4c851d..c88cad9817 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -838,7 +838,8 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg, if (layer->logo_img) { - int ew = layer->screen_w - (layer->geometry.border * 2), eh = layer->screen_h - (layer->banner_img ? layer->banner_img->d_h : 0) - (layer->geometry.border * 2); + //int ew = layer->screen_w - (layer->geometry.border * 2), eh = layer->screen_h - (layer->banner_img ? layer->banner_img->d_h : 0) - (layer->geometry.border * 2); + int ew = layer->img->d_w, eh = layer->img->d_h; int ex = 0, ey = 0; switch_img_fit(&layer->logo_img, ew, eh, layer->logo_fit);