rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[raster] Handle `FT_RASTER_FLAG_AA' correctly. 

This fixes a breakage caused by the commit `[raster] Remove
5-level gray AA mode from monochrome rasterizer.'.

Problem reported by Markus Trippelsdorf <markus@trippelsdorf.de> and
octoploid <octoploid@yandex.com>.

* src/raster/ftraster.c (ft_black_render): Handle
`FT_RASTER_FLAG_AA'.

* src/raster/ftrend1.c (ft_raster1_render): Remove gray AA mode
remnants.
This commit is contained in:
Behdad Esfahbod 2015-01-23 21:23:55 +01:00 committed by Werner Lemberg
parent 0bd564a94d
commit 264b5e46c0
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2015-01-23 Behdad Esfahbod <behdad@behdad.org>
[raster] Handle `FT_RASTER_FLAG_AA' correctly.
This fixes a breakage caused by the commit `[raster] Remove
5-level gray AA mode from monochrome rasterizer.'.
Problem reported by Markus Trippelsdorf <markus@trippelsdorf.de> and
octoploid <octoploid@yandex.com>.
* src/raster/ftraster.c (ft_black_render): Handle
`FT_RASTER_FLAG_AA'.
* src/raster/ftrend1.c (ft_raster1_render): Remove gray AA mode
remnants.
2015-01-18 Werner Lemberg <wl@gnu.org>
* src/base/ftobjs.c (FT_New_Library): Fix compiler warning.

3
src/raster/ftraster.c
View File

@ -3108,6 +3108,9 @@
if ( params->flags & FT_RASTER_FLAG_DIRECT )
return FT_THROW( Unsupported );
if ( params->flags & FT_RASTER_FLAG_AA )
return FT_THROW( Unsupported );
if ( !target_map )
return FT_THROW( Invalid );

18
src/raster/ftrend1.c
View File

@ -187,19 +187,8 @@
slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
}
/* allocate new one, depends on pixel format */
if ( !( mode & FT_RENDER_MODE_MONO ) )
{
/* we pad to 32 bits, only for backwards compatibility with FT 1.x */
pitch = FT_PAD_CEIL( width, 4 );
bitmap->pixel_mode = FT_PIXEL_MODE_GRAY;
bitmap->num_grays = 256;
}
else
{
pitch = ( ( width + 15 ) >> 4 ) << 1;
bitmap->pixel_mode = FT_PIXEL_MODE_MONO;
}
pitch = ( ( width + 15 ) >> 4 ) << 1;
bitmap->pixel_mode = FT_PIXEL_MODE_MONO;
bitmap->width = width;
bitmap->rows = height;
@ -218,9 +207,6 @@
params.source = outline;
params.flags = 0;
if ( bitmap->pixel_mode == FT_PIXEL_MODE_GRAY )
params.flags |= FT_RASTER_FLAG_AA;
/* render outline into the bitmap */
error = render->raster_render( render->raster, &params );