[vlc-commits] Freetype: fix Android miscompilation

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Oct 25 18:33:54 2015 +0100| [0c76db2eace919d75307830daf87748ea10fa4f0] | committer: Jean-Baptiste Kempf

Freetype: fix Android miscompilation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c76db2eace919d75307830daf87748ea10fa4f0
---

 modules/text_renderer/platform_fonts.c |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/text_renderer/platform_fonts.c b/modules/text_renderer/platform_fonts.c
index cb9c01e..cf0bda0 100644
--- a/modules/text_renderer/platform_fonts.c
+++ b/modules/text_renderer/platform_fonts.c
@@ -1405,18 +1405,6 @@ static int Android_ParseFamily( filter_t *p_filter, xml_reader_t *p_xml )
     return VLC_EGENERIC;
 }
 
-int Android_Prepare( filter_t *p_filter )
-{
-    if( Android_ParseSystemFonts( p_filter, ANDROID_SYSTEM_FONTS ) == VLC_ENOMEM )
-        return VLC_EGENERIC;
-    if( Android_ParseSystemFonts( p_filter, ANDROID_FALLBACK_FONTS ) == VLC_ENOMEM )
-        return VLC_EGENERIC;
-    if( Android_ParseSystemFonts( p_filter, ANDROID_VENDOR_FONTS ) == VLC_ENOMEM )
-        return VLC_EGENERIC;
-
-    return VLC_SUCCESS;
-}
-
 static int Android_ParseSystemFonts( filter_t *p_filter, const char *psz_path )
 {
     int i_ret = VLC_SUCCESS;
@@ -1449,6 +1437,18 @@ static int Android_ParseSystemFonts( filter_t *p_filter, const char *psz_path )
     return i_ret;
 }
 
+int Android_Prepare( filter_t *p_filter )
+{
+    if( Android_ParseSystemFonts( p_filter, ANDROID_SYSTEM_FONTS ) == VLC_ENOMEM )
+        return VLC_EGENERIC;
+    if( Android_ParseSystemFonts( p_filter, ANDROID_FALLBACK_FONTS ) == VLC_ENOMEM )
+        return VLC_EGENERIC;
+    if( Android_ParseSystemFonts( p_filter, ANDROID_VENDOR_FONTS ) == VLC_ENOMEM )
+        return VLC_EGENERIC;
+
+    return VLC_SUCCESS;
+}
+
 const vlc_family_t *Android_GetFamily( filter_t *p_filter, const char *psz_family )
 {
     filter_sys_t *p_sys = p_filter->p_sys;