[vlc-commits] commit: FreeType: mark some options as safe ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 13 20:44:56 2010 +0200| [67f568c911c82e26f37dcf9e3e6c037c344b9c52] | committer: Rémi Denis-Courmont 

FreeType: mark some options as safe

Font is not safe because it uses the file system, and is dependent on
the local system anyway. YUVP is only for encoding, so it seems
irrelevant. Other options seem fine.
(cherry picked from commit 6b42661fb7142ad6f384abba3af930c81d58bb8c)

Conflicts:

	modules/misc/freetype.c

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=67f568c911c82e26f37dcf9e3e6c037c344b9c52
---

 modules/misc/freetype.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 8f80110..2bdb34d 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -154,22 +154,28 @@ vlc_module_begin ()
 
     add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT,
                  FONTSIZE_LONGTEXT, true )
+        change_safe()
 
     /* opacity valid on 0..255, with default 255 = fully opaque */
     add_integer_with_range( "freetype-opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, true )
+        change_safe()
 
     /* hook to the color values list, with default 0x00ffffff = white */
     add_integer( "freetype-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false )
         change_integer_list( pi_color_values, ppsz_color_descriptions, NULL )
+        change_safe()
 
     add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
                  FONTSIZER_LONGTEXT, false )
         change_integer_list( pi_sizes, ppsz_sizes_text, NULL )
+        change_safe()
+
     add_integer( "freetype-effect", 2, NULL, EFFECT_TEXT,
                  EFFECT_LONGTEXT, false )
         change_integer_list( pi_effects, ppsz_effects_text, NULL )
+        change_safe()
 
     add_bool( "freetype-yuvp", false, NULL, YUVP_TEXT,
               YUVP_LONGTEXT, true )