* src/lzw/ftlzw2.c: Renamed to...

19 years ago · 4f3b5bbd95
parent a94746caee
commit 4f3b5bbd95
8 changed files with 44 additions and 33 deletions
--- a/34
+++ b/34
@ -1,3 +1,15 @@
+2006-05-04  Werner Lemberg  <wl@gnu.org>
+
+	* src/lzw/ftlzw2.c: Renamed to...
+	* src/lzw/ftlzw.c: This.
+
+	* src/lzw/Jamfile, src/lzw/rules.mk: Updated.
+
+	* builds/mac/FreeType.m68k_cfm.make.txt,
+	builds/mac/FreeType.m68k_far.make.txt,
+	builds/mac/FreeType.ppc_carbon.make.txt,
+	builds/mac/FreeType.ppc_classic.make.txt: Updated.
+
 2006-05-03  David Turner  <david@freetype.org>

 	Allow compilation again with C++ compilers.
@ -26,17 +38,6 @@

 2006-05-02  David Turner  <david@freetype.org>

-	* include/freetype/ftstream.h (FT_FRAME_ENTER, FT_FRAME_EXIT,
-	FT_FRAME_EXTRACT, FT_FRAME_RELEASE: Use FT_DEBUG_INNER to report the
-	place where the frames were entered, extracted, exited or released
-	in the memory debugger.
-
-	* src/base/ftstream.c (FT_Stream_ReleaseFrame) [FT_DEBUG_MEMORY]:
-	Call ft_mem_free.
-	(FT_Stream_EnterFrame) [FT_DEBUG_MEMORY]: Use ft_mem_qalloc.
-	(FT_Stream_ExitFrame) [FT_DEBUG_MEMORY]: Use ft_mem_free.
-
-
 	Update the memory management functions and macros to safely deal
 	with array size buffer overflows.  This corresponds to attemps to
 	allocate arrays that are too large.  For an example, consider the
@ -96,6 +97,17 @@
 	* src/base/ftutil.c: Remove special code for FT_STRICT_ALIASING.
 	(ft_mem_alloc. ft_mem_realloc, ft_mem_qrealloc): Rewrite.

+
+	* include/freetype/ftstream.h (FT_FRAME_ENTER, FT_FRAME_EXIT,
+	FT_FRAME_EXTRACT, FT_FRAME_RELEASE): Use FT_DEBUG_INNER to report the
+	place where the frames were entered, extracted, exited or released
+	in the memory debugger.
+
+	* src/base/ftstream.c (FT_Stream_ReleaseFrame) [FT_DEBUG_MEMORY]:
+	Call ft_mem_free.
+	(FT_Stream_EnterFrame) [FT_DEBUG_MEMORY]: Use ft_mem_qalloc.
+	(FT_Stream_ExitFrame) [FT_DEBUG_MEMORY]: Use ft_mem_free.
+
 2006-04-30  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>

 	* src/base/ftobjs.c (Mac_Read_POST_Resource): Correct pfb_pos
--- a/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/builds/mac/FreeType.m68k_cfm.make.txt
@ -56,7 +56,7 @@ SrcFiles        =  \xB6
 				  :src:cid:type1cid.c \xB6
 				  :src:gxvalid:gxvalid.c \xB6
 				  :src:gzip:ftgzip.c \xB6
-				  :src:lzw:ftlzw2.c \xB6
+				  :src:lzw:ftlzw.c \xB6
 				  :src:otvalid:otvalid.c \xB6
 				  :src:pcf:pcf.c \xB6
 				  :src:pfr:pfr.c \xB6
@ -100,7 +100,7 @@ ObjFiles-68K    =  \xB6
 				  "{ObjDir}type1cid.c.o" \xB6
 				  "{ObjDir}gxvalid.c.o" \xB6
 				  "{ObjDir}ftgzip.c.o" \xB6
-				  "{ObjDir}ftlzw2.c.o" \xB6
+				  "{ObjDir}ftlzw.c.o" \xB6
 				  "{ObjDir}otvalid.c.o" \xB6
 				  "{ObjDir}pcf.c.o" \xB6
 				  "{ObjDir}pfr.c.o" \xB6
@ -171,7 +171,7 @@ FreeType.m68k_cfm.o  \xC4\xC4  {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5
 "{ObjDir}type1cid.c.o" \xC4 :src:cid:type1cid.c
 "{ObjDir}gxvalid.c.o" \xC4 :src:gxvalid:gxvalid.c
 "{ObjDir}ftgzip.c.o" \xC4 :src:gzip:ftgzip.c
-"{ObjDir}ftlzw2.c.o" \xC4 :src:lzw:ftlzw2.c
+"{ObjDir}ftlzw.c.o" \xC4 :src:lzw:ftlzw.c
 "{ObjDir}otvalid.c.o" \xC4 :src:otvalid:otvalid.c
 "{ObjDir}pcf.c.o" \xC4 :src:pcf:pcf.c
 "{ObjDir}pfr.c.o" \xC4 :src:pfr:pfr.c
--- a/builds/mac/FreeType.m68k_far.make.txt
+++ b/builds/mac/FreeType.m68k_far.make.txt
@ -55,7 +55,7 @@ SrcFiles        =  \xB6
 				  :src:cid:type1cid.c \xB6
 				  :src:gxvalid:gxvalid.c \xB6
 				  :src:gzip:ftgzip.c \xB6
-				  :src:lzw:ftlzw2.c \xB6
+				  :src:lzw:ftlzw.c \xB6
 				  :src:otvalid:otvalid.c \xB6
 				  :src:pcf:pcf.c \xB6
 				  :src:pfr:pfr.c \xB6
@ -99,7 +99,7 @@ ObjFiles-68K    =  \xB6
 				  "{ObjDir}type1cid.c.o" \xB6
 				  "{ObjDir}gxvalid.c.o" \xB6
 				  "{ObjDir}ftgzip.c.o" \xB6
-				  "{ObjDir}ftlzw2.c.o" \xB6
+				  "{ObjDir}ftlzw.c.o" \xB6
 				  "{ObjDir}otvalid.c.o" \xB6
 				  "{ObjDir}pcf.c.o" \xB6
 				  "{ObjDir}pfr.c.o" \xB6
@ -170,7 +170,7 @@ FreeType.m68k_far.o  \xC4\xC4  {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5
 "{ObjDir}type1cid.c.o" \xC4 :src:cid:type1cid.c
 "{ObjDir}gxvalid.c.o" \xC4 :src:gxvalid:gxvalid.c
 "{ObjDir}ftgzip.c.o" \xC4 :src:gzip:ftgzip.c
-"{ObjDir}ftlzw2.c.o" \xC4 :src:lzw:ftlzw2.c
+"{ObjDir}ftlzw.c.o" \xC4 :src:lzw:ftlzw.c
 "{ObjDir}otvalid.c.o" \xC4 :src:otvalid:otvalid.c
 "{ObjDir}pcf.c.o" \xC4 :src:pcf:pcf.c
 "{ObjDir}pfr.c.o" \xC4 :src:pfr:pfr.c
--- a/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/builds/mac/FreeType.ppc_carbon.make.txt
@ -56,7 +56,7 @@ SrcFiles        =  \xB6
 				  :src:cid:type1cid.c \xB6
 				  :src:gxvalid:gxvalid.c \xB6
 				  :src:gzip:ftgzip.c \xB6
-				  :src:lzw:ftlzw2.c \xB6
+				  :src:lzw:ftlzw.c \xB6
 				  :src:otvalid:otvalid.c \xB6
 				  :src:pcf:pcf.c \xB6
 				  :src:pfr:pfr.c \xB6
@ -100,7 +100,7 @@ ObjFiles-PPC    =  \xB6
 				  "{ObjDir}type1cid.c.x" \xB6
 				  "{ObjDir}gxvalid.c.x" \xB6
 				  "{ObjDir}ftgzip.c.x" \xB6
-				  "{ObjDir}ftlzw2.c.x" \xB6
+				  "{ObjDir}ftlzw.c.x" \xB6
 				  "{ObjDir}otvalid.c.x" \xB6
 				  "{ObjDir}pcf.c.x" \xB6
 				  "{ObjDir}pfr.c.x" \xB6
@ -171,7 +171,7 @@ FreeType.ppc_carbon.o  \xC4\xC4  {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\x
 "{ObjDir}type1cid.c.x" \xC4 :src:cid:type1cid.c
 "{ObjDir}gxvalid.c.x" \xC4 :src:gxvalid:gxvalid.c
 "{ObjDir}ftgzip.c.x" \xC4 :src:gzip:ftgzip.c
-"{ObjDir}ftlzw2.c.x" \xC4 :src:lzw:ftlzw2.c
+"{ObjDir}ftlzw.c.x" \xC4 :src:lzw:ftlzw.c
 "{ObjDir}otvalid.c.x" \xC4 :src:otvalid:otvalid.c
 "{ObjDir}pcf.c.x" \xC4 :src:pcf:pcf.c
 "{ObjDir}pfr.c.x" \xC4 :src:pfr:pfr.c
--- a/builds/mac/FreeType.ppc_classic.make.txt
+++ b/builds/mac/FreeType.ppc_classic.make.txt
@ -56,7 +56,7 @@ SrcFiles        =  \xB6
 				  :src:cid:type1cid.c \xB6
 				  :src:gxvalid:gxvalid.c \xB6
 				  :src:gzip:ftgzip.c \xB6
-				  :src:lzw:ftlzw2.c \xB6
+				  :src:lzw:ftlzw.c \xB6
 				  :src:otvalid:otvalid.c \xB6
 				  :src:pcf:pcf.c \xB6
 				  :src:pfr:pfr.c \xB6
@ -100,7 +100,7 @@ ObjFiles-PPC    =  \xB6
 				  "{ObjDir}type1cid.c.x" \xB6
 				  "{ObjDir}gxvalid.c.x" \xB6
 				  "{ObjDir}ftgzip.c.x" \xB6
-				  "{ObjDir}ftlzw2.c.x" \xB6
+				  "{ObjDir}ftlzw.c.x" \xB6
 				  "{ObjDir}otvalid.c.x" \xB6
 				  "{ObjDir}pcf.c.x" \xB6
 				  "{ObjDir}pfr.c.x" \xB6
@ -171,7 +171,7 @@ FreeType.ppc_classic.o  \xC4\xC4  {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\
 "{ObjDir}type1cid.c.x" \xC4 :src:cid:type1cid.c
 "{ObjDir}gxvalid.c.x" \xC4 :src:gxvalid:gxvalid.c
 "{ObjDir}ftgzip.c.x" \xC4 :src:gzip:ftgzip.c
-"{ObjDir}ftlzw2.c.x" \xC4 :src:lzw:ftlzw2.c
+"{ObjDir}ftlzw.c.x" \xC4 :src:lzw:ftlzw.c
 "{ObjDir}otvalid.c.x" \xC4 :src:otvalid:otvalid.c
 "{ObjDir}pcf.c.x" \xC4 :src:pcf:pcf.c
 "{ObjDir}pfr.c.x" \xC4 :src:pfr:pfr.c
--- a/src/lzw/Jamfile
+++ b/src/lzw/Jamfile
@ -1,6 +1,6 @@
 # FreeType 2 src/lzw Jamfile
 #
-# Copyright 2004 by
+# Copyright 2004, 2006 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -11,7 +11,6 @@

 SubDir  FT2_TOP $(FT2_SRC_DIR) lzw ;

-Library  $(FT2_LIB) : ftlzw2.c ;
+Library  $(FT2_LIB) : ftlzw.c ;

 # end of src/lzw Jamfile
-
--- a/src/lzw/ftlzw2.c
+++ b/src/lzw/ftlzw2.c
@ -1,8 +1,8 @@
 /***************************************************************************/
 /*                                                                         */
-/*  ftlzw2.c                                                               */
+/*  ftlzw.c                                                                */
 /*                                                                         */
-/*    FreeType support for .Z compressed files (reimplementation).         */
+/*    FreeType support for .Z compressed files.                            */
 /*                                                                         */
 /*  This optional component relies on NetBSD's zopen().  It should mainly  */
 /*  be used to parse compressed PCF fonts, as found with many X11 server   */
--- a/src/lzw/rules.mk
+++ b/src/lzw/rules.mk
@ -3,7 +3,7 @@
 #


-# Copyright 2004, 2005 by
+# Copyright 2004, 2005, 2006 by
 # Albert Chin-A-Young.
 #
 # Based on src/lzw/rules.mk, Copyright 2002 by
@ -28,7 +28,7 @@ LZW_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(LZW_DIR))

 # LZW support sources (i.e., C files)
 #
-LZW_DRV_SRC := $(LZW_DIR)/ftlzw2.c
+LZW_DRV_SRC := $(LZW_DIR)/ftlzw.c

 # LZW support headers
 #
@ -41,12 +41,12 @@ LZW_DRV_H := $(LZW_DIR)/ftzopen.h \
 #   LZW_DRV_OBJ_M is used during `multi' builds
 #   LZW_DRV_OBJ_S is used during `single' builds
 #
-LZW_DRV_OBJ_M := $(OBJ_DIR)/ftlzw2.$O
-LZW_DRV_OBJ_S := $(OBJ_DIR)/ftlzw2.$O
+LZW_DRV_OBJ_M := $(OBJ_DIR)/ftlzw.$O
+LZW_DRV_OBJ_S := $(OBJ_DIR)/ftlzw.$O

 # LZW support source file for single build
 #
-LZW_DRV_SRC_S := $(LZW_DIR)/ftlzw2.c
+LZW_DRV_SRC_S := $(LZW_DIR)/ftlzw.c


 # LZW support - single object