system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

dwrite: Remove a couple of dead assignments (Clang).

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2015-11-11 23:55:04 +03:00 committed by Alexandre Julliard
parent 84b3606b2f
commit c4b894db63
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dlls/dwrite/analyzer.c
View file

@ -1198,9 +1198,11 @@ static void apply_cluster_spacing(FLOAT leading_spacing, FLOAT trailing_spacing,
advance += trailing_spacing;
modified_advances[end-1] += trailing_spacing;
}
if (advance < min_advance_width) {
advance = min_advance_width - advance;
if (advance > 0.0f) {
/* additional spacing is only applied to leading and trailing glyph */
FLOAT half = (min_advance_width - advance) / 2.0;
FLOAT half = advance / 2.0f;
if (!reduced) {
origin -= half;
@ -1213,13 +1215,11 @@ static void apply_cluster_spacing(FLOAT leading_spacing, FLOAT trailing_spacing,
modified_advances[end-1] += half;
}
else if (leading_spacing < 0.0) {
origin -= min_advance_width - advance;
modified_advances[start] += min_advance_width - advance;
origin -= advance;
modified_advances[start] += advance;
}
else
modified_advances[end-1] += min_advance_width - advance;
advance = min_advance_width;
modified_advances[end-1] += advance;
}
/* now apply positive spacing adjustments */
@ -1317,7 +1317,6 @@ static HRESULT WINAPI dwritetextanalyzer1_ApplyCharacterSpacing(IDWriteTextAnaly
return S_OK;
}
start = 0;
for (start = 0; start < len;) {
UINT32 length = get_cluster_length(clustermap, start, len);