From 6845a4fb0147117e8517d66f18792ca7acdbe06e Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Tue, 26 Mar 2013 08:57:05 +0200 Subject: Update bundled FreeType sources to 2.3.12 Most important changes: * SFNT cmap 13 table format support; * fixed glitches when rasterizing stretched TTF (xsize!=ysize); * various fixes in Type1, CFF, and PCF drivers Change-Id: Ib9e2210ffbd0daa2fdbf518ea87f4be502de6b48 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/3rdparty/freetype/builds/wince/ftdebug.c | 20 +--- .../builds/wince/vc2005-ce/freetype.vcproj | 90 ++++++++++-------- .../freetype/builds/wince/vc2005-ce/index.html | 10 +- .../builds/wince/vc2008-ce/freetype.vcproj | 104 +++++++++++++-------- .../freetype/builds/wince/vc2008-ce/index.html | 10 +- 5 files changed, 132 insertions(+), 102 deletions(-) (limited to 'src/3rdparty/freetype/builds/wince') diff --git a/src/3rdparty/freetype/builds/wince/ftdebug.c b/src/3rdparty/freetype/builds/wince/ftdebug.c index 8f7a9ab07d..272415d3d0 100644 --- a/src/3rdparty/freetype/builds/wince/ftdebug.c +++ b/src/3rdparty/freetype/builds/wince/ftdebug.c @@ -2,9 +2,9 @@ /* */ /* ftdebug.c */ /* */ -/* Debugging and logging component for Win32 (body). */ +/* Debugging and logging component for WinCE (body). */ /* */ -/* Copyright 1996-2001, 2002, 2005, 2008 by */ +/* Copyright 1996-2001, 2002, 2005, 2008, 2009 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -55,8 +55,6 @@ #include -#ifdef _WIN32_WCE - void OutputDebugStringEx( const char* str ) { @@ -71,12 +69,6 @@ OutputDebugStringW( buf ); } -#else - -#define OutputDebugStringEx OutputDebugStringA - -#endif - FT_BASE_DEF( void ) FT_Message( const char* fmt, ... ) @@ -149,19 +141,15 @@ FT_BASE_DEF( void ) ft_debug_init( void ) { -#ifdef _WIN32_WCE - /* Windows Mobile doesn't have environment API: */ /* GetEnvironmentStrings, GetEnvironmentVariable, getenv. */ /* */ /* FIXME!!! How to set debug mode? */ - const char* ft2_debug = 0; -#else + /* const char* ft2_debug = getenv( "FT2_DEBUG" ); */ - const char* ft2_debug = getenv( "FT2_DEBUG" ); + const char* ft2_debug = 0; -#endif if ( ft2_debug ) { diff --git a/src/3rdparty/freetype/builds/wince/vc2005-ce/freetype.vcproj b/src/3rdparty/freetype/builds/wince/vc2005-ce/freetype.vcproj index fcb9a8d626..14d00e7ccf 100644 --- a/src/3rdparty/freetype/builds/wince/vc2005-ce/freetype.vcproj +++ b/src/3rdparty/freetype/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 @@ - + @@ -2131,6 +2131,14 @@ + + + + + + + + @@ -2259,6 +2267,10 @@ + + + + @@ -2267,6 +2279,8 @@ + + diff --git a/src/3rdparty/freetype/builds/wince/vc2005-ce/index.html b/src/3rdparty/freetype/builds/wince/vc2005-ce/index.html index 780ce41a4a..5d0e2b7d30 100644 --- a/src/3rdparty/freetype/builds/wince/vc2005-ce/index.html +++ b/src/3rdparty/freetype/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets:
  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.3.9 sources:

    +It compiles the following libraries from the FreeType 2.3.12 sources:

      -    freetype239.lib     - release build; single threaded
-    freetype239_D.lib   - debug build;   single threaded
-    freetype239MT.lib   - release build; multi-threaded
-    freetype239MT_D.lib - debug build;   multi-threaded
      + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/src/3rdparty/freetype/builds/wince/vc2008-ce/freetype.vcproj b/src/3rdparty/freetype/builds/wince/vc2008-ce/freetype.vcproj index 2233577f97..2529f7e518 100644 --- a/src/3rdparty/freetype/builds/wince/vc2008-ce/freetype.vcproj +++ b/src/3rdparty/freetype/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> + + + + + + + + @@ -8290,6 +8306,14 @@ /> + + + + @@ -8306,6 +8330,10 @@ RelativePath="..\..\..\src\base\ftwinfnt.c" > + + diff --git a/src/3rdparty/freetype/builds/wince/vc2008-ce/index.html b/src/3rdparty/freetype/builds/wince/vc2008-ce/index.html index 20e576f85c..781e05f11d 100644 --- a/src/3rdparty/freetype/builds/wince/vc2008-ce/index.html +++ b/src/3rdparty/freetype/builds/wince/vc2008-ce/index.html @@ -21,14 +21,14 @@ the following targets:

  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.3.9 sources:

    +It compiles the following libraries from the FreeType 2.3.12 sources:

      -    freetype239.lib     - release build; single threaded
-    freetype239_D.lib   - debug build;   single threaded
-    freetype239MT.lib   - release build; multi-threaded
-    freetype239MT_D.lib - debug build;   multi-threaded
      + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP -- cgit v1.2.3