Commit e161ee44 authored by David Turner's avatar David Turner
Browse files

fixed a bug that caused invalid clipping of monochrome bitmaps

when they were blitted on the left edge of an 8-bit pixmap..
parent 93ac3e39
......@@ -246,7 +246,7 @@
/* */
/* This must be greater than 4 Kb */
/* */
#define FT_RENDER_POOL_SIZE 8192
#define FT_RENDER_POOL_SIZE 16384
/*************************************************************************/
......
......@@ -461,7 +461,6 @@
{
FT_Error error;
FT_Int bchar_index, achar_index, n_base_points;
FT_Outline* cur = decoder->builder.current;
FT_Outline* base = decoder->builder.base;
FT_Vector left_bearing, advance;
......@@ -523,7 +522,7 @@
if ( error )
goto Exit;
n_base_points = cur->n_points;
n_base_points = base->n_points;
{
/* save the left bearing and width of the base character */
......
......@@ -1368,13 +1368,13 @@
glyph->format = ft_glyph_format_bitmap;
if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
{
glyph->bitmap_left = metrics.horiBearingX;
glyph->bitmap_top = metrics.horiBearingY;
glyph->bitmap_left = metrics.vertBearingX;
glyph->bitmap_top = metrics.vertBearingY;
}
else
{
glyph->bitmap_left = metrics.vertBearingX;
glyph->bitmap_top = metrics.vertBearingY;
glyph->bitmap_left = metrics.horiBearingX;
glyph->bitmap_top = metrics.horiBearingY;
}
return error;
}
......
......@@ -281,7 +281,6 @@
{
FT_Error error;
FT_Int bchar_index, achar_index, n_base_points;
FT_Outline* cur = decoder->builder.current;
FT_Outline* base = decoder->builder.base;
FT_Vector left_bearing, advance;
T1_Face face = decoder->builder.face;
......@@ -352,7 +351,7 @@
if ( error )
goto Exit;
n_base_points = cur->n_points;
n_base_points = base->n_points;
/* save the left bearing and width of the base character */
/* as they will be erased by the next load. */
......
......@@ -444,7 +444,6 @@
{
FT_Error error;
FT_Int bchar_index, achar_index, n_base_points;
FT_Outline* cur = decoder->builder.current;
FT_Outline* base = decoder->builder.base;
FT_Vector left_bearing, advance;
T1_Face face = decoder->builder.face;
......@@ -513,7 +512,7 @@
if ( error )
goto Exit;
n_base_points = cur->n_points;
n_base_points = base->n_points;
/* save the left bearing and width of the base character */
/* as they will be erased by the next load. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment