* include/freetype/cache/ftccache.h [FT_CONFIG_OPTION_OLD_INTERNALS]: Remove declaration of ftc_node_done.
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
diff --git a/ChangeLog b/ChangeLog
index a6dc576..7ffeaa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,24 @@
+2006-02-27 Werner Lemberg <wl@gnu.org>
+
+ * include/freetype/cache/ftccache.h
+ [FT_CONFIG_OPTION_OLD_INTERNALS]: Remove declaration of
+ ftc_node_done.
+
2006-02-27 David Turner <david@freetype.org>
- * src/base/ftutil.c: ft_mem_alloc and related functions now return an
- error if a negative size is passed in parameters.
+ * src/base/ftutil.c: `ft_mem_alloc' and related functions now return
+ an error if a negative size is passed in parameters.
- * src/cache/ftccache.c: make ftc_node_destroy FT_BASE_DEF, it needs to
- be exported for rogue clients
+ * src/cache/ftccache.c: Make ftc_node_destroy FT_BASE_DEF, it needs
+ to be exported for rogue clients.
- * src/pshinter/pshglob.c: prevent problems with malformed fonts which
- have an odd number of blue values (these are broken according to the
- specs).
+ * src/pshinter/pshglob.c: Prevent problems with malformed fonts
+ which have an odd number of blue values (these are broken according
+ to the specs).
- * src/cff/cffload.c, src/type1/t1load.c: modify the loaders to force
- even-ness of 'num_blue_values'. Also change the CFF loader so that
- invalid entries in index files are ignored.
+ * src/cff/cffload.c, src/type1/t1load.c: Modify the loaders to force
+ even-ness of `num_blue_values'. Also change the CFF loader so that
+ invalid entries in index files are ignored.
2006-02-27 Chia-I Wu <b90201047@ntu.edu.tw>
@@ -27,16 +33,18 @@
builds/mac/FreeType.ppc_classic.make.txt:
Update to new header inclusion introduced on 2006-02-16.
+>>>>>>> 1.1258
2006-02-27 Chia-I Wu <b90201047@ntu.edu.tw>
* src/base/ftobjs.c (ft_glyphslot_grid_fit_metrics, FT_Load_Glyph):
Re-enable glyph metrics grid-fitting. It is now done in the base
layer.
- (FT_Set_Char_Size, FT_Set_Pixel_Sizes): Make sure the width and height
- are not too small or too large, just like we were doing in 2.1.10.
+ (FT_Set_Char_Size, FT_Set_Pixel_Sizes): Make sure the width and
+ height are not too small or too large, just like we were doing in
+ 2.1.10.
- * src/autofit/afloader.c (af_loader_load_g): The vertical metrics are
- not scaled.
+ * src/autofit/afloader.c (af_loader_load_g): The vertical metrics
+ are not scaled.
2006-02-26 Werner Lemberg <wl@gnu.org>
diff --git a/include/freetype/cache/ftccache.h b/include/freetype/cache/ftccache.h
index f7241af..7d35456 100644
--- a/include/freetype/cache/ftccache.h
+++ b/include/freetype/cache/ftccache.h
@@ -87,10 +87,6 @@ FT_BEGIN_HEADER
FT_BASE( void )
ftc_node_destroy( FTC_Node node,
FTC_Manager manager );
-
- FT_BASE( void )
- ftc_node_done( FTC_Node node,
- FTC_Manager manager );
#endif
diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c
index e9957e1..524a05d 100644
--- a/src/cache/ftccmap.c
+++ b/src/cache/ftccmap.c
@@ -132,8 +132,6 @@
/*************************************************************************/
- /* no need for specific finalizer; we use `ftc_node_done' directly */
-
FT_CALLBACK_DEF( void )
ftc_cmap_node_free( FTC_Node ftcnode,
FTC_Cache cache )