* include/freetype/ftstroker.h: Renamed to...

* include/freetype/ftstroke.h: This.

* src/base/ftstroker.c: Renamed to...
* src/base/ftstroke.c: This.

* include/freetype/config/ftheader.h (FT_STROKER_H): Updated.

* src/base/descrip.mms, src/base/Jamfile, src/base/rules.mk:
Updated.

* src/pcf/pcfdriver.c: Renamed to...
* src/pcf/pcfdrivr.c: This.
* src/pcf/pcfdriver.h: Renamed to...
* src/pcf/pcfdrivr.h: This.

* src/pcf/Jamfile, src/pcf/rules.mk: Updated.
This commit is contained in:
Werner Lemberg 2003-06-07 04:02:21 +00:00
parent 1ffb911d50
commit 499053c1c5
13 changed files with 75 additions and 34 deletions

View File

@ -1,3 +1,23 @@
2003-06-06 Werner Lemberg <wl@gnu.org>
* include/freetype/ftstroker.h: Renamed to...
* include/freetype/ftstroke.h: This.
* src/base/ftstroker.c: Renamed to...
* src/base/ftstroke.c: This.
* include/freetype/config/ftheader.h (FT_STROKER_H): Updated.
* src/base/descrip.mms, src/base/Jamfile, src/base/rules.mk:
Updated.
* src/pcf/pcfdriver.c: Renamed to...
* src/pcf/pcfdrivr.c: This.
* src/pcf/pcfdriver.h: Renamed to...
* src/pcf/pcfdrivr.h: This.
* src/pcf/Jamfile, src/pcf/rules.mk: Updated.
2003-06-05 Wenlin Institute (Tom Bishop) <wenlin@wenlin.com> 2003-06-05 Wenlin Institute (Tom Bishop) <wenlin@wenlin.com>
* src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]: * src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]:

View File

@ -509,7 +509,7 @@
/* */ /* */
#define FT_TRIGONOMETRY_H <freetype/fttrigon.h> #define FT_TRIGONOMETRY_H <freetype/fttrigon.h>
#define FT_STROKER_H <freetype/ftstroker.h> #define FT_STROKER_H <freetype/ftstroke.h>
#define FT_SYNTHESIS_H <freetype/ftsynth.h> #define FT_SYNTHESIS_H <freetype/ftsynth.h>
#define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h> #define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h>

View File

@ -1,5 +1,23 @@
#ifndef __FT_STROKER_H__ /***************************************************************************/
#define __FT_STROKER_H__ /* */
/* ftstroke.h */
/* */
/* FreeType path stroker (specification). */
/* */
/* Copyright 2002, 2003 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 __FT_STROKE_H__
#define __FT_STROKE_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_OUTLINE_H #include FT_OUTLINE_H
@ -136,4 +154,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* __FT_STROKER_H__ */ #endif /* __FT_STROKE_H__ */
/* END */

View File

@ -1,4 +1,4 @@
# FreeType 2 src/base Jamfile (c) 2001, 2002 David Turner # FreeType 2 src/base Jamfile (c) 2001, 2002, 2003 David Turner
# #
SubDir FT2_TOP $(FT2_SRC_DIR) base ; SubDir FT2_TOP $(FT2_SRC_DIR) base ;
@ -24,7 +24,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ;
# #
Library $(FT2_LIB) : ftsystem.c ftinit.c ftglyph.c ftmm.c ftbdf.c Library $(FT2_LIB) : ftsystem.c ftinit.c ftglyph.c ftmm.c ftbdf.c
ftbbox.c ftdebug.c ftxf86.c fttype1.c ftpfr.c ftbbox.c ftdebug.c ftxf86.c fttype1.c ftpfr.c
ftstroker.c ftwinfnt.c ftstroke.c ftwinfnt.c
; ;
# Add Macintosh-specific file to the library when necessary. # Add Macintosh-specific file to the library when necessary.

View File

@ -3,7 +3,7 @@
# #
# Copyright 2001 by # Copyright 2001, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -15,7 +15,7 @@
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base]) CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base])
OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroker.obj,ftwinfnt.obj OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj
all : $(OBJS) all : $(OBJS)
library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS)

View File

@ -1,6 +1,6 @@
/***************************************************************************/ /***************************************************************************/
/* */ /* */
/* ftstroker.c */ /* ftstroke.c */
/* */ /* */
/* FreeType path stroker (body). */ /* FreeType path stroker (body). */
/* */ /* */

View File

