Commit 4a23351091dd3a445e9cf208f4a8644e0a0b7fcd
2002-02-24T02:39:08
renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP"
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225
diff --git a/ChangeLog b/ChangeLog
index 718aecd..0fbf788 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index d163677..345c299 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -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
/*************************************************************************/
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 60eb598..e934cff 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -369,7 +369,7 @@ FT_BEGIN_HEADER
enum
{
- ft_glyph_own_bitmap = 1
+ FT_GLYPH_OWN_BITMAP = 1
};
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 094d1db..2db16ee 100644
--- 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 */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 1b78c9d..3b6b92d 100644
--- 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 */
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index 70ed44b..3755b37 100644
--- 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
diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c
index 864036b..dd71c45 100644
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -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" ));
diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c
index b587cf0..ed2402c 100644
--- 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 );
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 4ec9347..a925cf0 100644
--- 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 )
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
index fb31efc..5e59b46 100644
--- 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 );
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 8529783..8f0fce0 100644
--- 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;