diff --git a/ChangeLog b/ChangeLog index 4283a2cc1..4b3707c1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2010-07-12 Werner Lemberg + + * Version 2.4.0 released. + ========================= + + + Tag sources with `VER-2-4-0'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.0. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.3.12/2.4.0/, s/2312/240/. + + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 4. + (FREETYPE_PATCH): Set to 0. + + * builds/unix/configure.raw (version_info): Set to 11:0:5. + 2010-07-12 Werner Lemberg Remove C++ warnings. diff --git a/Jamfile b/Jamfile index d8c1bbada..21294927b 100644 --- a/Jamfile +++ b/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 top Jamfile. # -# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by +# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -194,7 +194,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.12 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.0 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/README b/README index 282791ef0..671296e57 100644 --- a/README +++ b/README @@ -9,8 +9,8 @@ is called `libttf'. They are *not* compatible! - FreeType 2.3.12 - =============== + FreeType 2.4.0 + ============== Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION. @@ -26,9 +26,9 @@ and download one of the following files. - freetype-doc-2.3.12.tar.bz2 - freetype-doc-2.3.12.tar.gz - ftdoc2312.zip + freetype-doc-2.4.0.tar.bz2 + freetype-doc-2.4.0.tar.gz + ftdoc240.zip Bugs diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index ff16dfe33..3c1d5a203 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='10:0:4' +version_info='11:0:5' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/win32/vc2005/freetype.vcproj b/builds/win32/vc2005/freetype.vcproj index 229ac732f..20694b3f3 100644 --- a/builds/win32/vc2005/freetype.vcproj +++ b/builds/win32/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/builds/win32/vc2005/index.html b/builds/win32/vc2005/index.html index 777388228..5cdc1844d 100644 --- a/builds/win32/vc2005/index.html +++ b/builds/win32/vc2005/index.html @@ -11,7 +11,7 @@

This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.3.12 sources:

+compiles the following libraries from the FreeType 2.4.0 sources:

    diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/win32/vc2008/freetype.vcproj
index 742ff75bd..414c07f01 100644
--- a/builds/win32/vc2008/freetype.vcproj
+++ b/builds/win32/vc2008/freetype.vcproj
@@ -70,7 +70,7 @@
 			/>
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			This directory contains project files for Visual C++, named
 freetype.vcproj, and Visual Studio, called freetype.sln.  It
-compiles the following libraries from the FreeType 2.3.12 sources:
    
+compiles the following libraries from the FreeType 2.4.0 sources:
    
 
 
      
   
      diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp
index 31046c752..362d2dbef 100644
--- a/builds/win32/visualc/freetype.dsp
+++ b/builds/win32/visualc/freetype.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype2312_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype240_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype2312.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype240.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype2312ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype240.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype240ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype240_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240ST_D.lib"
 
 !ENDIF 
 
diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index 214c81e82..14077c031 100644
--- a/builds/win32/visualc/freetype.vcproj
+++ b/builds/win32/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
 			/>
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			This directory contains project files for Visual C++, named
 freetype.dsp, and Visual Studio, called freetype.sln.  It
-compiles the following libraries from the FreeType 2.3.12 sources:
      
+compiles the following libraries from the FreeType 2.4.0 sources:
      
 
 
        
   
        diff --git a/builds/win32/visualce/freetype.dsp b/builds/win32/visualce/freetype.dsp
index 31046c752..362d2dbef 100644
--- a/builds/win32/visualce/freetype.dsp
+++ b/builds/win32/visualce/freetype.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype2312_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype240_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype2312.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype240.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype2312ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype240.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype240ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype240_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype240ST_D.lib"
 
 !ENDIF 
 
diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj
index 68970f2d4..be55ef970 100644
--- a/builds/win32/visualce/freetype.vcproj
+++ b/builds/win32/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
 			/>
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			PPC/SP WM6 (Windows Mobile 6)
 
      
 
-It compiles the following libraries from the FreeType 2.3.12 sources:
      
+It compiles the following libraries from the FreeType 2.4.0 sources:
      
 
 
        
   
        diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj
index 083056328..e289e6ca1 100644
--- a/builds/wince/vc2005-ce/freetype.vcproj
+++ b/builds/wince/vc2005-ce/freetype.vcproj
@@ -21,7 +21,7 @@
       
       
       
-      
+      
       
       
       
@@ -41,7 +41,7 @@
       
       
       
-      
+      
       
       
       
@@ -61,7 +61,7 @@
       
       
       
-      
+      
       
       
       
@@ -81,7 +81,7 @@
       
       
       
-      
+      
       
       
       
@@ -101,7 +101,7 @@
       
       
       
-      
+      
       
       
       
@@ -121,7 +121,7 @@
       
       
       
-      
+      
       
       
       
@@ -141,7 +141,7 @@
       
       
       
-      
+      
       
       
       
@@ -161,7 +161,7 @@
       
       
       
-      
+      
       
       
       
@@ -181,7 +181,7 @@
       
       
       
-      
+      
       
       
       
@@ -201,7 +201,7 @@
       
       
       
-      
+      
       
       
       
@@ -221,7 +221,7 @@
       
       
       
-      
+      
       
       
       