@ -49,14 +49,14 @@ BASE_SRC := $(BASE_)ftcalc.c \
# object. It will then be linked to the final executable only if one of its # object. It will then be linked to the final executable only if one of its
# symbols is used by the application. # symbols is used by the application.
# #
BASE_EXT_SRC := $(BASE_)ftglyph.c \ BASE_EXT_SRC := $(BASE_)ftglyph.c \
$(BASE_)ftmm.c \ $(BASE_)ftmm.c \
$(BASE_)ftbdf.c \ $(BASE_)ftbdf.c \
$(BASE_)fttype1.c \ $(BASE_)fttype1.c \
$(BASE_)ftxf86.c \ $(BASE_)ftxf86.c \
$(BASE_)ftpfr.c \ $(BASE_)ftpfr.c \
$(BASE_)ftstroker.c \ $(BASE_)ftstroke.c \
$(BASE_)ftwinfnt.c \ $(BASE_)ftwinfnt.c \
$(BASE_)ftbbox.c $(BASE_)ftbbox.c
# Default extensions objects # Default extensions objects

View File

@ -1,4 +1,4 @@
# FreeType 2 src/pcf Jamfile (c) 2001 David Turner # FreeType 2 src/pcf Jamfile (c) 2001, 2003 David Turner
# #
SubDir FT2_TOP $(FT2_SRC_DIR) pcf ; SubDir FT2_TOP $(FT2_SRC_DIR) pcf ;
@ -8,7 +8,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) pcf ;
if $(FT2_MULTI) if $(FT2_MULTI)
{ {
_sources = pcfdriver pcfread pcfutil ; _sources = pcfdrivr pcfread pcfutil ;
} }
else else
{ {

View File

@ -2,7 +2,7 @@
FreeType font driver for pcf fonts FreeType font driver for pcf fonts
Copyright 2000-2001 by Copyright 2000-2001, 2003 by
Francesco Zappa Nardelli Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
@ -31,6 +31,6 @@ THE SOFTWARE.
#include <ft2build.h> #include <ft2build.h>
#include "pcfutil.c" #include "pcfutil.c"
#include "pcfread.c" #include "pcfread.c"
#include "pcfdriver.c" #include "pcfdrivr.c"
/* END */ /* END */

View File

@ -1,4 +1,4 @@
/* pcfdriver.c /* pcfdrivr.c
FreeType font driver for pcf files FreeType font driver for pcf files
@ -35,7 +35,7 @@ THE SOFTWARE.
#include FT_BDF_H #include FT_BDF_H
#include "pcf.h" #include "pcf.h"
#include "pcfdriver.h" #include "pcfdrivr.h"
#include "pcfutil.h" #include "pcfutil.h"
#include "pcfread.h" #include "pcfread.h"

View File

@ -1,4 +1,4 @@
/* pcfdriver.h /* pcfdrivr.h
FreeType font driver for pcf fonts FreeType font driver for pcf fonts
@ -25,8 +25,8 @@ THE SOFTWARE.
*/ */
#ifndef __PCFDRIVER_H__ #ifndef __PCFDRIVR_H__
#define __PCFDRIVER_H__ #define __PCFDRIVR_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_INTERNAL_DRIVER_H #include FT_INTERNAL_DRIVER_H
@ -38,7 +38,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* __PCFDRIVER_H__ */ #endif /* __PCFDRIVR_H__ */
/* END */ /* END */

View File

@ -32,7 +32,7 @@ THE SOFTWARE.
#include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_OBJECTS_H
#include "pcf.h" #include "pcf.h"
#include "pcfdriver.h" #include "pcfdrivr.h"
#include "pcfread.h" #include "pcfread.h"
#include "pcferror.h" #include "pcferror.h"

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 2000, 2001 by # Copyright (C) 2000, 2001, 2003 by
# Francesco Zappa Nardelli # Francesco Zappa Nardelli
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy # Permission is hereby granted, free of charge, to any person obtaining a copy
@ -36,15 +36,15 @@ PCF_COMPILE := $(FT_COMPILE) $I$(PCF_DIR)
# pcf driver sources (i.e., C files) # pcf driver sources (i.e., C files)
# #
PCF_DRV_SRC := $(PCF_DIR_)pcfread.c \ PCF_DRV_SRC := $(PCF_DIR_)pcfread.c \
$(PCF_DIR_)pcfdriver.c \ $(PCF_DIR_)pcfdrivr.c \
$(PCF_DIR_)pcfutil.c $(PCF_DIR_)pcfutil.c
# pcf driver headers # pcf driver headers
# #
PCF_DRV_H := $(PCF_DIR_)pcf.h \ PCF_DRV_H := $(PCF_DIR_)pcf.h \
$(PCF_DIR_)pcfdriver.h \ $(PCF_DIR_)pcfdrivr.h \
$(PCF_DIR_)pcfutil.h \ $(PCF_DIR_)pcfutil.h \
$(PCF_DIR_)pcferror.h $(PCF_DIR_)pcferror.h
# pcf driver object(s) # pcf driver object(s)