From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 10 Mar 2016 07:25:45 +0000 (-0600)
Subject: FS-8921 #resolve [Tweak banner code in mod conference]
X-Git-Tag: v1.6.7~2^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3e316157fd7fef9ec04ce4c8f194a273c1f0d5a;p=thirdparty%2Ffreeswitch.git

FS-8921 #resolve [Tweak banner code in mod conference]
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index f471017609..2eb91fb95c 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -449,6 +449,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
 		
 		if (layer->banner_img && !layer->banner_patched) {
 			switch_img_fill(layer->canvas->img, layer->x_pos + layer->geometry.border, layer->y_pos + layer->geometry.border, layer->screen_w, layer->screen_h, &layer->canvas->letterbox_bgcolor);
+			switch_img_fit(&layer->banner_img, layer->screen_w, layer->screen_h, SWITCH_FIT_SIZE);
 			switch_img_patch(IMG, layer->banner_img, layer->x_pos + layer->geometry.border, layer->y_pos + (layer->screen_h - layer->banner_img->d_h) + layer->geometry.border);
 
 			if (!freeze) {
diff --git a/src/switch_core_video.c b/src/switch_core_video.c
index 69bd310fd1..288940bea1 100644
--- a/src/switch_core_video.c
+++ b/src/switch_core_video.c
@@ -1061,7 +1061,7 @@ SWITCH_DECLARE(uint32_t) switch_img_txt_handle_render(switch_img_txt_handle_t *h
 		pen.y += slot->advance.y >> 6;
 	}
 
-	ret = width + slot->bitmap.width * 3;
+	ret = width + slot->bitmap.width * 5;
 
 	FT_Done_Face(face);
 
@@ -1128,6 +1128,7 @@ SWITCH_DECLARE(switch_image_t *) switch_img_write_text_img(int w, int h, switch_
 
     if (len < 5) len = 5;
 
+
 	switch_img_txt_handle_create(&txthandle, font_face, fg, bg, font_size, 0, NULL);
 	switch_color_set_rgb(&bgcolor, bg);