Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
302409eb
Commit
302409eb
authored
13 years ago
by
Aric Stewart
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
usp10: Always apply features in logical order.
parent
c4c9f8b0
Branches
Branches containing commit
Tags
wine-950620
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/usp10/shape.c
+15
-11
15 additions, 11 deletions
dlls/usp10/shape.c
with
15 additions
and
11 deletions
dlls/usp10/shape.c
+
15
−
11
View file @
302409eb
...
...
@@ -726,7 +726,7 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN
TRACE
(
" Glyph 0x%x ->"
,
glyphs
[
glyph_index
]);
glyphs
[
glyph_index
]
=
glyphs
[
glyph_index
]
+
GET_BE_WORD
(
ssf1
->
DeltaGlyphID
);
TRACE
(
" 0x%x
\n
"
,
glyphs
[
glyph_index
]);
return
glyph_index
+
1
;
return
glyph_index
+
write_dir
;
}
}
else
...
...
@@ -748,7 +748,7 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN
TRACE
(
" Glyph is 0x%x ->"
,
glyphs
[
glyph_index
]);
glyphs
[
glyph_index
]
=
GET_BE_WORD
(
ssf2
->
Substitute
[
index
]);
TRACE
(
"0x%x
\n
"
,
glyphs
[
glyph_index
]);
return
glyph_index
+
1
;
return
glyph_index
+
write_dir
;
}
}
}
...
...
@@ -797,7 +797,7 @@ static INT GSUB_apply_MultipleSubst(const GSUB_LookupTable *look, WORD *glyphs,
TRACE
(
"
\n
"
);
}
return
glyph_index
+
sub_count
;
return
glyph_index
+
(
sub_count
*
write_dir
)
;
}
}
return
GSUB_E_NOGLYPH
;
...
...
@@ -831,7 +831,7 @@ static INT GSUB_apply_AlternateSubst(const GSUB_LookupTable *look, WORD *glyphs,
TRACE
(
" Glyph 0x%x ->"
,
glyphs
[
glyph_index
]);
glyphs
[
glyph_index
]
=
GET_BE_WORD
(
as
->
Alternate
[
0
]);
TRACE
(
" 0x%x
\n
"
,
glyphs
[
glyph_index
]);
return
glyph_index
+
1
;
return
glyph_index
+
write_dir
;
}
}
return
GSUB_E_NOGLYPH
;
...
...
@@ -894,7 +894,7 @@ static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs,
glyphs
[
j
]
=
glyphs
[
j
+
CompCount
];
*
glyph_count
=
*
glyph_count
-
CompCount
;
}
return
replaceIdx
+
1
;
return
replaceIdx
+
write_dir
;
}
}
}
...
...
@@ -1338,7 +1338,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch
else
{
int
i
;
int
target_glyph
=
nextIndex
-
1
;
int
target_glyph
=
nextIndex
-
write_dir
;
int
seeking_glyph
;
int
target_index
=
-
1
;
int
replacing_glyph
=
-
1
;
...
...
@@ -1346,7 +1346,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch
if
(
changeCount
>
0
)
target_glyph
=
nextIndex
-
(
changeCount
+
1
);
target_glyph
=
nextIndex
-
(
(
changeCount
+
1
)
*
write_dir
)
;
seeking_glyph
=
target_glyph
;
...
...
@@ -1437,21 +1437,25 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W
for
(
lookup_index
=
0
;
lookup_index
<
lookup_count
;
lookup_index
++
)
{
int
i
;
i
=
0
;
if
(
write_dir
>
0
)
i
=
0
;
else
i
=
*
pcGlyphs
-
1
;
TRACE
(
"applying lookup (%i/%i)
\n
"
,
lookup_index
,
lookup_count
);
while
(
i
<
*
pcGlyphs
)
while
(
i
<
*
pcGlyphs
&&
i
>=
0
)
{
INT
nextIndex
;
INT
prevCount
=
*
pcGlyphs
;
nextIndex
=
GSUB_apply_lookup
(
lookup
,
GET_BE_WORD
(
feature
->
LookupListIndex
[
lookup_index
]),
pwOutGlyphs
,
i
,
write_dir
,
pcGlyphs
);
if
(
nextIndex
>
GSUB_E_NOGLYPH
)
if
(
*
pcGlyphs
!=
prevCount
)
{
UpdateClusters
(
nextIndex
,
*
pcGlyphs
-
prevCount
,
write_dir
,
cChars
,
pwLogClust
);
i
=
nextIndex
;
}
else
i
+
+
;
i
+
=
write_dir
;
}
}
return
*
pcGlyphs
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment