* src/autofit/afloader.c (af_loader_load_g, af_loader_load_glyph):
Check for valid callback pointers.
This commit is contained in:
parent
edc7d81a7b
commit
44c655b01c
|
@ -1,3 +1,8 @@
|
||||||
|
2008-02-17 Jonathan Blow <jon@number-none.com>
|
||||||
|
|
||||||
|
* src/autofit/afloader.c (af_loader_load_g, af_loader_load_glyph):
|
||||||
|
Check for valid callback pointers.
|
||||||
|
|
||||||
2008-02-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2008-02-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
* src/base/ftmac.c (FT_New_Face_From_SFNT): Check the sfnt resource
|
* src/base/ftmac.c (FT_New_Face_From_SFNT): Check the sfnt resource
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* Auto-fitter glyph loading routines (body). */
|
/* Auto-fitter glyph loading routines (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2003, 2004, 2005, 2006, 2007 by */
|
/* Copyright 2003, 2004, 2005, 2006, 2007, 2008 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, */
|
||||||
|
@ -165,9 +165,10 @@
|
||||||
|
|
||||||
/* now load the slot image into the auto-outline and run the */
|
/* now load the slot image into the auto-outline and run the */
|
||||||
/* automatic hinting process */
|
/* automatic hinting process */
|
||||||
metrics->clazz->script_hints_apply( hints,
|
if ( metrics->clazz->script_hints_apply )
|
||||||
&gloader->current.outline,
|
metrics->clazz->script_hints_apply( hints,
|
||||||
metrics );
|
&gloader->current.outline,
|
||||||
|
metrics );
|
||||||
|
|
||||||
/* we now need to hint the metrics according to the change in */
|
/* we now need to hint the metrics according to the change in */
|
||||||
/* width/positioning that occurred during the hinting process */
|
/* width/positioning that occurred during the hinting process */
|
||||||
|
@ -515,9 +516,13 @@
|
||||||
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_IGNORE_TRANSFORM;
|
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_IGNORE_TRANSFORM;
|
||||||
load_flags &= ~FT_LOAD_RENDER;
|
load_flags &= ~FT_LOAD_RENDER;
|
||||||
|
|
||||||
error = metrics->clazz->script_hints_init( &loader->hints, metrics );
|
if ( metrics->clazz->script_hints_init )
|
||||||
if ( error )
|
{
|
||||||
goto Exit;
|
error = metrics->clazz->script_hints_init( &loader->hints,
|
||||||
|
metrics );
|
||||||
|
if ( error )
|
||||||
|
goto Exit;
|
||||||
|
}
|
||||||
|
|
||||||
error = af_loader_load_g( loader, &scaler, gindex, load_flags, 0 );
|
error = af_loader_load_g( loader, &scaler, gindex, load_flags, 0 );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue