Changeset 606c39807a576c659e86f222ee0d6793e61262e7

Timestamp:

21/03/07 23:10:50 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1174515050 +0000

git-parent:

[e8740b8b7abed00e06cdbef7aad8e8f17e64b10d]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1174515050 +0000

Message:

Change the visible heigh/width only if they weren't set in the source text subpicture. Else use the original values. Could someone with good knowledge of the freetype module (and maybe other text render modules ... if we have any) confirm that this change is ok?

Files:

• modules/misc/freetype.c (modified) (2 diffs)

modules/misc/freetype.c

@@ -409 +409 @@
-    fmt.i_width = fmt.i_visible_width = i_width + 4;
-    fmt.i_height = fmt.i_visible_height = i_height + 4;
+    if( p_region->fmt.i_visible_width > 0 )
+        fmt.i_visible_width = p_region->fmt.i_visible_width;
+    if( p_region->fmt.i_visible_height > 0 )
+        fmt.i_visible_height = p_region->fmt.i_visible_height;
-    fmt.i_x_offset = fmt.i_y_offset = 0;
-    p_region_tmp = spu_CreateRegion( p_filter, &fmt );
@@ -680 +684 @@
-    fmt.i_width = fmt.i_visible_width = i_width + 6;
-    fmt.i_height = fmt.i_visible_height = i_height + 6;
+    if( p_region->fmt.i_visible_width > 0 )
+        fmt.i_visible_width = p_region->fmt.i_visible_width;
+    if( p_region->fmt.i_visible_height > 0 )
+        fmt.i_visible_height = p_region->fmt.i_visible_height;
-    fmt.i_x_offset = fmt.i_y_offset = 0;
-    p_region_tmp = spu_CreateRegion( p_filter, &fmt );