Skip to content
Snippets Groups Projects
Commit 24f085ba authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files

dwrite: Make font data reference assignment more compact.

parent 45d21d00
No related branches found
No related tags found
No related merge requests found
......@@ -496,9 +496,10 @@ static const struct dwrite_fonttable *get_fontface_cpal(struct dwrite_fontface *
return &fontface->cpal;
}
static void addref_font_data(struct dwrite_font_data *data)
static struct dwrite_font_data * addref_font_data(struct dwrite_font_data *data)
{
InterlockedIncrement(&data->ref);
return data;
}
static void release_font_data(struct dwrite_font_data *data)
......@@ -2645,9 +2646,7 @@ static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily2 *ifac
{
if (!func || func(family->data->fonts[i]))
{
fonts->fonts[fonts->font_count] = family->data->fonts[i];
addref_font_data(family->data->fonts[i]);
fonts->font_count++;
fonts->fonts[fonts->font_count++] = addref_font_data(family->data->fonts[i]);
}
}
......@@ -5006,8 +5005,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li
*/
if (desc->font_data)
{
font_data = desc->font_data;
addref_font_data(font_data);
font_data = addref_font_data(desc->font_data);
}
else
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment