From fa791414601df61d20d860299dba80fdb62565df Mon Sep 17 00:00:00 2001
From: marha
Date: Fri, 21 Jun 2013 10:45:51 +0200
Subject: Upgraded freetype to 2.5.0.1
---
freetype/builds/wince/ftdebug.c | 29 ++++++++--
freetype/builds/wince/vc2005-ce/freetype.vcproj | 76 ++++++++++++-------------
freetype/builds/wince/vc2005-ce/index.html | 10 ++--
freetype/builds/wince/vc2008-ce/freetype.vcproj | 76 ++++++++++++-------------
freetype/builds/wince/vc2008-ce/index.html | 10 ++--
5 files changed, 110 insertions(+), 91 deletions(-)
(limited to 'freetype/builds/wince')
diff --git a/freetype/builds/wince/ftdebug.c b/freetype/builds/wince/ftdebug.c
index 272415d3d..354f4f0a7 100644
--- a/freetype/builds/wince/ftdebug.c
+++ b/freetype/builds/wince/ftdebug.c
@@ -4,7 +4,7 @@
/* */
/* Debugging and logging component for WinCE (body). */
/* */
-/* Copyright 1996-2001, 2002, 2005, 2008, 2009 by */
+/* Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -71,7 +71,8 @@
FT_BASE_DEF( void )
- FT_Message( const char* fmt, ... )
+ FT_Message( const char* fmt,
+ ... )
{
static char buf[8192];
va_list ap;
@@ -87,7 +88,8 @@
FT_BASE_DEF( void )
- FT_Panic( const char* fmt, ... )
+ FT_Panic( const char* fmt,
+ ... )
{
static char buf[8192];
va_list ap;
@@ -102,6 +104,20 @@
}
+ /* documentation is in ftdebug.h */
+
+ FT_BASE_DEF( int )
+ FT_Throw( FT_Error error,
+ int line,
+ const char* file )
+ {
+ FT_UNUSED( error );
+ FT_UNUSED( line );
+ FT_UNUSED( file );
+
+ return 0;
+ }
+
#ifdef FT_DEBUG_LEVEL_TRACE
@@ -168,9 +184,12 @@
while ( *p && *p != ':' )
p++;
+ if ( !*p )
+ break;
+
if ( *p == ':' && p > q )
{
- int n, i, len = p - q;
+ int n, i, len = (int)( p - q );
int level = -1, found = -1;
@@ -196,7 +215,7 @@
p++;
if ( *p )
{
- level = *p++ - '0';
+ level = *p - '0';
if ( level < 0 || level > 7 )
level = -1;
}
diff --git a/freetype/builds/wince/vc2005-ce/freetype.vcproj b/freetype/builds/wince/vc2005-ce/freetype.vcproj
index 381cf9199..f7e022e77 100644
--- a/freetype/builds/wince/vc2005-ce/freetype.vcproj
+++ b/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 @@
-
+
diff --git a/freetype/builds/wince/vc2005-ce/index.html b/freetype/builds/wince/vc2005-ce/index.html
index ff1e345f8..db5385356 100644
--- a/freetype/builds/wince/vc2005-ce/index.html
+++ b/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.4.11 sources:
+It compiles the following libraries from the FreeType 2.5.0 sources:
- freetype2411.lib - release build; single threaded
- freetype2411_D.lib - debug build; single threaded
- freetype2411MT.lib - release build; multi-threaded
- freetype2411MT_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/freetype/builds/wince/vc2008-ce/freetype.vcproj b/freetype/builds/wince/vc2008-ce/freetype.vcproj
index 536e4457d..7920751a3 100644
--- a/freetype/builds/wince/vc2008-ce/freetype.vcproj
+++ b/freetype/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.4.11 sources:
+It compiles the following libraries from the FreeType 2.5.0 sources:
- freetype2411.lib - release build; single threaded
- freetype2411_D.lib - debug build; single threaded
- freetype2411MT.lib - release build; multi-threaded
- freetype2411MT_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
--
cgit v1.2.3