diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-03-26 08:57:05 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-01 12:03:55 +0200 |
commit | 6845a4fb0147117e8517d66f18792ca7acdbe06e (patch) | |
tree | 68e35417b79989a7af8a4ea8c0d282b84dbe0a6e /src/3rdparty/freetype/builds/wince/ftdebug.c | |
parent | 0fcadcca3d0842354de07ffaa8c622e607aab22c (diff) | |
download | qtbase-6845a4fb0147117e8517d66f18792ca7acdbe06e.tar.gz |
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 <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/freetype/builds/wince/ftdebug.c')
-rw-r--r-- | src/3rdparty/freetype/builds/wince/ftdebug.c | 20 |
1 files changed, 4 insertions, 16 deletions
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 <windows.h> -#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 ) { |