diff options
author | Werner Lemberg <wl@gnu.org> | 2013-06-05 13:43:20 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2013-06-05 13:43:20 +0200 |
commit | 45392b77a8207d9e60b6c7c2aea3e1b659da2519 (patch) | |
tree | 3be79c67162613f776eb70a3d4ca4199ec49f569 /src/smooth/ftsmooth.c | |
parent | d963498fafc4f630e121cd0b929c509c2e0d37c4 (diff) | |
download | freetype2-45392b77a8207d9e60b6c7c2aea3e1b659da2519.tar.gz |
Fix compiler warnings.
* include/freetype/internal/ftmemory.h: Decorate memory allocation
macros with `FT_Long' where appropriate.
Remove duplicate of FT_MEM_QRENEW_ARRAY definition.
* src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra): Use
cast.
* src/base/ftobjs.c: Add warning disabling pragma for MSVC while
including `md5.c'.
* src/cff/cf2intrp.c (cf2_interpT2CharString) <cf2_cmdESC>: Add
cast.
* src/sfnt/ttsbit.c (tt_sbit_decoder_load_compound): Fix casts.
(tt_sbit_decoder_load_bitmap): Beautification.
* src/smooth/ftsmooth.c (ft_smooth_render_generic): Initialize
variables (earlier).
* src/truetype/ttgload.c (TT_Process_Simple_Glyph): Pacify compiler.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Use unsigned constants
where appropriate.
* src/type1/t1load.c (T1_Get_MM_Var): Ditto.
Diffstat (limited to 'src/smooth/ftsmooth.c')
-rw-r--r-- | src/smooth/ftsmooth.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index 2735eaf3e..89088cd09 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -109,11 +109,13 @@ #ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING FT_Pos height_org, width_org; #endif - FT_Bitmap* bitmap; - FT_Memory memory; - FT_Int hmul = mode == FT_RENDER_MODE_LCD; - FT_Int vmul = mode == FT_RENDER_MODE_LCD_V; - FT_Pos x_shift, y_shift, x_left, y_top; + FT_Bitmap* bitmap = &slot->bitmap; + FT_Memory memory = render->root.memory; + FT_Int hmul = mode == FT_RENDER_MODE_LCD; + FT_Int vmul = mode == FT_RENDER_MODE_LCD_V; + FT_Pos x_shift = 0; + FT_Pos y_shift = 0; + FT_Pos x_left, y_top; FT_Raster_Params params; @@ -175,9 +177,6 @@ else height = ( cbox.yMax - cbox.yMin ) >> 6; - bitmap = &slot->bitmap; - memory = render->root.memory; - #ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING width_org = width; height_org = height; |