* src/truetype/ttobjs.c (tt_face_init): Fix typo in previous patch
* src/smooth/ftgrays.c: remove hard-coded error values, use FreeType ones instead * src/autofit/afhints.c (af_glyph_hints_dump_segments): remove unused variable
This commit is contained in:
parent
8636c29ae8
commit
80658e5075
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2006-11-28 David Turner <david@freetype.org>
|
||||||
|
|
||||||
|
* src/truetype/ttobjs.c (tt_face_init): Fix typo in previous patch
|
||||||
|
|
||||||
|
* src/smooth/ftgrays.c: remove hard-coded error values, use FreeType
|
||||||
|
ones instead
|
||||||
|
|
||||||
|
* src/autofit/afhints.c (af_glyph_hints_dump_segments): remove unused
|
||||||
|
variable
|
||||||
|
|
||||||
2006-11-26 Pierre Hanser <hanser@club-internet.fr>
|
2006-11-26 Pierre Hanser <hanser@club-internet.fr>
|
||||||
|
|
||||||
* src/truetype/ttobjs.c (tt_face_init): Protect against NULL pointer.
|
* src/truetype/ttobjs.c (tt_face_init): Protect against NULL pointer.
|
||||||
|
|
|
@ -191,7 +191,6 @@
|
||||||
void
|
void
|
||||||
af_glyph_hints_dump_segments( AF_GlyphHints hints )
|
af_glyph_hints_dump_segments( AF_GlyphHints hints )
|
||||||
{
|
{
|
||||||
AF_Point points = hints->points;
|
|
||||||
FT_Int dimension;
|
FT_Int dimension;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ FT_BEGIN_HEADER
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
#define xxAF_USE_WARPER /* only define to use warp hinting */
|
#define xxAF_USE_WARPER /* only define to use warp hinting */
|
||||||
#define xxAF_DEBUG
|
#define AF_DEBUG
|
||||||
|
|
||||||
#ifdef AF_DEBUG
|
#ifdef AF_DEBUG
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,6 @@
|
||||||
#define FT_COMPONENT trace_smooth
|
#define FT_COMPONENT trace_smooth
|
||||||
|
|
||||||
|
|
||||||
#define ErrRaster_MemoryOverflow -4
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef _STANDALONE_
|
#ifdef _STANDALONE_
|
||||||
|
@ -108,8 +107,10 @@
|
||||||
#define ft_jmp_buf jmp_buf
|
#define ft_jmp_buf jmp_buf
|
||||||
|
|
||||||
|
|
||||||
#define ErrRaster_Invalid_Mode -2
|
#define ErrRaster_Invalid_Mode -2
|
||||||
#define ErrRaster_Invalid_Outline -1
|
#define ErrRaster_Invalid_Outline -1
|
||||||
|
#define ErrRaster_Invalid_Argument -3
|
||||||
|
#define ErrRaster_Memory_Overflow -4
|
||||||
|
|
||||||
#define FT_BEGIN_HEADER
|
#define FT_BEGIN_HEADER
|
||||||
#define FT_END_HEADER
|
#define FT_END_HEADER
|
||||||
|
@ -133,7 +134,7 @@
|
||||||
#define FT_TRACE( x ) do ; while ( 0 ) /* nothing */
|
#define FT_TRACE( x ) do ; while ( 0 ) /* nothing */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else /* _STANDALONE_ */
|
#else /* !_STANDALONE_ */
|
||||||
|
|
||||||
#include <ft2build.h>
|
#include <ft2build.h>
|
||||||
#include "ftgrays.h"
|
#include "ftgrays.h"
|
||||||
|
@ -145,8 +146,10 @@
|
||||||
|
|
||||||
#define ErrRaster_Invalid_Mode Smooth_Err_Cannot_Render_Glyph
|
#define ErrRaster_Invalid_Mode Smooth_Err_Cannot_Render_Glyph
|
||||||
#define ErrRaster_Invalid_Outline Smooth_Err_Invalid_Outline
|
#define ErrRaster_Invalid_Outline Smooth_Err_Invalid_Outline
|
||||||
|
#define ErrRaster_Memory_Overflow Smooth_Err_Out_Of_Memory
|
||||||
|
#define ErrRaster_Invalid_Argument Smooth_Err_Bad_Argument
|
||||||
|
|
||||||
#endif /* _STANDALONE_ */
|
#endif /* !_STANDALONE_ */
|
||||||
|
|
||||||
|
|
||||||
#ifndef FT_MEM_SET
|
#ifndef FT_MEM_SET
|
||||||
|
@ -1596,7 +1599,7 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
error = ErrRaster_MemoryOverflow;
|
error = ErrRaster_Memory_Overflow;
|
||||||
}
|
}
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
|
@ -1720,7 +1723,7 @@
|
||||||
band--;
|
band--;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else if ( error != ErrRaster_MemoryOverflow )
|
else if ( error != ErrRaster_Memory_Overflow )
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
ReduceBands:
|
ReduceBands:
|
||||||
|
@ -1766,7 +1769,7 @@
|
||||||
|
|
||||||
|
|
||||||
if ( !raster || !raster->buffer || !raster->buffer_size )
|
if ( !raster || !raster->buffer || !raster->buffer_size )
|
||||||
return -1;
|
return ErrRaster_Invalid_Argument;
|
||||||
|
|
||||||
/* return immediately if the outline is empty */
|
/* return immediately if the outline is empty */
|
||||||
if ( outline->n_points == 0 || outline->n_contours <= 0 )
|
if ( outline->n_points == 0 || outline->n_contours <= 0 )
|
||||||
|
@ -1782,7 +1785,7 @@
|
||||||
/* if direct mode is not set, we must have a target bitmap */
|
/* if direct mode is not set, we must have a target bitmap */
|
||||||
if ( ( params->flags & FT_RASTER_FLAG_DIRECT ) == 0 &&
|
if ( ( params->flags & FT_RASTER_FLAG_DIRECT ) == 0 &&
|
||||||
( !target_map || !target_map->buffer ) )
|
( !target_map || !target_map->buffer ) )
|
||||||
return -1;
|
return ErrRaster_Invalid_Argument;
|
||||||
|
|
||||||
/* this version does not support monochrome rendering */
|
/* this version does not support monochrome rendering */
|
||||||
if ( !( params->flags & FT_RASTER_FLAG_AA ) )
|
if ( !( params->flags & FT_RASTER_FLAG_AA ) )
|
||||||
|
|
|
@ -283,7 +283,7 @@
|
||||||
/* be worth to do more checks for a few special cases. */
|
/* be worth to do more checks for a few special cases. */
|
||||||
for ( nn = 0; trick_names[nn] != NULL; nn++ )
|
for ( nn = 0; trick_names[nn] != NULL; nn++ )
|
||||||
{
|
{
|
||||||
if ( ttface->family &&
|
if ( ttface->family_name &&
|
||||||
ft_strcmp( ttface->family_name, trick_names[nn] ) == 0 )
|
ft_strcmp( ttface->family_name, trick_names[nn] ) == 0 )
|
||||||
{
|
{
|
||||||
unpatented_hinting = 1;
|
unpatented_hinting = 1;
|
||||||
|
|
Loading…
Reference in New Issue