Nikolay Sivov : dwrite: Fix a typo to actually return kerning pair adjustments.

Alexandre Julliard julliard at winehq.org
Wed Mar 15 16:41:52 CDT 2017


Module: wine
Branch: master
Commit: c3b108e54b99eff3942c44eef5aa89c1dbcebd91
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c3b108e54b99eff3942c44eef5aa89c1dbcebd91

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Mar 15 22:35:34 2017 +0300

dwrite: Fix a typo to actually return kerning pair adjustments.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dwrite/font.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index ffd75c6..de8b80a 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -212,7 +212,7 @@ struct dwrite_colorglyphenum {
 enum fontface_flags {
     FONTFACE_IS_SYMBOL             = 1 << 0,
     FONTFACE_IS_MONOSPACED         = 1 << 1,
-    FONTFACE_HAS_KERN_PAIRS        = 1 << 2,
+    FONTFACE_HAS_KERNING_PAIRS     = 1 << 2,
     FONTFACE_HAS_VERTICAL_VARIANTS = 1 << 3
 };
 
@@ -967,7 +967,7 @@ static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace4
         return E_INVALIDARG;
     }
 
-    if (This->flags & FONTFACE_HAS_KERN_PAIRS) {
+    if (!(This->flags & FONTFACE_HAS_KERNING_PAIRS)) {
         memset(adjustments, 0, count*sizeof(INT32));
         return S_OK;
     }
@@ -983,7 +983,7 @@ static BOOL WINAPI dwritefontface1_HasKerningPairs(IDWriteFontFace4 *iface)
 {
     struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface);
     TRACE("(%p)\n", This);
-    return !!(This->flags & FONTFACE_HAS_KERN_PAIRS);
+    return !!(This->flags & FONTFACE_HAS_KERNING_PAIRS);
 }
 
 static HRESULT WINAPI dwritefontface1_GetRecommendedRenderingMode(IDWriteFontFace4 *iface,
@@ -4310,7 +4310,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, IDWriteFontFace4 **ret
     if (is_symbol)
         fontface->flags |= FONTFACE_IS_SYMBOL;
     if (freetype_has_kerning_pairs(&fontface->IDWriteFontFace4_iface))
-        fontface->flags |= FONTFACE_HAS_KERN_PAIRS;
+        fontface->flags |= FONTFACE_HAS_KERNING_PAIRS;
     if (freetype_is_monospaced(&fontface->IDWriteFontFace4_iface))
         fontface->flags |= FONTFACE_IS_MONOSPACED;
     if (opentype_has_vertical_variants(&fontface->IDWriteFontFace4_iface))




More information about the wine-cvs mailing list