Commit 3867d2f2fbe6aae96da30e12d1270cac92576151
2006-03-22T08:03:06
* src/cache/ftccache.c, src/cache/ftccache.h (FTC_Node_Destroy): Remove, unused. * src/cache/ftccmap.h: Remove, unused. * src/cache/rules.mk (CACHE_DRV_H): Remove ftccmap.h.
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
diff --git a/ChangeLog b/ChangeLog
index 09681d2..b938c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-22 Werner Lemberg <wl@gnu.org>
+
+ * src/cache/ftccache.c, src/cache/ftccache.h (FTC_Node_Destroy):
+ Remove, unused.
+
+ * src/cache/ftccmap.h: Remove, unused.
+
+ * src/cache/rules.mk (CACHE_DRV_H): Remove ftccmap.h.
+
2006-03-21 Zhe Su <james.su@gmail.com>
* src/base/ftoutln.c (FT_Outline_Get_Orientation): Improve
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
index 0df9b09..8994a35 100644
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -247,14 +247,6 @@
}
- FT_EXPORT_DEF( void )
- FTC_Node_Destroy( FTC_Node node,
- FTC_Manager manager )
- {
- ftc_node_destroy( node, manager );
- }
-
-
/* remove a node from the cache manager */
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
FT_BASE_DEF( void )
diff --git a/src/cache/ftccache.h b/src/cache/ftccache.h
index b41b139..d06b651 100644
--- a/src/cache/ftccache.h
+++ b/src/cache/ftccache.h
@@ -66,21 +66,8 @@ FT_BEGIN_HEADER
#define FTC_NODE( x ) ( (FTC_Node)(x) )
#define FTC_NODE_P( x ) ( (FTC_Node*)(x) )
-#define FTC_NODE__NEXT(x) FTC_NODE( (x)->mru.next )
-#define FTC_NODE__PREV(x) FTC_NODE( (x)->mru.prev )
-
-
- /*************************************************************************/
- /* */
- /* These functions are exported so that they can be called from */
- /* user-provided cache classes; otherwise, they are really part of the */
- /* cache sub-system internals. */
- /* */
-
- /* reserved for manager's use */
- FT_EXPORT( void )
- FTC_Node_Destroy( FTC_Node node,
- FTC_Manager manager );
+#define FTC_NODE__NEXT( x ) FTC_NODE( (x)->mru.next )
+#define FTC_NODE__PREV( x ) FTC_NODE( (x)->mru.prev )
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
diff --git a/src/cache/ftccmap.h b/src/cache/ftccmap.h
deleted file mode 100644
index 638dc4b..0000000
--- a/src/cache/ftccmap.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/***************************************************************************/
-/* */
-/* ftccmap.h */
-/* */
-/* FreeType charmap cache (specification). */
-/* */
-/* Copyright 2000-2001, 2003, 2005, 2006 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __FTCCMAP_H__
-#define __FTCCMAP_H__
-
-#include <ft2build.h>
-#include FT_CACHE_H
-
-
-FT_BEGIN_HEADER
-
-
- /*
- * The FreeType 2.1.7 Charmap cache interface.
- *
- * Unfortunately, it is not possible to implement it in later versions,
- * since some function signatures changed too significantly to do that.
- *
- */
-
-#if 0
-
- typedef enum FTC_CMapType_
- {
- FTC_CMAP_BY_INDEX = 0,
- FTC_CMAP_BY_ENCODING = 1,
- FTC_CMAP_BY_ID = 2
-
- } FTC_CMapType;
-
-
- typedef struct FTC_CMapIdRec_
- {
- FT_UInt platform;
- FT_UInt encoding;
-
- } FTC_CMapIdRec;
-
-
- typedef struct FTC_CMapDescRec_
- {
- FTC_FaceID face_id;
- FTC_CMapType type;
-
- union
- {
- FT_UInt index;
- FT_Encoding encoding;
- FTC_CMapIdRec id;
-
- } u;
-
- } FTC_CMapDescRec, *FTC_CMapDesc;
-
-
- FT_EXPORT( FT_Error )
- FTC_CMapCache_New( FTC_Manager manager,
- FTC_CMapCache *acache );
-
-
- FT_EXPORT( FT_UInt )
- FTC_CMapCache_Lookup( FTC_CMapCache cache,
- FTC_CMapDesc cmap_desc,
- FT_UInt32 char_code );
-
-#endif /* 0 */
-
- /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __FTCCMAP_H__ */
-
-
-/* END */
diff --git a/src/cache/rules.mk b/src/cache/rules.mk
index 3af1f25..457dec8 100644
--- a/src/cache/rules.mk
+++ b/src/cache/rules.mk
@@ -36,7 +36,6 @@ CACHE_DRV_SRC := $(CACHE_DIR)/ftcbasic.c \
# Cache driver headers
#
CACHE_DRV_H := $(CACHE_DIR)/ftccback.h \
- $(CACHE_DIR)/ftccmap.h \
$(CACHE_DIR)/ftcerror.h \
$(CACHE_DIR)/ftcglyph.h \
$(CACHE_DIR)/ftcimage.h \