Commit 5f0ee94c06156e1c0d45c6add8a8716262c866d4
2002-04-30T06:37:52
`interface' is reserved on the Mac. * include/freetype/ftoutln.h, include/freetype/internal/sfnt.h, src/base/ftoutln.c: s/interface/func_interface/. * src/base/ftbbox.c (FT_Outline_Get_BBox): s/interface/bbox_interface/. * src/cff/cffdrivr.c: s/interface/module_interface/. * src/cff/cffload.c, src/cff/cffload.h: s/interface/psnames_interface/. * src/cid/cidriver.c: s/interface/cid_interface/. * src/sfnt/sfdriver.c: s/interface/module_interface/. * src/smooth/ftgrays.c: s/interface/func_interface/. * src/truetype/ttdriver.c: s/interface/tt_interface/. * src/type1/t1driver.c: s/interface/t1_interface/.
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
diff --git a/ChangeLog b/ChangeLog
index 941143f..5ac26f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2002-04-30 Werner Lemberg <wl@gnu.org>
+
+ `interface' is reserved on the Mac.
+
+ * include/freetype/ftoutln.h, include/freetype/internal/sfnt.h,
+ src/base/ftoutln.c: s/interface/func_interface/.
+ * src/base/ftbbox.c (FT_Outline_Get_BBox):
+ s/interface/bbox_interface/.
+ * src/cff/cffdrivr.c: s/interface/module_interface/.
+ * src/cff/cffload.c, src/cff/cffload.h:
+ s/interface/psnames_interface/.
+ * src/cid/cidriver.c: s/interface/cid_interface/.
+ * src/sfnt/sfdriver.c: s/interface/module_interface/.
+ * src/smooth/ftgrays.c: s/interface/func_interface/.
+ * src/truetype/ttdriver.c: s/interface/tt_interface/.
+ * src/type1/t1driver.c: s/interface/t1_interface/.
+
2002-04-29 Jouk Jansen <joukj@hrem.stm.tudelft.nl>
* descrip.mms (all): Add pfr driver.
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 27cac3a..977a122 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -5,7 +5,7 @@
/* Support for the FT_Outline type used to store glyph shapes of */
/* most scalable font formats (specification). */
/* */
-/* Copyright 1996-2001 by */
+/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -83,22 +83,24 @@ FT_BEGIN_HEADER
/* of new contours in the outline. */
/* */
/* <Input> */
- /* outline :: A pointer to the source target. */
+ /* outline :: A pointer to the source target. */
/* */
- /* interface :: A table of `emitters', i.e,. function pointers called */
- /* during decomposition to indicate path operations. */
+ /* func_interface :: A table of `emitters', i.e,. function pointers */
+ /* called during decomposition to indicate path */
+ /* operations. */
/* */
/* <InOut> */
- /* user :: A typeless pointer which is passed to each emitter */
- /* during the decomposition. It can be used to store */
- /* the state during the decomposition. */
+ /* user :: A typeless pointer which is passed to each */
+ /* emitter during the decomposition. It can be */
+ /* used to store the state during the */
+ /* decomposition. */
/* */
/* <Return> */
/* FreeType error code. 0 means sucess. */
/* */
FT_EXPORT( FT_Error )
FT_Outline_Decompose( FT_Outline* outline,
- const FT_Outline_Funcs* interface,
+ const FT_Outline_Funcs* func_interface,
void* user );
diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h
index b6a3aed..89e9190 100644
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -127,7 +127,7 @@ FT_BEGIN_HEADER
typedef FT_Module_Interface
(*SFNT_Get_Interface_Func)( FT_Module module,
- const char* interface );
+ const char* func_interface );
/*************************************************************************/
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index f30b8fb..2e08051 100644
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -4,7 +4,7 @@
/* */
/* FreeType bbox computation (body). */
/* */
-/* Copyright 1996-2001 by */
+/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -622,7 +622,7 @@
/* the two boxes are different, now walk over the outline to */
/* get the Bezier arc extrema. */
- static const FT_Outline_Funcs interface =
+ static const FT_Outline_Funcs bbox_interface =
{
(FT_Outline_MoveTo_Func) BBox_Move_To,
(FT_Outline_LineTo_Func) BBox_Move_To,
@@ -637,7 +637,7 @@
user.bbox = bbox;
- error = FT_Outline_Decompose( outline, &interface, &user );
+ error = FT_Outline_Decompose( outline, &bbox_interface, &user );
if ( error )
return error;
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index e2046b7..f9a806f 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -46,7 +46,7 @@
FT_EXPORT_DEF( FT_Error )
FT_Outline_Decompose( FT_Outline* outline,
- const FT_Outline_Funcs* interface,
+ const FT_Outline_Funcs* func_interface,
void* user )
{
#undef SCALED
@@ -70,11 +70,11 @@
FT_Pos delta;
- if ( !outline || !interface )
+ if ( !outline || !func_interface )
return FT_Err_Invalid_Argument;
- shift = interface->shift;
- delta = interface->delta;
+ shift = func_interface->shift;
+ delta = func_interface->delta;
first = 0;
for ( n = 0; n < outline->n_contours; n++ )
@@ -125,7 +125,7 @@
tags--;
}
- error = interface->move_to( &v_start, user );
+ error = func_interface->move_to( &v_start, user );
if ( error )
goto Exit;
@@ -145,7 +145,7 @@
vec.x = SCALED( point->x );
vec.y = SCALED( point->y );
- error = interface->line_to( &vec, user );
+ error = func_interface->line_to( &vec, user );
if ( error )
goto Exit;
continue;
@@ -171,7 +171,7 @@
if ( tag == FT_Curve_Tag_On )
{
- error = interface->conic_to( &v_control, &vec, user );
+ error = func_interface->conic_to( &v_control, &vec, user );
if ( error )
goto Exit;
continue;
@@ -183,7 +183,7 @@
v_middle.x = ( v_control.x + vec.x ) / 2;
v_middle.y = ( v_control.y + vec.y ) / 2;
- error = interface->conic_to( &v_control, &v_middle, user );
+ error = func_interface->conic_to( &v_control, &v_middle, user );
if ( error )
goto Exit;
@@ -191,7 +191,7 @@
goto Do_Conic;
}
- error = interface->conic_to( &v_control, &v_start, user );
+ error = func_interface->conic_to( &v_control, &v_start, user );
goto Close;
default: /* FT_Curve_Tag_Cubic */
@@ -217,20 +217,20 @@
vec.x = SCALED( point->x );
vec.y = SCALED( point->y );
- error = interface->cubic_to( &vec1, &vec2, &vec, user );
+ error = func_interface->cubic_to( &vec1, &vec2, &vec, user );
if ( error )
goto Exit;
continue;
}
- error = interface->cubic_to( &vec1, &vec2, &v_start, user );
+ error = func_interface->cubic_to( &vec1, &vec2, &v_start, user );
goto Close;
}
}
}
/* close the contour with a line segment */
- error = interface->line_to( &v_start, user );
+ error = func_interface->line_to( &v_start, user );
Close:
if ( error )
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 7db9a69..a910ce5 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -437,17 +437,17 @@
static FT_Module_Interface
cff_get_interface( CFF_Driver driver,
- const char* interface )
+ const char* module_interface )
{
FT_Module sfnt;
#ifndef FT_CONFIG_OPTION_NO_GLYPH_NAMES
- if ( ft_strcmp( (const char*)interface, "glyph_name" ) == 0 )
+ if ( ft_strcmp( (const char*)module_interface, "glyph_name" ) == 0 )
return (FT_Module_Interface)cff_get_glyph_name;
- if ( ft_strcmp( (const char*)interface, "name_index" ) == 0 )
+ if ( ft_strcmp( (const char*)module_interface, "name_index" ) == 0 )
return (FT_Module_Interface)cff_get_name_index;
#endif
@@ -455,7 +455,7 @@
/* we simply pass our request to the `sfnt' module */
sfnt = FT_Get_Module( driver->root.root.library, "sfnt" );
- return sfnt ? sfnt->clazz->get_interface( sfnt, interface ) : 0;
+ return sfnt ? sfnt->clazz->get_interface( sfnt, module_interface ) : 0;
}
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 2b81ebb..692eea7 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1313,7 +1313,7 @@
FT_LOCAL_DEF( FT_String* )
CFF_Get_String( CFF_Index idx,
FT_UInt sid,
- PSNames_Service interface )
+ PSNames_Service psnames_interface )
{
/* if it is not a standard string, return it */
if ( sid > 390 )
@@ -1322,7 +1322,7 @@
/* that's a standard string, fetch a copy from the PSName module */
{
FT_String* name = 0;
- const char* adobe_name = interface->adobe_std_strings( sid );
+ const char* adobe_name = psnames_interface->adobe_std_strings( sid );
FT_UInt len;
diff --git a/src/cff/cffload.h b/src/cff/cffload.h
index 18f78df..2057308 100644
--- a/src/cff/cffload.h
+++ b/src/cff/cffload.h
@@ -38,7 +38,7 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_String* )
CFF_Get_String( CFF_Index idx,
FT_UInt sid,
- PSNames_Service interface );
+ PSNames_Service psnames_interface );
FT_LOCAL( FT_Error )
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 594c7a4..cd226e6 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -51,12 +51,12 @@
static FT_Module_Interface
CID_Get_Interface( FT_Driver driver,
- const FT_String* interface )
+ const FT_String* cid_interface )
{
FT_UNUSED( driver );
- FT_UNUSED( interface );
+ FT_UNUSED( cid_interface );
- if ( ft_strcmp( (const char*)interface, "postscript_name" ) == 0 )
+ if ( ft_strcmp( (const char*)cid_interface, "postscript_name" ) == 0 )
return (FT_Module_Interface)cid_get_postscript_name;
return 0;
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index bbc8822..fc06ba4 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -195,19 +195,19 @@
FT_CALLBACK_DEF( FT_Module_Interface )
SFNT_Get_Interface( FT_Module module,
- const char* interface )
+ const char* module_interface )
{
FT_UNUSED( module );
- if ( ft_strcmp( interface, "get_sfnt" ) == 0 )
+ if ( ft_strcmp( module_interface, "get_sfnt" ) == 0 )
return (FT_Module_Interface)get_sfnt_table;
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
- if ( ft_strcmp( interface, "glyph_name" ) == 0 )
+ if ( ft_strcmp( module_interface, "glyph_name" ) == 0 )
return (FT_Module_Interface)get_sfnt_glyph_name;
#endif
- if ( ft_strcmp( interface, "postscript_name" ) == 0 )
+ if ( ft_strcmp( module_interface, "postscript_name" ) == 0 )
return (FT_Module_Interface)get_sfnt_postscript_name;
return 0;
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index abe0906..33b8aae 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -1544,21 +1544,23 @@
/* of new contours in the outline. */
/* */
/* <Input> */
- /* outline :: A pointer to the source target. */
+ /* outline :: A pointer to the source target. */
/* */
- /* interface :: A table of `emitters', i.e,. function pointers called */
- /* during decomposition to indicate path operations. */
+ /* func_interface :: A table of `emitters', i.e,. function pointers */
+ /* called during decomposition to indicate path */
+ /* operations. */
/* */
- /* user :: A typeless pointer which is passed to each emitter */
- /* during the decomposition. It can be used to store */
- /* the state during the decomposition. */
+ /* user :: A typeless pointer which is passed to each */
+ /* emitter during the decomposition. It can be */
+ /* used to store the state during the */
+ /* decomposition. */
/* */
/* <Return> */
/* Error code. 0 means sucess. */
/* */
static
int FT_Outline_Decompose( FT_Outline* outline,
- const FT_Outline_Funcs* interface,
+ const FT_Outline_Funcs* func_interface,
void* user )
{
#undef SCALED
@@ -1582,8 +1584,8 @@
char tag; /* current point's state */
#if 0
- int shift = interface->shift;
- FT_Pos delta = interface->delta;
+ int shift = func_interface->shift;
+ FT_Pos delta = func_interface->delta;
#endif
@@ -1637,7 +1639,7 @@
tags--;
}
- error = interface->move_to( &v_start, user );
+ error = func_interface->move_to( &v_start, user );
if ( error )
goto Exit;
@@ -1657,7 +1659,7 @@
vec.x = SCALED( point->x );
vec.y = SCALED( point->y );
- error = interface->line_to( &vec, user );
+ error = func_interface->line_to( &vec, user );
if ( error )
goto Exit;
continue;
@@ -1684,7 +1686,7 @@
if ( tag == FT_Curve_Tag_On )
{
- error = interface->conic_to( &v_control, &vec, user );
+ error = func_interface->conic_to( &v_control, &vec, user );
if ( error )
goto Exit;
continue;
@@ -1696,7 +1698,7 @@
v_middle.x = ( v_control.x + vec.x ) / 2;
v_middle.y = ( v_control.y + vec.y ) / 2;
- error = interface->conic_to( &v_control, &v_middle, user );
+ error = func_interface->conic_to( &v_control, &v_middle, user );
if ( error )
goto Exit;
@@ -1704,7 +1706,7 @@
goto Do_Conic;
}
- error = interface->conic_to( &v_control, &v_start, user );
+ error = func_interface->conic_to( &v_control, &v_start, user );
goto Close;
}
@@ -1731,20 +1733,20 @@
vec.x = SCALED( point->x );
vec.y = SCALED( point->y );
- error = interface->cubic_to( &vec1, &vec2, &vec, user );
+ error = func_interface->cubic_to( &vec1, &vec2, &vec, user );
if ( error )
goto Exit;
continue;
}
- error = interface->cubic_to( &vec1, &vec2, &v_start, user );
+ error = func_interface->cubic_to( &vec1, &vec2, &v_start, user );
goto Close;
}
}
}
/* close the contour with a line segment */
- error = interface->line_to( &v_start, user );
+ error = func_interface->line_to( &v_start, user );
Close:
if ( error )
@@ -1776,7 +1778,7 @@
gray_convert_glyph_inner( RAS_ARG )
{
static
- const FT_Outline_Funcs interface =
+ const FT_Outline_Funcs func_interface =
{
(FT_Outline_MoveTo_Func) gray_move_to,
(FT_Outline_LineTo_Func) gray_line_to,
@@ -1790,7 +1792,7 @@
if ( setjmp( ras.jump_buffer ) == 0 )
{
- error = FT_Outline_Decompose( &ras.outline, &interface, &ras );
+ error = FT_Outline_Decompose( &ras.outline, &func_interface, &ras );
gray_record_cell( RAS_VAR );
}
else
@@ -1881,7 +1883,7 @@
#if 1
error = gray_convert_glyph_inner( RAS_VAR );
#else
- error = FT_Outline_Decompose( outline, &interface, &ras ) ||
+ error = FT_Outline_Decompose( outline, &func_interface, &ras ) ||
gray_record_cell( RAS_VAR );
#endif
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 7011921..27cbd35 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -455,7 +455,7 @@
static FT_Module_Interface
tt_get_interface( TT_Driver driver,
- const char* interface )
+ const char* tt_interface )
{
FT_Module sfntd = FT_Get_Module( driver->root.root.library,
"sfnt" );
@@ -467,7 +467,7 @@
{
sfnt = (SFNT_Service)( sfntd->clazz->module_interface );
if ( sfnt )
- return sfnt->get_interface( FT_MODULE( driver ), interface );
+ return sfnt->get_interface( FT_MODULE( driver ), tt_interface );
}
return 0;
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index 8fdce53..db611e3 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -128,11 +128,11 @@
/* PostScript name of a given glyph index). */
/* */
/* <InOut> */
- /* driver :: A handle to a driver object. */
+ /* driver :: A handle to a driver object. */
/* */
/* <Input> */
- /* interface :: A string designing the interface. Examples are */
- /* `sfnt', `post_names', `charmaps', etc. */
+ /* t1_interface :: A string designing the interface. Examples are */
+ /* `sfnt', `post_names', `charmaps', etc. */
/* */
/* <Return> */
/* A typeless pointer to the extension's interface (normally a table */
@@ -142,28 +142,28 @@
/* */
static FT_Module_Interface
Get_Interface( FT_Driver driver,
- const FT_String* interface )
+ const FT_String* t1_interface )
{
FT_UNUSED( driver );
- FT_UNUSED( interface );
+ FT_UNUSED( t1_interface );
- if ( ft_strcmp( (const char*)interface, "glyph_name" ) == 0 )
+ if ( ft_strcmp( (const char*)t1_interface, "glyph_name" ) == 0 )
return (FT_Module_Interface)t1_get_glyph_name;
- if ( ft_strcmp( (const char*)interface, "name_index" ) == 0 )
+ if ( ft_strcmp( (const char*)t1_interface, "name_index" ) == 0 )
return (FT_Module_Interface)t1_get_name_index;
- if ( ft_strcmp( (const char*)interface, "postscript_name" ) == 0 )
+ if ( ft_strcmp( (const char*)t1_interface, "postscript_name" ) == 0 )
return (FT_Module_Interface)t1_get_ps_name;
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
- if ( ft_strcmp( (const char*)interface, "get_mm" ) == 0 )
+ if ( ft_strcmp( (const char*)t1_interface, "get_mm" ) == 0 )
return (FT_Module_Interface)T1_Get_Multi_Master;
- if ( ft_strcmp( (const char*)interface, "set_mm_design") == 0 )
+ if ( ft_strcmp( (const char*)t1_interface, "set_mm_design") == 0 )
return (FT_Module_Interface)T1_Set_MM_Design;
- if ( ft_strcmp( (const char*)interface, "set_mm_blend") == 0 )
+ if ( ft_strcmp( (const char*)t1_interface, "set_mm_blend") == 0 )
return (FT_Module_Interface)T1_Set_MM_Blend;
#endif
return 0;