aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/psaux/psconv.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-06-15 20:22:43 +0200
committermarha <marha@users.sourceforge.net>2015-06-15 20:22:43 +0200
commit0b3be550b20ad9f991f77bf979b2c306a7d4ef11 (patch)
tree523f6db090457118723eca33dabc7758eeb2dcde /freetype/src/psaux/psconv.c
parent5fe210ff514aa4b3149ea7561862776d7b8849e7 (diff)
downloadvcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.tar.gz
vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.tar.bz2
vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.zip
Update to freetype 2.6
Diffstat (limited to 'freetype/src/psaux/psconv.c')
-rw-r--r--freetype/src/psaux/psconv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/freetype/src/psaux/psconv.c b/freetype/src/psaux/psconv.c
index 22e8cf2d1..aca741204 100644
--- a/freetype/src/psaux/psconv.c
+++ b/freetype/src/psaux/psconv.c
@@ -4,7 +4,7 @@
/* */
/* Some convenience conversions (body). */
/* */
-/* Copyright 2006, 2008, 2009, 2012-2013 by */
+/* Copyright 2006-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -489,8 +489,8 @@
if ( c OP 0x80 )
break;
- c = ft_char_table[c & 0x7F];
- if ( (unsigned)c >= 16 )
+ c = (FT_UInt)ft_char_table[c & 0x7F];
+ if ( c >= 16 )
break;
pad = ( pad << 4 ) | c;