Skip to content

W
wine-cw
Commit f5e67202 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

dwrite: Use BitScanForward instead of dwrite_ctz.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c440d874
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 18 deletions
dlls/dwrite/opentype.c
View file @ f5e67202
......@@ -3518,23 +3518,6 @@ static inline unsigned int dwrite_popcount(unsigned int x)
#endif
}
static inline unsigned int dwrite_ctz(unsigned int x)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
return __builtin_ctz(x);
#else
unsigned int c = 32;
x &= - (int) x;
if (x) c--;
if (x & 0x0000ffff) c -= 16;
if (x & 0x00ff00ff) c -= 8;
if (x & 0x0f0f0f0f) c -= 4;
if (x & 0x33333333) c -= 2;
if (x & 0x55555555) c -= 1;
return c;
#endif
}
static inline unsigned int dwrite_log2i(unsigned int x)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
......@@ -5084,7 +5067,7 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con
if (!count)
return FALSE;
shift = dwrite_ctz(lookup->mask);
BitScanForward(&shift, lookup->mask);
alt_index = (lookup->mask & context->glyph_infos[idx].mask) >> shift;
if (alt_index > count || !alt_index)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment