Module: wine Branch: master Commit: f4e30056454fff1c585564f6b3ec5123100b64e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e30056454fff1c585564f6b3...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Dec 16 17:48:15 2014 +0300
dwrite: Font collection pointer is never null when creating text format.
---
dlls/dwrite/layout.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6d8145d..4c65732 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1972,14 +1972,8 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.trimming.delimiter = 0; This->format.trimming.delimiterCount = 0; This->format.trimmingsign = NULL; - - if (collection) - { - This->format.collection = collection; - IDWriteFontCollection_AddRef(collection); - } - else - ERR("Collection should always be set\n"); + This->format.collection = collection; + IDWriteFontCollection_AddRef(collection);
*format = (IDWriteTextFormat*)&This->IDWriteTextFormat1_iface;