diff --git a/ChangeLog b/ChangeLog
index 05ee1cbc..162b274f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2013-06-19 Werner Lemberg 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.4.12 sources:
- freetype2412.lib - release build; single threaded - freetype2412_D.lib - debug build; single threaded - freetype2412MT.lib - release build; multi-threaded - freetype2412MT_D.lib - debug build; multi-threaded+ freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/win32/vc2008/freetype.vcproj
index a4c7d855..bd76a296 100644
--- a/builds/win32/vc2008/freetype.vcproj
+++ b/builds/win32/vc2008/freetype.vcproj
@@ -70,7 +70,7 @@
/>
- freetype2412.lib - release build; single threaded - freetype2412_D.lib - debug build; single threaded - freetype2412MT.lib - release build; multi-threaded - freetype2412MT_D.lib - debug build; multi-threaded+ freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/win32/vc2010/freetype.vcxproj b/builds/win32/vc2010/freetype.vcxproj
index 30c8a249..5c85da93 100644
--- a/builds/win32/vc2010/freetype.vcxproj
+++ b/builds/win32/vc2010/freetype.vcxproj
@@ -95,12 +95,12 @@
This directory contains a project file for Visual C++, named
freetype.vcxproj, and Visual Studio, called freetype.sln. It
-compiles the following libraries from the FreeType 2.4.12 sources:
- freetype2412.lib - release build; single threaded - freetype2412_D.lib - debug build; single threaded - freetype2412MT.lib - release build; multi-threaded - freetype2412MT_D.lib - debug build; multi-threaded+ freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp
index cd1ca72b..516e47f3 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\freetype2412.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250.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\freetype2412_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250_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\freetype2412_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype250_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT_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\freetype2412.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype250.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT.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\freetype2412.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype2412ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype250ST.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\freetype2412_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250ST_D.lib"
!ENDIF
diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index d150f0c2..dc5e67ad 100644
--- a/builds/win32/visualc/freetype.vcproj
+++ b/builds/win32/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
/>
- freetype2412.lib - release build; single threaded - freetype2412_D.lib - debug build; single threaded - freetype2412MT.lib - release build; multi-threaded - freetype2412MT_D.lib - debug build; multi-threaded+ freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/win32/visualce/freetype.dsp b/builds/win32/visualce/freetype.dsp
index cd1ca72b..516e47f3 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\freetype2412.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250.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\freetype2412_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250_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\freetype2412_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype250_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT_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\freetype2412.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype250.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT.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\freetype2412.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype2412ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype250ST.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\freetype2412_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250ST_D.lib"
!ENDIF
diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj
index 95c9afb7..88f51679 100644
--- a/builds/win32/visualce/freetype.vcproj
+++ b/builds/win32/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
/>
- freetype2412.lib - release build; single threaded - freetype2412_D.lib - debug build; single threaded - freetype2412MT.lib - release build; multi-threaded - freetype2412MT_D.lib - debug build; multi-threaded+ freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_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/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj
index 4521b82b..f7e022e7 100644
--- a/builds/wince/vc2005-ce/freetype.vcproj
+++ b/builds/wince/vc2005-ce/freetype.vcproj
@@ -21,7 +21,7 @@
- freetype2412.lib - release build; single threaded - freetype2412_D.lib - debug build; single threaded - freetype2412MT.lib - release build; multi-threaded - freetype2412MT_D.lib - debug build; multi-threaded+ freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_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 54981a01..7920751a 100644
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj
@@ -88,7 +88,7 @@
/>
- freetype2412.lib - release build; single threaded - freetype2412_D.lib - debug build; single threaded - freetype2412MT.lib - release build; multi-threaded - freetype2412MT_D.lib - debug build; multi-threaded+ freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index e119d424..2d1cc9ac 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.0 16.2.10 6.10.2 2.4.12 16.1.10 6.10.1 2.4.11 16.0.10 6.10.0 2.4.10 15.0.9 6.9.0 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 28aef976..fe46d229 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -3900,8 +3900,8 @@ FT_BEGIN_HEADER * */ #define FREETYPE_MAJOR 2 -#define FREETYPE_MINOR 4 -#define FREETYPE_PATCH 12 +#define FREETYPE_MINOR 5 +#define FREETYPE_PATCH 0 /*************************************************************************/ diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index e9a2981b..157bf456 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -2024,8 +2024,8 @@ FT_Face *aface ) { FT_Error error; - FT_Driver driver; - FT_Memory memory; + FT_Driver driver = NULL; + FT_Memory memory = NULL; FT_Stream stream = NULL; FT_Face face = NULL; FT_ListNode node = NULL; diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 798d4a9b..e7ffb987 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -6173,7 +6173,7 @@ FT_F26Dot6 distance; #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING - FT_F26Dot6 control_value_cutin; + FT_F26Dot6 control_value_cutin = 0; /* pacify compiler */ if ( SUBPIXEL_HINTING ) @@ -6542,8 +6542,8 @@ control_value_cutin, minimum_distance; #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING - FT_Int B1; - FT_Int B2; + FT_Int B1 = 0; /* pacify compiler */ + FT_Int B2 = 0; FT_Bool reverse_move = FALSE; #endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */