From 232bd948fd37821d35e728ec20aeea971fb9616c Mon Sep 17 00:00:00 2001
From: Werner Lemberg
- freetype254.lib - release build; single threaded - freetype254_D.lib - debug build; single threaded - freetype254MT.lib - release build; multi-threaded - freetype254MT_D.lib - debug build; multi-threaded+ freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj
index d0d21a0bf..e36ccb059 100644
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj
@@ -88,7 +88,7 @@
/>
- freetype254.lib - release build; single threaded - freetype254_D.lib - debug build; single threaded - freetype254MT.lib - release build; multi-threaded - freetype254MT_D.lib - debug build; multi-threaded+ freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj
index 7f165db33..5880b7d27 100644
--- a/builds/windows/vc2005/freetype.vcproj
+++ b/builds/windows/vc2005/freetype.vcproj
@@ -16,7 +16,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.5.4 sources:
+compiles the following libraries from the FreeType 2.5.5 sources:- freetype254.lib - release build; single threaded - freetype254_D.lib - debug build; single threaded - freetype254MT.lib - release build; multi-threaded - freetype254MT_D.lib - debug build; multi-threaded+ freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj
index 49c4b04cf..95d722b97 100644
--- a/builds/windows/vc2008/freetype.vcproj
+++ b/builds/windows/vc2008/freetype.vcproj
@@ -70,7 +70,7 @@
/>
- freetype254.lib - release build; single threaded - freetype254_D.lib - debug build; single threaded - freetype254MT.lib - release build; multi-threaded - freetype254MT_D.lib - debug build; multi-threaded+ freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index 5a9ce424d..7cafe4539 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -191,18 +191,18 @@
This directory contains a project file for Visual C++ (VS.NET 2010
or newer), named freetype.vcxproj, and Visual Studio, called
freetype.sln. It compiles the following libraries from the
-FreeType 2.5.4 sources:
-freetype254.lib - release build -freetype254d.lib - debug build -freetype254ST.lib - release build; single threaded -freetype254STd.lib - debug build; single threaded -freetype254MT.lib - release build; multi-threaded -freetype254MTd.lib - debug build; multi-threaded+freetype255.lib - release build +freetype255d.lib - debug build +freetype255ST.lib - release build; single threaded +freetype255STd.lib - debug build; single threaded +freetype255MT.lib - release build; multi-threaded +freetype255MTd.lib - debug build; multi-threaded
Both Win32 and x64 builds are supported.
diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index 4fcff238e..cf76f7c2d 100644 --- a/builds/windows/visualc/freetype.dsp +++ b/builds/windows/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\freetype254.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255.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\freetype254_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255_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\freetype254_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype255_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT_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\freetype254.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype255.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT.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\freetype254.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype254ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype255ST.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\freetype254_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index 5754f2169..a71a0e978 100644 --- a/builds/windows/visualc/freetype.vcproj +++ b/builds/windows/visualc/freetype.vcproj @@ -69,7 +69,7 @@ />- freetype254.lib - release build; single threaded - freetype254_D.lib - debug build; single threaded - freetype254MT.lib - release build; multi-threaded - freetype254MT_D.lib - debug build; multi-threaded+ freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp
index 4fcff238e..cf76f7c2d 100644
--- a/builds/windows/visualce/freetype.dsp
+++ b/builds/windows/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\freetype254.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255.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\freetype254_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255_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\freetype254_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype255_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT_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\freetype254.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype255.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT.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\freetype254.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype254ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype255ST.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\freetype254_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255ST_D.lib"
!ENDIF
diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj
index b2ec353b4..e4cddfb0d 100644
--- a/builds/windows/visualce/freetype.vcproj
+++ b/builds/windows/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
/>
- freetype254.lib - release build; single threaded - freetype254_D.lib - debug build; single threaded - freetype254MT.lib - release build; multi-threaded - freetype254MT_D.lib - debug build; multi-threaded+ freetype255.lib - release build; single threaded + freetype255_D.lib - debug build; single threaded + freetype255MT.lib - release build; multi-threaded + freetype255MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/CHANGES b/docs/CHANGES index 94420f095..bbc31104a 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,4 +1,14 @@ +CHANGES BETWEEN 2.5.4 and 2.5.5 + + I. IMPORTANT BUG FIXES + + - Handling of uncompressed PCF files works again (bug introduced + in version 2.5.4). + + +====================================================================== + CHANGES BETWEEN 2.5.3 and 2.5.4 I. IMPORTANT BUG FIXES diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 5564acf85..dd4926195 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -52,6 +52,7 @@ on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.5.5 17.4.11 6.11.4 2.5.4 17.3.11 6.11.3 2.5.3 17.2.11 6.11.2 2.5.2 17.1.11 6.11.1 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index 61aa722e3..7b4a118f3 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "December 2014" "FreeType 2.5.4" +.TH FREETYPE-CONFIG 1 "December 2014" "FreeType 2.5.5" . . .SH NAME diff --git a/include/freetype.h b/include/freetype.h index efbd13ad8..27fd44bfc 100644 --- a/include/freetype.h +++ b/include/freetype.h @@ -3937,7 +3937,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 5 -#define FREETYPE_PATCH 4 +#define FREETYPE_PATCH 5 /*************************************************************************/