Fix strict-aliasing warning.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Avoid double cast.
This commit is contained in:
parent
fec113d724
commit
9123404c57
|
@ -1,3 +1,9 @@
|
||||||
|
2012-07-07 Gilles Espinasse <g.esp@free.fr>
|
||||||
|
|
||||||
|
Fix strict-aliasing warning.
|
||||||
|
|
||||||
|
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Avoid double cast.
|
||||||
|
|
||||||
2012-07-07 Dave Thomas <dave.thomas@metaforic.com>
|
2012-07-07 Dave Thomas <dave.thomas@metaforic.com>
|
||||||
|
|
||||||
[ARM] Fix FT_MulFix_arm.
|
[ARM] Fix FT_MulFix_arm.
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* FreeType convenience functions to handle glyphs (body). */
|
/* FreeType convenience functions to handle glyphs (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010 by */
|
/* Copyright 1996-2005, 2007, 2008, 2010, 2012 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -510,7 +510,7 @@
|
||||||
FT_GlyphSlotRec dummy;
|
FT_GlyphSlotRec dummy;
|
||||||
FT_GlyphSlot_InternalRec dummy_internal;
|
FT_GlyphSlot_InternalRec dummy_internal;
|
||||||
FT_Error error = FT_Err_Ok;
|
FT_Error error = FT_Err_Ok;
|
||||||
FT_Glyph glyph;
|
FT_Glyph b, glyph;
|
||||||
FT_BitmapGlyph bitmap = NULL;
|
FT_BitmapGlyph bitmap = NULL;
|
||||||
const FT_Glyph_Class* clazz;
|
const FT_Glyph_Class* clazz;
|
||||||
|
|
||||||
|
@ -547,10 +547,10 @@
|
||||||
dummy.format = clazz->glyph_format;
|
dummy.format = clazz->glyph_format;
|
||||||
|
|
||||||
/* create result bitmap glyph */
|
/* create result bitmap glyph */
|
||||||
error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET,
|
error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET, &b );
|
||||||
(FT_Glyph*)(void*)&bitmap );
|
|
||||||
if ( error )
|
if ( error )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
bitmap = (FT_BitmapGlyph)b;
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
/* if `origin' is set, translate the glyph image */
|
/* if `origin' is set, translate the glyph image */
|
||||||
|
|
Loading…
Reference in New Issue