Nikolay Sivov : dwrite: Get rid of assignment to self.

Alexandre Julliard julliard at winehq.org
Fri Feb 3 13:31:33 CST 2017


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Feb  3 15:20:27 2017 +0300

dwrite: Get rid of assignment to self.

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

---

 dlls/dwrite/layout.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 08d3aba..f850c95 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -2002,12 +2002,10 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout)
         }
         i = min(i, layout->cluster_count - 1);
 
-        if (overflow) {
-            /* Overflown on whitespace, ignore it */
-            if (layout->clustermetrics[i].isWhitespace && layout_can_wrap_after(layout, i))
-                i = i;
+        /* Ignore if overflown on whitespace */
+        if (overflow && !(layout->clustermetrics[i].isWhitespace && layout_can_wrap_after(layout, i))) {
             /* Use most recently found breaking point */
-            else if (last_breaking_point != ~0u) {
+            if (last_breaking_point != ~0u) {
                 i = last_breaking_point;
                 last_breaking_point = ~0u;
             }




More information about the wine-cvs mailing list