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

renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP"

This commit is contained in:
David Turner 2002-02-24 02:39:08 +00:00
parent 0502dc2fbf
commit 6c0fedceba
11 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,7 @@
2002-02-24 David Turner <david@freetype.org>
* renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP"
2002-02-22 Werner Lemberg <wl@gnu.org>
* include/freetype/internal/ftdebug.h (FT_Trace): Remove comma in
@ -13,7 +17,7 @@
(ft_debug_init): New function.
(ft_debug_dummy): Removed.
Updated to changes in ftdebug.h
* include/freetype/internal/ftdebug.h: Always define
FT_DEBUG_LEVEL_ERROR if FT_DEBUG_LEVEL_TRACE is defined.
(FT_Assert): Renamed to ...
@ -155,7 +159,7 @@
better (delaying format checks out of FT_Access_Frame ..
FT_Forget_Frame blocks to avoid leaving the stream in an incorrect
state when encountering an invalid PCF font).
* src/pcf/pcfdriver.c (PCF_Done_Face): Renamed to ...
(PCF_Face_Done): This.
(PCF_Init_Face): Renamed to ...
@ -165,7 +169,7 @@
(PCF_Get_Next_Char): Renamed to ...
(PCF_Char_Get_Next): This.
(pcf_driver_class): Updated.
* src/pcf/pcf.h (PCF_Done_Face): Removed.
2002-02-06 Detlef Würkner <TetiSoft@apg.lahn.de>

2
include/freetype/config/ftoption.h
View File

@ -265,7 +265,7 @@ FT_BEGIN_HEADER
/* Note that the memory debugger is only activated at runtime when */
/* when the _environment_ variable "FT_DEBUG_MEMORY" is also defined! */
/* */
#undef FT_DEBUG_MEMORY
#define FT_DEBUG_MEMORY
/*************************************************************************/

2
include/freetype/internal/ftobjs.h
View File

@ -369,7 +369,7 @@ FT_BEGIN_HEADER
enum
{
ft_glyph_own_bitmap = 1
FT_GLYPH_OWN_BITMAP = 1
};

4
src/base/ftglyph.c
View File

@ -158,8 +158,8 @@
glyph->left = slot->bitmap_left;
glyph->top = slot->bitmap_top;
if ( slot->flags & ft_glyph_own_bitmap )
slot->flags &= ~ft_glyph_own_bitmap;
if ( slot->flags & FT_GLYPH_OWN_BITMAP )
slot->flags &= ~FT_GLYPH_OWN_BITMAP;
else
{
/* copy the bitmap into a new buffer */

6
src/base/ftobjs.c
View File

@ -644,13 +644,13 @@
ft_glyphslot_clear( FT_GlyphSlot slot )
{
/* free bitmap if needed */
if ( slot->flags & ft_glyph_own_bitmap )
if ( slot->flags & FT_GLYPH_OWN_BITMAP )
{
FT_Memory memory = FT_FACE_MEMORY( slot->face );
FREE( slot->bitmap.buffer );
slot->flags &= ~ft_glyph_own_bitmap;
slot->flags &= ~FT_GLYPH_OWN_BITMAP;
}
/* clear all public fields in the glyph slot */
@ -684,7 +684,7 @@
clazz->done_slot( slot );
/* free bitmap buffer if needed */
if ( slot->flags & ft_glyph_own_bitmap )
if ( slot->flags & FT_GLYPH_OWN_BITMAP )
FREE( slot->bitmap.buffer );
/* free glyph loader */

4
src/cache/ftcsbits.c vendored
View File

@ -225,9 +225,9 @@
sbit->format = (FT_Byte)bitmap->pixel_mode;
/* grab the bitmap when possible - this is a hack !! */
if ( slot->flags & ft_glyph_own_bitmap )
if ( slot->flags & FT_GLYPH_OWN_BITMAP )
{
slot->flags &= ~ft_glyph_own_bitmap;
slot->flags &= ~FT_GLYPH_OWN_BITMAP;
sbit->buffer = bitmap->buffer;
}
else

2
src/pcf/pcfdriver.c
View File

@ -247,7 +247,7 @@ THE SOFTWARE.
slot->linearHoriAdvance = (FT_Fixed)bitmap->width << 16;
slot->format = ft_glyph_format_bitmap;
slot->flags = ft_glyph_own_bitmap;
slot->flags = FT_GLYPH_OWN_BITMAP;
FT_TRACE4(( " --- ok\n" ));

6
src/raster/ftrend1.c
View File

@ -151,10 +151,10 @@
memory = render->root.memory;
/* release old bitmap buffer */
if ( slot->flags & ft_glyph_own_bitmap )
if ( slot->flags & FT_GLYPH_OWN_BITMAP )
{
FREE( bitmap->buffer );
slot->flags &= ~ft_glyph_own_bitmap;
slot->flags &= ~FT_GLYPH_OWN_BITMAP;
}
/* allocate new one, depends on pixel format */
@ -178,7 +178,7 @@
if ( ALLOC( bitmap->buffer, (FT_ULong)pitch * height ) )
goto Exit;
slot->flags |= ft_glyph_own_bitmap;
slot->flags |= FT_GLYPH_OWN_BITMAP;
/* translate outline to render it into the bitmap */
FT_Outline_Translate( outline, -cbox.xMin, -cbox.yMin );

4
src/sfnt/ttsbit.c
View File

@ -1429,7 +1429,7 @@
ebdt_pos = FILE_Pos();
/* clear the bitmap & load the bitmap */
if ( face->root.glyph->flags & ft_glyph_own_bitmap )
if ( face->root.glyph->flags & FT_GLYPH_OWN_BITMAP )
FREE( map->buffer );
map->rows = map->pitch = map->width = 0;
@ -1440,7 +1440,7 @@
goto Exit;
/* the glyph slot owns this bitmap buffer */
face->root.glyph->flags |= ft_glyph_own_bitmap;
face->root.glyph->flags |= FT_GLYPH_OWN_BITMAP;
/* setup vertical metrics if needed */
if ( strike->flags & 1 )

6
src/smooth/ftsmooth.c
View File

@ -140,10 +140,10 @@
memory = render->root.memory;
/* release old bitmap buffer */
if ( slot->flags & ft_glyph_own_bitmap )
if ( slot->flags & FT_GLYPH_OWN_BITMAP )
{
FREE( bitmap->buffer );
slot->flags &= ~ft_glyph_own_bitmap;
slot->flags &= ~FT_GLYPH_OWN_BITMAP;
}
/* allocate new one, depends on pixel format */
@ -157,7 +157,7 @@
if ( ALLOC( bitmap->buffer, (FT_ULong)pitch * height ) )
goto Exit;
slot->flags |= ft_glyph_own_bitmap;
slot->flags |= FT_GLYPH_OWN_BITMAP;
/* translate outline to render it into the bitmap */
FT_Outline_Translate( outline, -cbox.xMin, -cbox.yMin );

2
src/winfonts/winfnt.c
View File

@ -588,7 +588,7 @@
}
}
slot->flags = ft_glyph_own_bitmap;
slot->flags = FT_GLYPH_OWN_BITMAP;
slot->bitmap_left = 0;
slot->bitmap_top = font->header.ascent;
slot->format = ft_glyph_format_bitmap;