Module Name: xsrc
Committed By: mrg
Date: Sat Jul 23 23:29:56 UTC 2011
Modified Files:
xsrc/external/mit/freetype/dist/builds/unix: freetype-config.in
xsrc/external/mit/freetype/dist/builds/win32/visualc: freetype.vcproj
xsrc/external/mit/freetype/dist/builds/win32/visualce: freetype.dsp
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h
xsrc/external/mit/freetype/dist/src/cff: cffload.c
xsrc/external/mit/freetype/dist/src/gzip: ftgzip.c
xsrc/external/mit/freetype/dist/src/smooth: ftsmooth.c
Removed Files:
xsrc/external/mit/freetype/dist/docs: GPL.TXT
xsrc/external/mit/freetype/dist/include/freetype/internal: pcftypes.h
Log Message:
merge freetype 2.4.5
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp \
xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj \
xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/freetype/dist/docs/GPL.TXT
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/freetype/dist/include/freetype/internal/pcftypes.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/freetype/dist/src/cff/cffload.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in
diff -u xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.2 xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.3
--- xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.2 Sun Mar 6 01:00:32 2011
+++ xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in Sat Jul 23 23:29:55 2011
@@ -144,7 +144,7 @@
if test "$enable_shared" = "yes" ; then
eval "rpath=\"$hardcode_libdir_flag_spec\""
fi
- libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
+ libs="-lfreetype @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@"
if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
echo -L${SYSROOT}$libdir $libs $rpath
else
Index: xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj
diff -u xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.4 xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.5
--- xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.4 Thu Feb 24 05:42:25 2011
+++ xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj Sat Jul 23 23:29:55 2011
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244.lib"
+ OutputFile="..\..\..\objs\freetype245.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT.lib"
+ OutputFile="..\..\..\objs\freetype245MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -219,7 +219,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST.lib"
+ OutputFile="..\..\..\objs\freetype245ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -291,7 +291,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244_D.lib"
+ OutputFile="..\..\..\objs\freetype245_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -364,7 +364,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST_D.lib"
+ OutputFile="..\..\..\objs\freetype245ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -438,7 +438,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT_D.lib"
+ OutputFile="..\..\..\objs\freetype245MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
Index: xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp
diff -u xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.4 xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.5
--- xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.4 Thu Feb 24 05:42:25 2011
+++ xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp Sat Jul 23 23:29:55 2011
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@@ -102,8 +102,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype244_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype245_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245MT_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@@ -126,8 +126,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype244.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype245.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245MT.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@@ -151,8 +151,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype244.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype244ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype245.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype245ST.lib"
# SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype244_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype245_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245ST_D.lib"
!ENDIF
Index: xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj
diff -u xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj:1.4 xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj:1.5
--- xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj:1.4 Thu Feb 24 05:42:25 2011
+++ xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj Sat Jul 23 23:29:55 2011
@@ -87,7 +87,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244.lib"
+ OutputFile="..\..\..\objs\freetype245.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -162,7 +162,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT.lib"
+ OutputFile="..\..\..\objs\freetype245MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -237,7 +237,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST.lib"
+ OutputFile="..\..\..\objs\freetype245ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -309,7 +309,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244_D.lib"
+ OutputFile="..\..\..\objs\freetype245_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -382,7 +382,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST_D.lib"
+ OutputFile="..\..\..\objs\freetype245ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -456,7 +456,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT_D.lib"
+ OutputFile="..\..\..\objs\freetype245MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -534,7 +534,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244.lib"
+ OutputFile="..\..\..\objs\freetype245.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -619,7 +619,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT.lib"
+ OutputFile="..\..\..\objs\freetype245MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -704,7 +704,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST.lib"
+ OutputFile="..\..\..\objs\freetype245ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -785,7 +785,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244_D.lib"
+ OutputFile="..\..\..\objs\freetype245_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -867,7 +867,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST_D.lib"
+ OutputFile="..\..\..\objs\freetype245ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -950,7 +950,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT_D.lib"
+ OutputFile="..\..\..\objs\freetype245MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1036,7 +1036,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244.lib"
+ OutputFile="..\..\..\objs\freetype245.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1121,7 +1121,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT.lib"
+ OutputFile="..\..\..\objs\freetype245MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1206,7 +1206,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST.lib"
+ OutputFile="..\..\..\objs\freetype245ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -1287,7 +1287,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244_D.lib"
+ OutputFile="..\..\..\objs\freetype245_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1369,7 +1369,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST_D.lib"
+ OutputFile="..\..\..\objs\freetype245ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1452,7 +1452,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT_D.lib"
+ OutputFile="..\..\..\objs\freetype245MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1538,7 +1538,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244.lib"
+ OutputFile="..\..\..\objs\freetype245.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1623,7 +1623,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT.lib"
+ OutputFile="..\..\..\objs\freetype245MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1708,7 +1708,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST.lib"
+ OutputFile="..\..\..\objs\freetype245ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -1789,7 +1789,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244_D.lib"
+ OutputFile="..\..\..\objs\freetype245_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1871,7 +1871,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST_D.lib"
+ OutputFile="..\..\..\objs\freetype245ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1954,7 +1954,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT_D.lib"
+ OutputFile="..\..\..\objs\freetype245MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2040,7 +2040,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244.lib"
+ OutputFile="..\..\..\objs\freetype245.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2125,7 +2125,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT.lib"
+ OutputFile="..\..\..\objs\freetype245MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2210,7 +2210,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST.lib"
+ OutputFile="..\..\..\objs\freetype245ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -2291,7 +2291,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244_D.lib"
+ OutputFile="..\..\..\objs\freetype245_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2373,7 +2373,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST_D.lib"
+ OutputFile="..\..\..\objs\freetype245ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2456,7 +2456,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT_D.lib"
+ OutputFile="..\..\..\objs\freetype245MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2542,7 +2542,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244.lib"
+ OutputFile="..\..\..\objs\freetype245.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2627,7 +2627,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT.lib"
+ OutputFile="..\..\..\objs\freetype245MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2712,7 +2712,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST.lib"
+ OutputFile="..\..\..\objs\freetype245ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -2793,7 +2793,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244_D.lib"
+ OutputFile="..\..\..\objs\freetype245_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2875,7 +2875,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST_D.lib"
+ OutputFile="..\..\..\objs\freetype245ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2958,7 +2958,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT_D.lib"
+ OutputFile="..\..\..\objs\freetype245MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3044,7 +3044,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244.lib"
+ OutputFile="..\..\..\objs\freetype245.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3129,7 +3129,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT.lib"
+ OutputFile="..\..\..\objs\freetype245MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3214,7 +3214,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST.lib"
+ OutputFile="..\..\..\objs\freetype245ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -3295,7 +3295,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244_D.lib"
+ OutputFile="..\..\..\objs\freetype245_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3377,7 +3377,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244ST_D.lib"
+ OutputFile="..\..\..\objs\freetype245ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3460,7 +3460,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype244MT_D.lib"
+ OutputFile="..\..\..\objs\freetype245MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
Index: xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html
diff -u xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html:1.4 xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html:1.5
--- xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html:1.4 Thu Feb 24 05:42:25 2011
+++ xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html Sat Jul 23 23:29:55 2011
@@ -21,14 +21,14 @@
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
-It compiles the following libraries from the FreeType 2.4.4 sources:</p>
+It compiles the following libraries from the FreeType 2.4.5 sources:</p>
<ul>
<pre>
- freetype244.lib - release build; single threaded
- freetype244_D.lib - debug build; single threaded
- freetype244MT.lib - release build; multi-threaded
- freetype244MT_D.lib - debug build; multi-threaded</pre>
+ freetype245.lib - release build; single threaded
+ freetype245_D.lib - debug build; single threaded
+ freetype245MT.lib - release build; multi-threaded
+ freetype245MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
Index: xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h
diff -u xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.3 xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.4
--- xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.3 Mon Nov 22 08:38:54 2010
+++ xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h Sat Jul 23 23:29:56 2011
@@ -4,7 +4,7 @@
/* */
/* ANSI-specific configuration file (specification only). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2010 by */
+/* Copyright 1996-2004, 2006-2008, 2010-2011 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -127,7 +127,12 @@
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
( defined( __MWERKS__ ) && defined( macintosh ) )
/* no Carbon frameworks for 64bit 10.4.x */
+ /* AvailabilityMacros.h is available since Mac OS X 10.2, */
+ /* so guess the system version by maximum errno before inclusion */
+#include <errno.h>
+#ifdef ECANCELED /* defined since 10.2 */
#include "AvailabilityMacros.h"
+#endif
#if defined( __LP64__ ) && \
( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
#define DARWIN_NO_CARBON 1
@@ -348,13 +353,13 @@
register FT_Int32 t, t2;
- asm __volatile__ (
- "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */
- "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */
- "add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
- "adds %1, %1, %0\n\t" /* %1 += %0 */
- "adc %2, %2, #0\n\t" /* %2 += carry */
- "mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */
+ __asm__ __volatile__ (
+ "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */
+ "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */
+ "add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
+ "adds %1, %1, %0\n\t" /* %1 += %0 */
+ "adc %2, %2, #0\n\t" /* %2 += carry */
+ "mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */
"orr %0, %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */
: "=r"(a), "=&r"(t2), "=&r"(t)
: "r"(a), "r"(b) );
@@ -395,6 +400,43 @@
#endif /* __GNUC__ */
+
+#ifdef _MSC_VER /* Visual C++ */
+
+#ifdef _M_IX86
+
+#define FT_MULFIX_ASSEMBLER FT_MulFix_i386
+
+ /* documentation is in freetype.h */
+
+ static __inline FT_Int32
+ FT_MulFix_i386( FT_Int32 a,
+ FT_Int32 b )
+ {
+ register FT_Int32 result;
+
+ __asm
+ {
+ mov eax, a
+ mov edx, b
+ imul edx
+ mov ecx, edx
+ sar ecx, 31
+ add ecx, 8000h
+ add eax, ecx
+ adc edx, 0
+ shr eax, 16
+ shl edx, 16
+ add eax, edx
+ mov result, eax
+ }
+ return result;
+ }
+
+#endif /* _M_IX86 */
+
+#endif /* _MSC_VER */
+
#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
Index: xsrc/external/mit/freetype/dist/src/cff/cffload.c
diff -u xsrc/external/mit/freetype/dist/src/cff/cffload.c:1.3 xsrc/external/mit/freetype/dist/src/cff/cffload.c:1.4
--- xsrc/external/mit/freetype/dist/src/cff/cffload.c:1.3 Mon Nov 22 08:38:54 2010
+++ xsrc/external/mit/freetype/dist/src/cff/cffload.c Sat Jul 23 23:29:56 2011
@@ -387,7 +387,7 @@
{
FT_Error error = CFF_Err_Ok;
FT_Memory memory = idx->stream->memory;
- FT_Byte** t;
+ FT_Byte** t = NULL;
FT_Byte* new_bytes = NULL;
@@ -1514,7 +1514,7 @@
if ( dict->cid_registry != 0xFFFFU )
{
CFF_IndexRec fd_index;
- CFF_SubFont sub;
+ CFF_SubFont sub = NULL;
FT_UInt idx;
Index: xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c
diff -u xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.4 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.5
--- xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.4 Mon Nov 22 08:38:54 2010
+++ xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c Sat Jul 23 23:29:56 2011
@@ -8,7 +8,7 @@
/* parse compressed PCF fonts, as found with many X11 server */
/* distributions. */
/* */
-/* Copyright 2002, 2003, 2004, 2005, 2006, 2009, 2010 by */
+/* Copyright 2002-2006, 2009-2011 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -571,7 +571,7 @@
old_pos = stream->pos;
if ( !FT_Stream_Seek( stream, stream->size - 4 ) )
{
- result = (FT_ULong)FT_Stream_ReadLong( stream, &error );
+ result = FT_Stream_ReadULong( stream, &error );
if ( error )
result = 0;
@@ -588,7 +588,7 @@
{
FT_Error error;
FT_Memory memory = source->memory;
- FT_GZipFile zip;
+ FT_GZipFile zip = NULL;
/*
@@ -628,7 +628,7 @@
if ( zip_size != 0 && zip_size < 40 * 1024 )
{
- FT_Byte* zip_buff;
+ FT_Byte* zip_buff = NULL;
if ( !FT_ALLOC( zip_buff, zip_size ) )
Index: xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.c
diff -u xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.c:1.3 xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.c:1.4
--- xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.c:1.3 Mon Nov 22 08:38:55 2010
+++ xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.c Sat Jul 23 23:29:56 2011
@@ -4,7 +4,7 @@
/* */
/* Anti-aliasing renderer interface (body). */
/* */
-/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 by */
+/* Copyright 2000-2006, 2009-2011 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -105,7 +105,10 @@
FT_Error error;
FT_Outline* outline = NULL;
FT_BBox cbox;
- FT_UInt width, height, height_org, width_org, pitch;
+ FT_UInt width, height, pitch;
+#ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ FT_UInt height_org, width_org;
+#endif
FT_Bitmap* bitmap;
FT_Memory memory;
FT_Int hmul = mode == FT_RENDER_MODE_LCD;
@@ -163,8 +166,10 @@
bitmap = &slot->bitmap;
memory = render->root.memory;
+#ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
width_org = width;
height_org = height;
+#endif
/* release old bitmap buffer */
if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
