aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/smooth/ftsmooth.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/smooth/ftsmooth.c
parent5fe210ff514aa4b3149ea7561862776d7b8849e7 (diff)
downloadvcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.tar.gz
vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.tar.bz2
vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.zip
Update to freetype 2.6
Diffstat (limited to 'freetype/src/smooth/ftsmooth.c')
-rw-r--r--freetype/src/smooth/ftsmooth.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/freetype/src/smooth/ftsmooth.c b/freetype/src/smooth/ftsmooth.c
index 4e2dee562..362055053 100644
--- a/freetype/src/smooth/ftsmooth.c
+++ b/freetype/src/smooth/ftsmooth.c
@@ -4,7 +4,7 @@
/* */
/* Anti-aliasing renderer interface (body). */
/* */
-/* Copyright 2000-2006, 2009-2013 by */
+/* Copyright 2000-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -230,7 +230,7 @@
}
/* allocate new one */
- if ( FT_ALLOC( bitmap->buffer, (FT_ULong)pitch * height ) )
+ if ( FT_ALLOC( bitmap->buffer, (FT_ULong)( pitch * height ) ) )
goto Exit;
else
have_buffer = TRUE;
@@ -243,8 +243,8 @@
bitmap->pixel_mode = FT_PIXEL_MODE_GRAY;
bitmap->num_grays = 256;
- bitmap->width = width;
- bitmap->rows = height;
+ bitmap->width = (unsigned int)width;
+ bitmap->rows = (unsigned int)height;
bitmap->pitch = pitch;
/* translate outline to render it into the bitmap */