Re: fontconfig: Branch 'master' - 2 commits

[Behdad Esfahbod <behdad@xxxxxxxxxx>]

Ouch. Merge fail. Fixed.

On Wed, Dec 20, 2017 at 5:20 AM, Akira TAGOH <akira@xxxxxxxxx> wrote:

On Wed, Dec 20, 2017 at 5:05 AM, Behdad Esfahbod
<behdad@xxxxxxxxxxxxxxxxxxxxxx> wrote:
> @@ -652,8 +697,6 @@ FcFontRenderPrepare (FcConfig           *config,
>                 if (!l)
>                     goto bail0;
>                 dir = FcStrDirname (FcValueString (&l->value));
> -               if (!config)
> -                       config = FcConfigGetCurrent ();
>                 if (config && FcHashTableFind (config->alias_table, dir, (void **) &alias))
>                 {
>                     FcChar8 *base = FcStrBasename (FcValueString (&l->value));

Why did you revert this?

--
Akira TAGOH

_______________________________________________
Fontconfig mailing list
Fontconfig@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/fontconfig

--

behdad
http://behdad.org/

_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/fontconfig