Bug 1399679 - Add a no-op cast to cairo-ft-font.c
In the freetype version on CentOS, many FT_* constants are defined as
plain integer. One of them is FT_LOAD_VERTICAL_LAYOUT, defined as 0x10.
On the version on Debian wheezy, it's defined as (1L << 4), which is the
same value, but explicitly defined as a long.
For some reason, there's one place in cairo-ft-font.c where that
difference in constant definitions makes a difference in codegen (and
not other places).
So we add an explicit cast to long for that value in that one place.
The variable tested against is an int, so there's no inherent problem
with the code either way.
--- a/gfx/cairo/cairo/src/cairo-ft-font.c
+++ b/gfx/cairo/cairo/src/cairo-ft-font.c
@@ -2305,17 +2305,17 @@ static cairo_int_status_t
if ((info & CAIRO_SCALED_GLYPH_INFO_PATH) != 0 &&
(info & CAIRO_SCALED_GLYPH_INFO_SURFACE) == 0)
load_flags |= FT_LOAD_NO_BITMAP;
/*
* Don't pass FT_LOAD_VERTICAL_LAYOUT to FT_Load_Glyph here as
* suggested by freetype people.
*/
- if (load_flags & FT_LOAD_VERTICAL_LAYOUT) {
+ if (load_flags & (long)FT_LOAD_VERTICAL_LAYOUT) {
load_flags &= ~FT_LOAD_VERTICAL_LAYOUT;
vertical_layout = TRUE;
}
#ifdef FT_LOAD_COLOR
/* Color-glyph support:
*
* This flags needs plumbing through fontconfig (does it?), and