@@ -241,7 +241,7 @@
       
       
       
-      
+      
       
       
       
@@ -261,7 +261,7 @@
       
       
       
-      
+      
       
       
       
@@ -281,7 +281,7 @@
       
       
       
-      
+      
       
       
       
@@ -301,7 +301,7 @@
       
       
       
-      
+      
       
       
       
@@ -321,7 +321,7 @@
       
       
       
-      
+      
       
       
       
@@ -341,7 +341,7 @@
       
       
       
-      
+      
       
       
       
@@ -361,7 +361,7 @@
       
       
       
-      
+      
       
       
       
@@ -381,7 +381,7 @@
       
       
       
-      
+      
       
       
       
@@ -401,7 +401,7 @@
       
       
       
-      
+      
       
       
       
@@ -421,7 +421,7 @@
       
       
       
-      
+      
       
       
       
@@ -441,7 +441,7 @@
       
       
       
-      
+      
       
       
       
@@ -461,7 +461,7 @@
       
       
       
-      
+      
       
       
       
@@ -481,7 +481,7 @@
       
       
       
-      
+      
       
       
       
@@ -501,7 +501,7 @@
       
       
       
-      
+      
       
       
       
@@ -521,7 +521,7 @@
       
       
       
-      
+      
       
       
       
@@ -541,7 +541,7 @@
       
       
       
-      
+      
       
       
       
@@ -561,7 +561,7 @@
       
       
       
-      
+      
       
       
       
@@ -581,7 +581,7 @@
       
       
       
-      
+      
       
       
       
@@ -601,7 +601,7 @@
       
       
       
-      
+      
       
       
       
@@ -621,7 +621,7 @@
       
       
       
-      
+      
       
       
       
@@ -641,7 +641,7 @@
       
       
       
-      
+      
       
       
       
@@ -661,7 +661,7 @@
       
       
       
-      
+      
       
       
       
@@ -681,7 +681,7 @@
       
       
       
-      
+      
       
       
       
@@ -701,7 +701,7 @@
       
       
       
-      
+      
       
       
       
@@ -721,7 +721,7 @@
       
       
       
-      
+      
       
       
       
@@ -741,7 +741,7 @@
       
       
       
-      
+      
       
       
       
@@ -758,7 +758,7 @@
       
       
       
-      
+      
       
       
       
diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html
index 5d0e2b7d3..00874f127 100644
--- a/builds/wince/vc2005-ce/index.html
+++ b/builds/wince/vc2005-ce/index.html
@@ -21,7 +21,7 @@ the following targets:
   
      • PPC/SP WM6 (Windows Mobile 6)
        • 
 
      
 
-It compiles the following libraries from the FreeType 2.3.12 sources:
      
+It compiles the following libraries from the FreeType 2.4.0 sources:
      
 
 
        
   
        diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj
index 8568d6649..5857c1059 100644
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj
@@ -88,7 +88,7 @@
 			/>
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			PPC/SP WM6 (Windows Mobile 6)
 
      
 
-It compiles the following libraries from the FreeType 2.3.12 sources:
      
+It compiles the following libraries from the FreeType 2.4.0 sources:
      
 
 
        
   
        diff --git a/docs/CHANGES b/docs/CHANGES
index 593a443de..6e42c9c1e 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -2,18 +2,22 @@ CHANGES BETWEEN 2.3.12 and 2.4.0
 
   I. IMPORTANT CHANGES
 
-    - Since May 2010, all patents regarding the TrueType bytecode
+    - Since May  2010, all  patents  regarding  the TrueType  bytecode
       interpreter have expired worldwide.  Consequently, we now define
-      TT_CONFIG_OPTION_BYTECODE_INTERPRETER by default (and undefine
+      TT_CONFIG_OPTION_BYTECODE_INTERPRETER by  default (and  undefine
       TT_CONFIG_OPTION_UNPATENTED_HINTING).
 
     - A new function `FT_Library_SetLcdFilterWeights' is available  to
       adjust the filter weights set by `FT_Library_SetLcdFilter'.
 
+
   II. MISCELLANEOUS
 
     - Thanks to many reports from Robert Święcki, FreeType's stability
-      in handling broken or damaged fonts could be much improved.
+      in handling broken or damaged fonts is much improved.
+
+    - Support  for LCD  filter  control has  been  added to  the  demo
+      programs `ftdiff' and `ftview'.
 
 
 ======================================================================
diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL
index bb55c3dda..b800af9e2 100644
--- a/docs/VERSION.DLL
+++ b/docs/VERSION.DLL
@@ -53,6 +53,7 @@ systems, but not all of them:
 
     release    libtool      so
   -------------------------------
+     2.4.0      11.0.5    6.5.0
      2.3.12     10.0.4    6.4.0
      2.3.11     9.22.3    6.3.22
      2.3.10     9.21.3    6.3.21
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index ab0deb13b..3aedfa18a 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -3773,8 +3773,8 @@ FT_BEGIN_HEADER
    *
    */
 #define FREETYPE_MAJOR  2
-#define FREETYPE_MINOR  3
-#define FREETYPE_PATCH  12
+#define FREETYPE_MINOR  4
+#define FREETYPE_PATCH  0
 
 
   /*************************************************************************/