]> granicus.if.org Git - libass/commitdiff
Reindent.
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Mon, 23 Jun 2008 14:46:52 +0000 (14:46 +0000)
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Mon, 23 Jun 2008 14:46:52 +0000 (14:46 +0000)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27127 b3059339-0415-0410-9bf9-f77b7e298cf2

libass/ass_fontconfig.c

index 3a012f524396c9d9c0e2e62403fa56584bba4a56..8da9cd6e5c69ce8db984fb739ef5bb0e513174a1 100644 (file)
@@ -424,46 +424,47 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con
                process_fontdata(priv, library, ftlibrary, i);
 
        if (dir) {
-       if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse)
-       {
-               mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache);
-               if (FcGetVersion() >= 20390 && FcGetVersion() < 20400)
-                       mp_msg(MSGT_ASS, MSGL_WARN,
-                              MSGTR_LIBASS_BetaVersionsOfFontconfigAreNotSupported);
-               // FontConfig >= 2.4.0 updates cache automatically in FcConfigAppFontAddDir()
-               if (FcGetVersion() < 20390) {
-                       FcFontSet* fcs;
-                       FcStrSet* fss;
-                       fcs = FcFontSetCreate();
-                       fss = FcStrSetCreate();
-                       rc = FcStrSetAdd(fss, (const FcChar8*)dir);
-                       if (!rc) {
-                               mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcStrSetAddFailed);
-                               goto ErrorFontCache;
-                       }
-
-                       rc = FcDirScan(fcs, fss, NULL, FcConfigGetBlanks(priv->config), (const FcChar8 *)dir, FcFalse);
-                       if (!rc) {
-                               mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcDirScanFailed);
-                               goto ErrorFontCache;
+               if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse)
+                       {
+                               mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache);
+                               if (FcGetVersion() >= 20390 && FcGetVersion() < 20400)
+                                       mp_msg(MSGT_ASS, MSGL_WARN,
+                                              MSGTR_LIBASS_BetaVersionsOfFontconfigAreNotSupported);
+                               // FontConfig >= 2.4.0 updates cache automatically in FcConfigAppFontAddDir()
+                               if (FcGetVersion() < 20390) {
+                                       FcFontSet* fcs;
+                                       FcStrSet* fss;
+                                       fcs = FcFontSetCreate();
+                                       fss = FcStrSetCreate();
+                                       rc = FcStrSetAdd(fss, (const FcChar8*)dir);
+                                       if (!rc) {
+                                               mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcStrSetAddFailed);
+                                               goto ErrorFontCache;
+                                       }
+
+                                       rc = FcDirScan(fcs, fss, NULL, FcConfigGetBlanks(priv->config),
+                                                      (const FcChar8 *)dir, FcFalse);
+                                       if (!rc) {
+                                               mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcDirScanFailed);
+                                               goto ErrorFontCache;
+                                       }
+
+                                       rc = FcDirSave(fcs, fss, (const FcChar8 *)dir);
+                                       if (!rc) {
+                                               mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcDirSave);
+                                               goto ErrorFontCache;
+                                       }
+                               ErrorFontCache:
+                                       ;
+                               }
                        }
 
-                       rc = FcDirSave(fcs, fss, (const FcChar8 *)dir);
-                       if (!rc) {
-                               mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcDirSave);
-                               goto ErrorFontCache;
-                       }
-               ErrorFontCache:
-                       ;
+               rc = FcConfigAppFontAddDir(priv->config, (const FcChar8*)dir);
+               if (!rc) {
+                       mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcConfigAppFontAddDirFailed);
                }
        }
 
-       rc = FcConfigAppFontAddDir(priv->config, (const FcChar8*)dir);
-       if (!rc) {
-               mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcConfigAppFontAddDirFailed);
-       }
-       }
-
        priv->family_default = family ? strdup(family) : 0;
        priv->path_default = path ? strdup(path) : 0;
        priv->index_default = 0;