Commit 09370c8ce085aeeb1fa47042586b08f946601037
2004-02-17T18:41:58
Fix callback functions in cache module. * src/cache/ftccback.h: New file for callback declarations. * src/cache/ftcbasic.c (ftc_basic_family_compare, ftc_basic_family_init, ftc_basic_family_get_count, ftc_basic_family_load_bitmap, ftc_basic_family_load_glyph, ftc_basic_gnode_compare_faceid): Use FT_CALLBACK_DEF. (ftc_basic_image_family_class, ftc_basic_image_cache_class, ftc_basic_sbit_family_class, ftc_basic_sbit_cache_class): Use FT_CALLBACK_TABLE_DEF and local wrapper functions. * src/cache/ftccache.c: Include ftccback.h. (ftc_cache_init, ftc_cache_done): New wrapper functions which use FT_LOCAL_DEF. * src/cache/ftccmap.c: Include ftccback.h. (ftc_cmap_cache_class): Use local wrapper functions. * src/cache/ftcglyph.c: Include ftccback.h. (ftc_gnode_compare, ftc_gcache_init, ftc_gcache_done): New wrapper functions which use FT_LOCAL_DEF. * src/cache/ftcimage.c: Include ftccback.h. (ftc_inode_free, ftc_inode_new, ftc_inode_weight): New wrapper functions which use FT_LOCAL_DEF. * src/cache/ftcmanag.c (ftc_size_list_class, ftc_face_list_class): Use FT_CALLBACK_TABLE_DEF. * src/cache;/ftcsbits.c: Include ftccback.h. (ftc_snode_free, ftc_snode_new, ftc_snode_weight, ftc_snode_compare): New wrapper functions which use FT_LOCAL_DEF. * src/cache/rules.mk (CACHE_DRV_H): Add ftccback.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 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 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592
diff --git a/ChangeLog b/ChangeLog
index c825da8..3ece1c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2004-02-17 Werner Lemberg <wl@gnu.org>
+
+ Fix callback functions in cache module.
+
+ * src/cache/ftccback.h: New file for callback declarations.
+
+ * src/cache/ftcbasic.c (ftc_basic_family_compare,
+ ftc_basic_family_init, ftc_basic_family_get_count,
+ ftc_basic_family_load_bitmap, ftc_basic_family_load_glyph,
+ ftc_basic_gnode_compare_faceid): Use FT_CALLBACK_DEF.
+ (ftc_basic_image_family_class, ftc_basic_image_cache_class,
+ ftc_basic_sbit_family_class, ftc_basic_sbit_cache_class):
+ Use FT_CALLBACK_TABLE_DEF and local wrapper functions.
+
+ * src/cache/ftccache.c: Include ftccback.h.
+ (ftc_cache_init, ftc_cache_done): New wrapper functions which use
+ FT_LOCAL_DEF.
+
+ * src/cache/ftccmap.c: Include ftccback.h.
+ (ftc_cmap_cache_class): Use local wrapper functions.
+
+ * src/cache/ftcglyph.c: Include ftccback.h.
+ (ftc_gnode_compare, ftc_gcache_init, ftc_gcache_done): New wrapper
+ functions which use FT_LOCAL_DEF.
+
+ * src/cache/ftcimage.c: Include ftccback.h.
+ (ftc_inode_free, ftc_inode_new, ftc_inode_weight): New wrapper
+ functions which use FT_LOCAL_DEF.
+
+ * src/cache/ftcmanag.c (ftc_size_list_class, ftc_face_list_class):
+ Use FT_CALLBACK_TABLE_DEF.
+
+ * src/cache;/ftcsbits.c: Include ftccback.h.
+ (ftc_snode_free, ftc_snode_new, ftc_snode_weight,
+ ftc_snode_compare): New wrapper functions which use FT_LOCAL_DEF.
+
+ * src/cache/rules.mk (CACHE_DRV_H): Add ftccback.h.
+
2004-02-17 Masatake YAMATO <jet@gyve.org>
* include/freetype/ftmac.h (FT_GetFile_From_Mac_Name): Fix a typo
diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c
index f7d7ab0..5d5061c 100644
--- a/src/cache/ftcbasic.c
+++ b/src/cache/ftcbasic.c
@@ -23,6 +23,7 @@
#include FT_CACHE_INTERNAL_SBITS_H
#include FT_INTERNAL_MEMORY_H
+#include "ftccback.h"
#include "ftcerror.h"
@@ -61,7 +62,7 @@
} FTC_BasicFamilyRec, *FTC_BasicFamily;
- static FT_Bool
+ FT_CALLBACK_DEF( FT_Bool )
ftc_basic_family_compare( FTC_BasicFamily family,
FTC_BasicQuery query )
{
@@ -69,7 +70,7 @@
}
- static FT_Error
+ FT_CALLBACK_DEF( FT_Error )
ftc_basic_family_init( FTC_BasicFamily family,
FTC_BasicQuery query,
FTC_Cache cache )
@@ -80,7 +81,7 @@
}
- static FT_UInt
+ FT_CALLBACK_DEF( FT_UInt )
ftc_basic_family_get_count( FTC_BasicFamily family,
FTC_Manager manager )
{
@@ -98,7 +99,7 @@
}
- static FT_Error
+ FT_CALLBACK_DEF( FT_Error )
ftc_basic_family_load_bitmap( FTC_BasicFamily family,
FT_UInt gindex,
FTC_Manager manager,
@@ -124,7 +125,7 @@
}
- static FT_Error
+ FT_CALLBACK_DEF( FT_Error )
ftc_basic_family_load_glyph( FTC_BasicFamily family,
FT_UInt gindex,
FTC_Cache cache,
@@ -171,7 +172,7 @@
}
- static FT_Bool
+ FT_CALLBACK_DEF( FT_Bool )
ftc_basic_gnode_compare_faceid( FTC_GNode gnode,
FTC_FaceID face_id,
FTC_Cache cache )
@@ -198,7 +199,8 @@
*
*/
- static const FTC_IFamilyClassRec ftc_basic_image_family_class =
+ FT_CALLBACK_TABLE_DEF
+ const FTC_IFamilyClassRec ftc_basic_image_family_class =
{
{
sizeof( FTC_BasicFamilyRec ),
@@ -211,18 +213,19 @@
};
- static const FTC_GCacheClassRec ftc_basic_image_cache_class =
+ FT_CALLBACK_TABLE_DEF
+ const FTC_GCacheClassRec ftc_basic_image_cache_class =
{
{
- (FTC_Node_NewFunc) FTC_INode_New,
- (FTC_Node_WeightFunc) FTC_INode_Weight,
- (FTC_Node_CompareFunc)FTC_GNode_Compare,
+ (FTC_Node_NewFunc) ftc_inode_new,
+ (FTC_Node_WeightFunc) ftc_inode_weight,
+ (FTC_Node_CompareFunc)ftc_gnode_compare,
(FTC_Node_CompareFunc)ftc_basic_gnode_compare_faceid,
- (FTC_Node_FreeFunc) FTC_INode_Free,
+ (FTC_Node_FreeFunc) ftc_inode_free,
sizeof( FTC_GCacheRec ),
- (FTC_Cache_InitFunc) FTC_GCache_Init,
- (FTC_Cache_DoneFunc) FTC_GCache_Done
+ (FTC_Cache_InitFunc) ftc_gcache_init,
+ (FTC_Cache_DoneFunc) ftc_gcache_done
},
(FTC_MruListClass)&ftc_basic_image_family_class
};
@@ -311,7 +314,8 @@
*/
- static const FTC_SFamilyClassRec ftc_basic_sbit_family_class =
+ FT_CALLBACK_TABLE_DEF
+ const FTC_SFamilyClassRec ftc_basic_sbit_family_class =
{
{
sizeof( FTC_BasicFamilyRec ),
@@ -325,18 +329,19 @@
};
- static const FTC_GCacheClassRec ftc_basic_sbit_cache_class =
+ FT_CALLBACK_TABLE_DEF
+ const FTC_GCacheClassRec ftc_basic_sbit_cache_class =
{
{
- (FTC_Node_NewFunc) FTC_SNode_New,
- (FTC_Node_WeightFunc) FTC_SNode_Weight,
- (FTC_Node_CompareFunc)FTC_SNode_Compare,
+ (FTC_Node_NewFunc) ftc_snode_new,
+ (FTC_Node_WeightFunc) ftc_snode_weight,
+ (FTC_Node_CompareFunc)ftc_snode_compare,
(FTC_Node_CompareFunc)ftc_basic_gnode_compare_faceid,
- (FTC_Node_FreeFunc) FTC_SNode_Free,
+ (FTC_Node_FreeFunc) ftc_snode_free,
sizeof( FTC_GCacheRec ),
- (FTC_Cache_InitFunc) FTC_GCache_Init,
- (FTC_Cache_DoneFunc) FTC_GCache_Done
+ (FTC_Cache_InitFunc) ftc_gcache_init,
+ (FTC_Cache_DoneFunc) ftc_gcache_done
},
(FTC_MruListClass)&ftc_basic_sbit_family_class
};
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
index 7e06302..2b6bee9 100644
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -4,7 +4,7 @@
/* */
/* The FreeType internal cache interface (body). */
/* */
-/* Copyright 2000-2001, 2002, 2003 by */
+/* Copyright 2000-2001, 2002, 2003, 2004 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -21,6 +21,7 @@
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H
+#include "ftccback.h"
#include "ftcerror.h"
@@ -314,6 +315,13 @@
}
+ FT_LOCAL_DEF( FT_Error )
+ ftc_cache_init( FTC_Cache cache )
+ {
+ return FTC_Cache_Init( cache );
+ }
+
+
FT_EXPORT_DEF( void )
FTC_Cache_Clear( FTC_Cache cache )
{
@@ -372,6 +380,13 @@
}
+ FT_LOCAL_DEF( void )
+ ftc_cache_done( FTC_Cache cache )
+ {
+ FTC_Cache_Done( cache );
+ }
+
+
static void
ftc_cache_add( FTC_Cache cache,
FT_UInt32 hash,
diff --git a/src/cache/ftccback.h b/src/cache/ftccback.h
new file mode 100644
index 0000000..68be913
--- /dev/null
+++ b/src/cache/ftccback.h
@@ -0,0 +1,82 @@
+/***************************************************************************/
+/* */
+/* ftccback.h */
+/* */
+/* Callback functions of the caching sub-system (specification only). */
+/* */
+/* Copyright 2004 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 __FTCCBACK_H__
+#define __FTCCBACK_H__
+
+#include <ft2build.h>
+#include FT_CACHE_H
+#include FT_CACHE_INTERNAL_MRU_H
+#include FT_CACHE_INTERNAL_IMAGE_H
+#include FT_CACHE_INTERNAL_MANAGER_H
+#include FT_CACHE_INTERNAL_GLYPH_H
+#include FT_CACHE_INTERNAL_SBITS_H
+
+
+ FT_LOCAL( void )
+ ftc_inode_free( FTC_INode inode,
+ FTC_Cache cache );
+
+ FT_LOCAL( FT_Error )
+ ftc_inode_new( FTC_INode *pinode,
+ FTC_GQuery gquery,
+ FTC_Cache cache );
+
+ FT_LOCAL( FT_ULong )
+ ftc_inode_weight( FTC_INode inode );
+
+
+ FT_LOCAL( void )
+ ftc_snode_free( FTC_SNode snode,
+ FTC_Cache cache );
+
+ FT_LOCAL( FT_Error )
+ ftc_snode_new( FTC_SNode *psnode,
+ FTC_GQuery gquery,
+ FTC_Cache cache );
+
+ FT_LOCAL( FT_ULong )
+ ftc_snode_weight( FTC_SNode snode );
+
+ FT_LOCAL( FT_Bool )
+ ftc_snode_compare( FTC_SNode snode,
+ FTC_GQuery gquery,
+ FTC_Cache cache );
+
+
+ FT_LOCAL( FT_Bool )
+ ftc_gnode_compare( FTC_GNode gnode,
+ FTC_GQuery gquery );
+
+
+ FT_LOCAL( FT_Error )
+ ftc_gcache_init( FTC_GCache cache );
+
+ FT_LOCAL( void )
+ ftc_gcache_done( FTC_GCache cache );
+
+
+ FT_LOCAL( FT_Error )
+ ftc_cache_init( FTC_Cache cache );
+
+ FT_LOCAL( void )
+ ftc_cache_done( FTC_Cache cache );
+
+
+#endif /* __FTCCBACK_H__ */
+
+/* END */
diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c
index 63dea49..dfdbb48 100644
--- a/src/cache/ftccmap.c
+++ b/src/cache/ftccmap.c
@@ -24,6 +24,7 @@
#include FT_INTERNAL_DEBUG_H
#include FT_TRUETYPE_IDS_H
+#include "ftccback.h"
#include "ftcerror.h"
#undef FT_COMPONENT
@@ -190,8 +191,8 @@
(FTC_Node_FreeFunc) ftc_cmap_node_free,
sizeof ( FTC_CacheRec ),
- (FTC_Cache_InitFunc) FTC_Cache_Init,
- (FTC_Cache_DoneFunc) FTC_Cache_Done,
+ (FTC_Cache_InitFunc) ftc_cache_init,
+ (FTC_Cache_DoneFunc) ftc_cache_done,
};
diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c
index eb48d66..5e6c977 100644
--- a/src/cache/ftcglyph.c
+++ b/src/cache/ftcglyph.c
@@ -4,7 +4,7 @@
/* */
/* FreeType Glyph Image (FT_Glyph) cache (body). */
/* */
-/* Copyright 2000-2001, 2003 by */
+/* Copyright 2000-2001, 2003, 2004 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -23,6 +23,7 @@
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H
+#include "ftccback.h"
#include "ftcerror.h"
@@ -72,6 +73,14 @@
}
+ FT_LOCAL_DEF( FT_Bool )
+ ftc_gnode_compare( FTC_GNode gnode,
+ FTC_GQuery gquery )
+ {
+ return FTC_GNode_Compare( gnode, gquery );
+ }
+
+
/*************************************************************************/
/*************************************************************************/
/***** *****/
@@ -114,6 +123,13 @@
}
+ FT_LOCAL_DEF( FT_Error )
+ ftc_gcache_init( FTC_GCache cache )
+ {
+ return FTC_GCache_Init( cache );
+ }
+
+
FT_EXPORT_DEF( void )
FTC_GCache_Done( FTC_GCache cache )
{
@@ -122,6 +138,13 @@
}
+ FT_LOCAL_DEF( void )
+ ftc_gcache_done( FTC_GCache cache )
+ {
+ FTC_GCache_Done( cache );
+ }
+
+
FT_EXPORT_DEF( FT_Error )
FTC_GCache_New( FTC_Manager manager,
FTC_GCacheClass clazz,
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 2c942d1..22a26ac 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -4,7 +4,7 @@
/* */
/* FreeType Image cache (body). */
/* */
-/* Copyright 2000-2001, 2003 by */
+/* Copyright 2000-2001, 2003, 2004 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -21,6 +21,7 @@
#include FT_CACHE_INTERNAL_IMAGE_H
#include FT_INTERNAL_MEMORY_H
+#include "ftccback.h"
#include "ftcerror.h"
@@ -43,6 +44,14 @@
}
+ FT_LOCAL_DEF( void )
+ ftc_inode_free( FTC_INode inode,
+ FTC_Cache cache )
+ {
+ FTC_INode_Free( inode, cache );
+ }
+
+
/* initialize a new glyph image node */
FT_EXPORT_DEF( FT_Error )
FTC_INode_New( FTC_INode *pinode,
@@ -75,6 +84,15 @@
}
+ FT_LOCAL_DEF( FT_Error )
+ ftc_inode_new( FTC_INode *pinode,
+ FTC_GQuery gquery,
+ FTC_Cache cache )
+ {
+ return FTC_INode_New( pinode, gquery, cache );
+ }
+
+
FT_EXPORT_DEF( FT_ULong )
FTC_INode_Weight( FTC_INode inode )
{
@@ -117,4 +135,11 @@
}
+ FT_LOCAL_DEF( FT_ULong )
+ ftc_inode_weight( FTC_INode inode )
+ {
+ return FTC_INode_Weight( inode );
+ }
+
+
/* END */
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 6d60e4c..9cc6489 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -129,7 +129,8 @@
}
- static const FTC_MruListClassRec ftc_size_list_class =
+ FT_CALLBACK_TABLE_DEF
+ const FTC_MruListClassRec ftc_size_list_class =
{
sizeof( FTC_SizeNodeRec ),
(FTC_MruNode_CompareFunc)ftc_size_node_compare,
@@ -249,7 +250,8 @@
}
- static const FTC_MruListClassRec ftc_face_list_class =
+ FT_CALLBACK_TABLE_DEF
+ const FTC_MruListClassRec ftc_face_list_class =
{
sizeof( FTC_FaceNodeRec),
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index 941ef99..c9043fd 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -23,6 +23,7 @@
#include FT_INTERNAL_DEBUG_H
#include FT_ERRORS_H
+#include "ftccback.h"
#include "ftcerror.h"
@@ -75,6 +76,14 @@
}
+ FT_LOCAL_DEF( void )
+ ftc_snode_free( FTC_SNode snode,
+ FTC_Cache cache )
+ {
+ FTC_SNode_Free( snode, cache );
+ }
+
+
static FT_Error
ftc_snode_load( FTC_SNode snode,
FTC_Manager manager,
@@ -228,6 +237,15 @@
}
+ FT_LOCAL_DEF( FT_Error )
+ ftc_snode_new( FTC_SNode *psnode,
+ FTC_GQuery gquery,
+ FTC_Cache cache )
+ {
+ return FTC_SNode_New( psnode, gquery, cache );
+ }
+
+
FT_EXPORT_DEF( FT_ULong )
FTC_SNode_Weight( FTC_SNode snode )
{
@@ -259,6 +277,13 @@
}
+ FT_LOCAL_DEF( FT_ULong )
+ ftc_snode_weight( FTC_SNode snode )
+ {
+ return FTC_SNode_Weight( snode );
+ }
+
+
FT_EXPORT_DEF( FT_Bool )
FTC_SNode_Compare( FTC_SNode snode,
FTC_GQuery gquery,
@@ -294,4 +319,13 @@
}
+ FT_LOCAL_DEF( FT_Bool )
+ ftc_snode_compare( FTC_SNode snode,
+ FTC_GQuery gquery,
+ FTC_Cache cache )
+ {
+ return FTC_SNode_Compare( snode, gquery, cache );
+ }
+
+
/* END */
diff --git a/src/cache/rules.mk b/src/cache/rules.mk
index 154f126..381104a 100644
--- a/src/cache/rules.mk
+++ b/src/cache/rules.mk
@@ -3,7 +3,7 @@
#
-# Copyright 2000, 2001, 2003 by
+# Copyright 2000, 2001, 2003, 2004 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -41,7 +41,8 @@ CACHE_DRV_H := $(CACHE_H_DIR)/ftcmru.h \
$(CACHE_H_DIR)/ftcglyph.h \
$(CACHE_H_DIR)/ftcimage.h \
$(CACHE_H_DIR)/ftccmap.h \
- $(CACHE_DIR)/ftcerror.h
+ $(CACHE_DIR)/ftcerror.h \
+ $(CACHE_DIR)/ftccback.h
# Cache driver object(s)