[PATCH 1/2] dwrite: Get rid of assignment to self
Nikolay Sivov
nsivov at codeweavers.com
Fri Feb 3 06:20:27 CST 2017
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
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 08d3aba798..f850c95be8 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;
}
--
2.11.0
More information about the wine-patches
mailing list