ref: 4a23351091dd3a445e9cf208f4a8644e0a0b7fcd
parent: d248d8d681354d06b85ce17d79bb74ecd0a9d5bb
author: David Turner <[email protected]>
date: Sat Feb 23 21:39:08 EST 2002
renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP"
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-24 David Turner <[email protected]>
+
+ * renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP"
+
2002-02-22 Werner Lemberg <[email protected]>
* 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 <[email protected]>
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -265,7 +265,7 @@
/* 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
/*************************************************************************/
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -369,7 +369,7 @@
enum
{- ft_glyph_own_bitmap = 1
+ FT_GLYPH_OWN_BITMAP = 1
};
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -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 */
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -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 */
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -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
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -247,7 +247,7 @@
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" ));
--- a/src/raster/ftrend1.c
+++ b/src/raster/ftrend1.c
@@ -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 );
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -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 )
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -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 );
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -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;