From 63ce99a09a72c2a1c06a6e367c12306b336be2b7 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 7 Jun 2003 04:02:21 +0000 Subject: [PATCH] * 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. --- ChangeLog | 20 +++++++++++++++ include/freetype/config/ftheader.h | 2 +- include/freetype/{ftstroker.h => ftstroke.h} | 27 +++++++++++++++++--- src/base/Jamfile | 4 +-- src/base/descrip.mms | 4 +-- src/base/{ftstroker.c => ftstroke.c} | 2 +- src/base/rules.mk | 16 ++++++------ src/pcf/Jamfile | 4 +-- src/pcf/pcf.c | 4 +-- src/pcf/{pcfdriver.c => pcfdrivr.c} | 4 +-- src/pcf/{pcfdriver.h => pcfdrivr.h} | 8 +++--- src/pcf/pcfread.c | 2 +- src/pcf/rules.mk | 12 ++++----- 13 files changed, 75 insertions(+), 34 deletions(-) rename include/freetype/{ftstroker.h => ftstroke.h} (72%) rename src/base/{ftstroker.c => ftstroke.c} (99%) rename src/pcf/{pcfdriver.c => pcfdrivr.c} (99%) rename src/pcf/{pcfdriver.h => pcfdrivr.h} (93%) diff --git a/ChangeLog b/ChangeLog index 12af1bd1e..7c012a0cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2003-06-06 Werner Lemberg + + * 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) * src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]: diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h index 315b76500..2bd5bd61c 100644 --- a/include/freetype/config/ftheader.h +++ b/include/freetype/config/ftheader.h @@ -509,7 +509,7 @@ /* */ #define FT_TRIGONOMETRY_H -#define FT_STROKER_H +#define FT_STROKER_H #define FT_SYNTHESIS_H #define FT_ERROR_DEFINITIONS_H diff --git a/include/freetype/ftstroker.h b/include/freetype/ftstroke.h similarity index 72% rename from include/freetype/ftstroker.h rename to include/freetype/ftstroke.h index a71405641..a92c68d62 100644 --- a/include/freetype/ftstroker.h +++ b/include/freetype/ftstroke.h @@ -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 #include FT_OUTLINE_H @@ -136,4 +154,7 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FT_STROKER_H__ */ +#endif /* __FT_STROKE_H__ */ + + +/* END */ diff --git a/src/base/Jamfile b/src/base/Jamfile index 5ebcd7caa..fbb7b39d0 100644 --- a/src/base/Jamfile +++ b/src/base/Jamfile @@ -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 ; @@ -24,7 +24,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ; # Library $(FT2_LIB) : ftsystem.c ftinit.c ftglyph.c ftmm.c ftbdf.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. diff --git a/src/base/descrip.mms b/src/base/descrip.mms index 02a806a5f..cf69bdde4 100644 --- a/src/base/descrip.mms +++ b/src/base/descrip.mms @@ -3,7 +3,7 @@ # -# Copyright 2001 by +# Copyright 2001, 2003 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # 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]) -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) library [--.lib]freetype.olb $(OBJS) diff --git a/src/base/ftstroker.c b/src/base/ftstroke.c similarity index 99% rename from src/base/ftstroker.c rename to src/base/ftstroke.c index 34c93edc7..d6d5be321 100644 --- a/src/base/ftstroker.c +++ b/src/base/ftstroke.c @@ -1,6 +1,6 @@ /***************************************************************************/ /* */ -/* ftstroker.c */ +/* ftstroke.c */ /* */ /* FreeType path stroker (body). */ /* */ diff --git a/src/base/rules.mk b/src/base/rules.mk index da345ddc5..e5dcc7be0 100644 --- a/src/base/rules.mk +++ b/src/base/rules.mk @@ -49,14 +49,14 @@ BASE_SRC := $(BASE_)ftcalc.c \ # object. It will then be linked to the final executable only if one of its # symbols is used by the application. # -BASE_EXT_SRC := $(BASE_)ftglyph.c \ - $(BASE_)ftmm.c \ - $(BASE_)ftbdf.c \ - $(BASE_)fttype1.c \ - $(BASE_)ftxf86.c \ - $(BASE_)ftpfr.c \ - $(BASE_)ftstroker.c \ - $(BASE_)ftwinfnt.c \ +BASE_EXT_SRC := $(BASE_)ftglyph.c \ + $(BASE_)ftmm.c \ + $(BASE_)ftbdf.c \ + $(BASE_)fttype1.c \ + $(BASE_)ftxf86.c \ + $(BASE_)ftpfr.c \ + $(BASE_)ftstroke.c \ + $(BASE_)ftwinfnt.c \ $(BASE_)ftbbox.c # Default extensions objects diff --git a/src/pcf/Jamfile b/src/pcf/Jamfile index fd7762585..3a884f534 100644 --- a/src/pcf/Jamfile +++ b/src/pcf/Jamfile @@ -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 ; @@ -8,7 +8,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) pcf ; if $(FT2_MULTI) { - _sources = pcfdriver pcfread pcfutil ; + _sources = pcfdrivr pcfread pcfutil ; } else { diff --git a/src/pcf/pcf.c b/src/pcf/pcf.c index 315655e56..11d5b7b2a 100644 --- a/src/pcf/pcf.c +++ b/src/pcf/pcf.c @@ -2,7 +2,7 @@ FreeType font driver for pcf fonts - Copyright 2000-2001 by + Copyright 2000-2001, 2003 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy @@ -31,6 +31,6 @@ THE SOFTWARE. #include #include "pcfutil.c" #include "pcfread.c" -#include "pcfdriver.c" +#include "pcfdrivr.c" /* END */ diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdrivr.c similarity index 99% rename from src/pcf/pcfdriver.c rename to src/pcf/pcfdrivr.c index e009ee83b..37e6c0943 100644 --- a/src/pcf/pcfdriver.c +++ b/src/pcf/pcfdrivr.c @@ -1,4 +1,4 @@ -/* pcfdriver.c +/* pcfdrivr.c FreeType font driver for pcf files @@ -35,7 +35,7 @@ THE SOFTWARE. #include FT_BDF_H #include "pcf.h" -#include "pcfdriver.h" +#include "pcfdrivr.h" #include "pcfutil.h" #include "pcfread.h" diff --git a/src/pcf/pcfdriver.h b/src/pcf/pcfdrivr.h similarity index 93% rename from src/pcf/pcfdriver.h rename to src/pcf/pcfdrivr.h index 7c45b9181..7ddf697e1 100644 --- a/src/pcf/pcfdriver.h +++ b/src/pcf/pcfdrivr.h @@ -1,4 +1,4 @@ -/* pcfdriver.h +/* pcfdrivr.h FreeType font driver for pcf fonts @@ -25,8 +25,8 @@ THE SOFTWARE. */ -#ifndef __PCFDRIVER_H__ -#define __PCFDRIVER_H__ +#ifndef __PCFDRIVR_H__ +#define __PCFDRIVR_H__ #include #include FT_INTERNAL_DRIVER_H @@ -38,7 +38,7 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __PCFDRIVER_H__ */ +#endif /* __PCFDRIVR_H__ */ /* END */ diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 10c82607f..5a5a16534 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -32,7 +32,7 @@ THE SOFTWARE. #include FT_INTERNAL_OBJECTS_H #include "pcf.h" -#include "pcfdriver.h" +#include "pcfdrivr.h" #include "pcfread.h" #include "pcferror.h" diff --git a/src/pcf/rules.mk b/src/pcf/rules.mk index 141f1b744..b63d8643e 100644 --- a/src/pcf/rules.mk +++ b/src/pcf/rules.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 2000, 2001 by +# Copyright (C) 2000, 2001, 2003 by # Francesco Zappa Nardelli # # 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_DRV_SRC := $(PCF_DIR_)pcfread.c \ - $(PCF_DIR_)pcfdriver.c \ +PCF_DRV_SRC := $(PCF_DIR_)pcfread.c \ + $(PCF_DIR_)pcfdrivr.c \ $(PCF_DIR_)pcfutil.c # pcf driver headers # -PCF_DRV_H := $(PCF_DIR_)pcf.h \ - $(PCF_DIR_)pcfdriver.h \ - $(PCF_DIR_)pcfutil.h \ +PCF_DRV_H := $(PCF_DIR_)pcf.h \ + $(PCF_DIR_)pcfdrivr.h \ + $(PCF_DIR_)pcfutil.h \ $(PCF_DIR_)pcferror.h # pcf driver object(s)