Prepare source code for amalgamation (1/6).
See discussion starting at http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00037.html * src/smooth/ftgrays.c: s/TBand/gray_TBand/. * src/raster/ftraster.c: s/TBand/black_TBand/.
This commit is contained in:
parent
634867898b
commit
126405adde
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
2012-02-20 Vinnie Falco <vinnie.falco@gmail.com>
|
||||
|
||||
Prepare source code for amalgamation (1/6).
|
||||
|
||||
See discussion starting at
|
||||
|
||||
http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00037.html
|
||||
|
||||
* src/smooth/ftgrays.c: s/TBand/gray_TBand/.
|
||||
* src/raster/ftraster.c: s/TBand/black_TBand/.
|
||||
|
||||
2012-02-17 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||
|
||||
[autofit] Fix outline flags.
|
||||
|
@ -4,7 +4,7 @@
|
||||
/* */
|
||||
/* The FreeType glyph rasterizer (body). */
|
||||
/* */
|
||||
/* Copyright 1996-2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2011 by */
|
||||
/* Copyright 1996-2003, 2005, 2007-2012 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
@ -369,12 +369,12 @@
|
||||
|
||||
/* Simple record used to implement a stack of bands, required */
|
||||
/* by the sub-banding mechanism */
|
||||
typedef struct TBand_
|
||||
typedef struct black_TBand_
|
||||
{
|
||||
Short y_min; /* band's minimum */
|
||||
Short y_max; /* band's maximum */
|
||||
|
||||
} TBand;
|
||||
} black_TBand;
|
||||
|
||||
|
||||
#define AlignProfileSize \
|
||||
@ -515,8 +515,8 @@
|
||||
|
||||
TPoint arcs[3 * MaxBezier + 1]; /* The Bezier stack */
|
||||
|
||||
TBand band_stack[16]; /* band stack used for sub-banding */
|
||||
Int band_top; /* band stack top */
|
||||
black_TBand band_stack[16]; /* band stack used for sub-banding */
|
||||
Int band_top; /* band stack top */
|
||||
|
||||
#ifdef FT_RASTER_OPTION_ANTI_ALIASING
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
/* */
|
||||
/* A new `perfect' anti-aliasing renderer (body). */
|
||||
/* */
|
||||
/* Copyright 2000-2003, 2005-2011 by */
|
||||
/* Copyright 2000-2003, 2005-2012 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
@ -1676,11 +1676,11 @@ typedef ptrdiff_t FT_PtrDist;
|
||||
#endif /* _STANDALONE_ */
|
||||
|
||||
|
||||
typedef struct TBand_
|
||||
typedef struct gray_TBand_
|
||||
{
|
||||
TPos min, max;
|
||||
|
||||
} TBand;
|
||||
} gray_TBand;
|
||||
|
||||
FT_DEFINE_OUTLINE_FUNCS(func_interface,
|
||||
(FT_Outline_MoveTo_Func) gray_move_to,
|
||||
@ -1717,11 +1717,11 @@ typedef ptrdiff_t FT_PtrDist;
|
||||
static int
|
||||
gray_convert_glyph( RAS_ARG )
|
||||
{
|
||||
TBand bands[40];
|
||||
TBand* volatile band;
|
||||
int volatile n, num_bands;
|
||||
TPos volatile min, max, max_y;
|
||||
FT_BBox* clip;
|
||||
gray_TBand bands[40];
|
||||
gray_TBand* volatile band;
|
||||
int volatile n, num_bands;
|
||||
TPos volatile min, max, max_y;
|
||||
FT_BBox* clip;
|
||||
|
||||
|
||||
/* Set up state in the raster object */
|
||||
|
Loading…
Reference in New Issue
Block a user