| 1 |
--- freetype-2.4.4/src/smooth/ftsmooth.c 2010-08-10 02:47:47.000000000 +0200
|
| 2 |
+++ freetype-2.4.4/src/smooth/ftsmooth.c 2012-03-28 15:21:42.000000000 +0200
|
| 3 |
@@ -4,7 +4,7 @@
|
| 4 |
/* */
|
| 5 |
/* Anti-aliasing renderer interface (body). */
|
| 6 |
/* */
|
| 7 |
-/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 by */
|
| 8 |
+/* Copyright 2000-2006, 2009-2012 by */
|
| 9 |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| 10 |
/* */
|
| 11 |
/* This file is part of the FreeType project, and may only be used, */
|
| 12 |
@@ -105,7 +105,7 @@
|
| 13 |
FT_Error error;
|
| 14 |
FT_Outline* outline = NULL;
|
| 15 |
FT_BBox cbox;
|
| 16 |
- FT_UInt width, height, height_org, width_org, pitch;
|
| 17 |
+ FT_Pos width, height, height_org, width_org, pitch;
|
| 18 |
FT_Bitmap* bitmap;
|
| 19 |
FT_Memory memory;
|
| 20 |
FT_Int hmul = mode == FT_RENDER_MODE_LCD;
|
| 21 |
@@ -148,7 +148,7 @@
|
| 22 |
return Smooth_Err_Raster_Overflow;
|
| 23 |
}
|
| 24 |
else
|
| 25 |
- width = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 );
|
| 26 |
+ width = ( cbox.xMax - cbox.xMin ) >> 6;
|
| 27 |
|
| 28 |
if ( cbox.yMin < 0 && cbox.yMax > FT_INT_MAX + cbox.yMin )
|
| 29 |
{
|
| 30 |
@@ -158,7 +158,7 @@
|
| 31 |
return Smooth_Err_Raster_Overflow;
|
| 32 |
}
|
| 33 |
else
|
| 34 |
- height = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 );
|
| 35 |
+ height = ( cbox.yMax - cbox.yMin ) >> 6;
|
| 36 |
|
| 37 |
bitmap = &slot->bitmap;
|
| 38 |
memory = render->root.memory;
|
| 39 |
@@ -218,7 +218,7 @@
|
| 40 |
|
| 41 |
/* Required check is ( pitch * height < FT_ULONG_MAX ), */
|
| 42 |
/* but we care realistic cases only. Always pitch <= width. */
|
| 43 |
- if ( width > 0x7FFFU || height > 0x7FFFU )
|
| 44 |
+ if ( width > 0x7FFF || height > 0x7FFF )
|
| 45 |
{
|
| 46 |
FT_ERROR(( "ft_smooth_render_generic: glyph too large: %u x %u\n",
|
| 47 |
width, height ));
|
