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

22 years ago · 63ce99a09a
parent 1f6cbfd6bb
commit 63ce99a09a
13 changed files with 75 additions and 34 deletions
--- a/20
+++ b/20
@ -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>

 	* src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]:
--- a/include/freetype/config/ftheader.h
+++ b/include/freetype/config/ftheader.h
@ -509,7 +509,7 @@
  /* */

 #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_ERROR_DEFINITIONS_H     <freetype/fterrdef.h>

--- a/include/freetype/ftstroker.h
+++ b/include/freetype/ftstroker.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 <ft2build.h>
 #include FT_OUTLINE_H
@ -136,4 +154,7 @@ FT_BEGIN_HEADER

 FT_END_HEADER

-#endif /* __FT_STROKER_H__ */
+#endif /* __FT_STROKE_H__ */
+
+
+/* END */
--- 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.
--- 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)
--- a/src/base/ftstroker.c
+++ b/src/base/ftstroker.c
@ -1,6 +1,6 @@
 /***************************************************************************/
 /*                                                                         */
-/*  ftstroker.c                                                            */
+/*  ftstroke.c                                                             */
 /*                                                                         */
 /*    FreeType path stroker (body).                                        */
 /*                                                                         */
--- 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
--- 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
  {
--- 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 <ft2build.h>
 #include "pcfutil.c"
 #include "pcfread.c"
-#include "pcfdriver.c"
+#include "pcfdrivr.c"

 /* END */
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.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"

--- a/src/pcf/pcfdriver.h
+++ b/src/pcf/pcfdriver.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 <ft2build.h>
 #include FT_INTERNAL_DRIVER_H
@ -38,7 +38,7 @@ FT_BEGIN_HEADER
 FT_END_HEADER


-#endif /* __PCFDRIVER_H__ */
+#endif /* __PCFDRIVR_H__ */


 /* END */
--- 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"
--- 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)