[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33905] trunk/lib/win64: Update FreeType 2 to 2.4.4
Nathan Letwory
nathan at letworyinteractive.com
Mon Dec 27 12:53:25 CET 2010
Revision: 33905
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33905
Author: jesterking
Date: 2010-12-27 12:53:25 +0100 (Mon, 27 Dec 2010)
Log Message:
-----------
Update FreeType 2 to 2.4.4
Modified Paths:
--------------
trunk/lib/win64/Readme.txt
trunk/lib/win64/freetype/include/freetype/config/ftconfig.h
trunk/lib/win64/freetype/include/freetype/config/ftheader.h
trunk/lib/win64/freetype/include/freetype/config/ftmodule.h
trunk/lib/win64/freetype/include/freetype/config/ftoption.h
trunk/lib/win64/freetype/include/freetype/config/ftstdlib.h
trunk/lib/win64/freetype/include/freetype/freetype.h
trunk/lib/win64/freetype/include/freetype/ftbbox.h
trunk/lib/win64/freetype/include/freetype/ftbdf.h
trunk/lib/win64/freetype/include/freetype/ftbitmap.h
trunk/lib/win64/freetype/include/freetype/ftcache.h
trunk/lib/win64/freetype/include/freetype/ftchapters.h
trunk/lib/win64/freetype/include/freetype/fterrdef.h
trunk/lib/win64/freetype/include/freetype/fterrors.h
trunk/lib/win64/freetype/include/freetype/ftgasp.h
trunk/lib/win64/freetype/include/freetype/ftglyph.h
trunk/lib/win64/freetype/include/freetype/ftgxval.h
trunk/lib/win64/freetype/include/freetype/ftgzip.h
trunk/lib/win64/freetype/include/freetype/ftimage.h
trunk/lib/win64/freetype/include/freetype/ftincrem.h
trunk/lib/win64/freetype/include/freetype/ftlcdfil.h
trunk/lib/win64/freetype/include/freetype/ftlist.h
trunk/lib/win64/freetype/include/freetype/ftlzw.h
trunk/lib/win64/freetype/include/freetype/ftmac.h
trunk/lib/win64/freetype/include/freetype/ftmm.h
trunk/lib/win64/freetype/include/freetype/ftmodapi.h
trunk/lib/win64/freetype/include/freetype/ftmoderr.h
trunk/lib/win64/freetype/include/freetype/ftotval.h
trunk/lib/win64/freetype/include/freetype/ftoutln.h
trunk/lib/win64/freetype/include/freetype/ftpfr.h
trunk/lib/win64/freetype/include/freetype/ftrender.h
trunk/lib/win64/freetype/include/freetype/ftsizes.h
trunk/lib/win64/freetype/include/freetype/ftsnames.h
trunk/lib/win64/freetype/include/freetype/ftstroke.h
trunk/lib/win64/freetype/include/freetype/ftsynth.h
trunk/lib/win64/freetype/include/freetype/ftsystem.h
trunk/lib/win64/freetype/include/freetype/fttrigon.h
trunk/lib/win64/freetype/include/freetype/fttypes.h
trunk/lib/win64/freetype/include/freetype/ftwinfnt.h
trunk/lib/win64/freetype/include/freetype/ftxf86.h
trunk/lib/win64/freetype/include/freetype/internal/autohint.h
trunk/lib/win64/freetype/include/freetype/internal/ftcalc.h
trunk/lib/win64/freetype/include/freetype/internal/ftdebug.h
trunk/lib/win64/freetype/include/freetype/internal/ftdriver.h
trunk/lib/win64/freetype/include/freetype/internal/ftgloadr.h
trunk/lib/win64/freetype/include/freetype/internal/ftmemory.h
trunk/lib/win64/freetype/include/freetype/internal/ftobjs.h
trunk/lib/win64/freetype/include/freetype/internal/ftrfork.h
trunk/lib/win64/freetype/include/freetype/internal/ftserv.h
trunk/lib/win64/freetype/include/freetype/internal/ftstream.h
trunk/lib/win64/freetype/include/freetype/internal/fttrace.h
trunk/lib/win64/freetype/include/freetype/internal/ftvalid.h
trunk/lib/win64/freetype/include/freetype/internal/internal.h
trunk/lib/win64/freetype/include/freetype/internal/pcftypes.h
trunk/lib/win64/freetype/include/freetype/internal/psaux.h
trunk/lib/win64/freetype/include/freetype/internal/pshints.h
trunk/lib/win64/freetype/include/freetype/internal/services/svbdf.h
trunk/lib/win64/freetype/include/freetype/internal/services/svgldict.h
trunk/lib/win64/freetype/include/freetype/internal/services/svgxval.h
trunk/lib/win64/freetype/include/freetype/internal/services/svkern.h
trunk/lib/win64/freetype/include/freetype/internal/services/svmm.h
trunk/lib/win64/freetype/include/freetype/internal/services/svotval.h
trunk/lib/win64/freetype/include/freetype/internal/services/svpfr.h
trunk/lib/win64/freetype/include/freetype/internal/services/svpostnm.h
trunk/lib/win64/freetype/include/freetype/internal/services/svpscmap.h
trunk/lib/win64/freetype/include/freetype/internal/services/svpsinfo.h
trunk/lib/win64/freetype/include/freetype/internal/services/svsfnt.h
trunk/lib/win64/freetype/include/freetype/internal/services/svttcmap.h
trunk/lib/win64/freetype/include/freetype/internal/services/svtteng.h
trunk/lib/win64/freetype/include/freetype/internal/services/svttglyf.h
trunk/lib/win64/freetype/include/freetype/internal/services/svwinfnt.h
trunk/lib/win64/freetype/include/freetype/internal/services/svxf86nm.h
trunk/lib/win64/freetype/include/freetype/internal/sfnt.h
trunk/lib/win64/freetype/include/freetype/internal/t1types.h
trunk/lib/win64/freetype/include/freetype/internal/tttypes.h
trunk/lib/win64/freetype/include/freetype/t1tables.h
trunk/lib/win64/freetype/include/freetype/ttnameid.h
trunk/lib/win64/freetype/include/freetype/tttables.h
trunk/lib/win64/freetype/include/freetype/tttags.h
trunk/lib/win64/freetype/include/freetype/ttunpat.h
trunk/lib/win64/freetype/include/ft2build.h
trunk/lib/win64/freetype/lib/freetype2ST.lib
Added Paths:
-----------
trunk/lib/win64/freetype/include/freetype/ftadvanc.h
trunk/lib/win64/freetype/include/freetype/ftcid.h
trunk/lib/win64/freetype/include/freetype/internal/ftpic.h
trunk/lib/win64/freetype/include/freetype/internal/services/svcid.h
trunk/lib/win64/freetype/lib/freetype2ST_d.lib
Modified: trunk/lib/win64/Readme.txt
===================================================================
--- trunk/lib/win64/Readme.txt 2010-12-27 11:32:43 UTC (rev 33904)
+++ trunk/lib/win64/Readme.txt 2010-12-27 11:53:25 UTC (rev 33905)
@@ -1 +1,2 @@
OpenCOLLADA r788
+FreeType 2.4.4 (Release Multithread, Debug Multithread, settings copied from win32 configuration)
Modified: trunk/lib/win64/freetype/include/freetype/config/ftconfig.h
===================================================================
--- trunk/lib/win64/freetype/include/freetype/config/ftconfig.h 2010-12-27 11:32:43 UTC (rev 33904)
+++ trunk/lib/win64/freetype/include/freetype/config/ftconfig.h 2010-12-27 11:53:25 UTC (rev 33905)
@@ -1,363 +1,528 @@
-/***************************************************************************/
-/* */
-/* ftconfig.h */
-/* */
-/* ANSI-specific configuration file (specification only). */
-/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* This header file contains a number of macro definitions that are used */
- /* by the rest of the engine. Most of the macros here are automatically */
- /* determined at compile time, and you should not need to change it to */
- /* port FreeType, except to compile the library with a non-ANSI */
- /* compiler. */
- /* */
- /* Note however that if some specific modifications are needed, we */
- /* advise you to place a modified copy in your build directory. */
- /* */
- /* The build directory is usually `freetype/builds/<system>', and */
- /* contains system-specific files that are always included first when */
- /* building the library. */
- /* */
- /* This ANSI version should stay in `include/freetype/config'. */
- /* */
- /*************************************************************************/
-
-
-#ifndef __FTCONFIG_H__
-#define __FTCONFIG_H__
-
-#include <ft2build.h>
-#include FT_CONFIG_OPTIONS_H
-#include FT_CONFIG_STANDARD_LIBRARY_H
-
-FT_BEGIN_HEADER
-
-
- /*************************************************************************/
- /* */
- /* PLATFORM-SPECIFIC CONFIGURATION MACROS */
- /* */
- /* These macros can be toggled to suit a specific system. The current */
- /* ones are defaults used to compile FreeType in an ANSI C environment */
- /* (16bit compilers are also supported). Copy this file to your own */
- /* `freetype/builds/<system>' directory, and edit it to port the engine. */
- /* */
- /*************************************************************************/
-
-
- /* There are systems (like the Texas Instruments 'C54x) where a `char' */
- /* has 16 bits. ANSI C says that sizeof(char) is always 1. Since an */
- /* `int' has 16 bits also for this system, sizeof(int) gives 1 which */
- /* is probably unexpected. */
- /* */
- /* `CHAR_BIT' (defined in limits.h) gives the number of bits in a */
- /* `char' type. */
-
-#ifndef FT_CHAR_BIT
-#define FT_CHAR_BIT CHAR_BIT
-#endif
-
-
- /* The size of an `int' type. */
-#if FT_UINT_MAX == 0xFFFFUL
-#define FT_SIZEOF_INT (16 / FT_CHAR_BIT)
-#elif FT_UINT_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_INT (32 / FT_CHAR_BIT)
-#elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL
-#define FT_SIZEOF_INT (64 / FT_CHAR_BIT)
-#else
-#error "Unsupported size of `int' type!"
-#endif
-
- /* The size of a `long' type. A five-byte `long' (as used e.g. on the */
- /* DM642) is recognized but avoided. */
-#if FT_ULONG_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT)
-#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
-#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT)
-#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL
-#define FT_SIZEOF_LONG (64 / FT_CHAR_BIT)
-#else
-#error "Unsupported size of `long' type!"
-#endif
-
-
- /* Preferred alignment of data */
-#define FT_ALIGNMENT 8
-
-
- /* FT_UNUSED is a macro used to indicate that a given parameter is not */
- /* used -- this is only used to get rid of unpleasant compiler warnings */
-#ifndef FT_UNUSED
-#define FT_UNUSED( arg ) ( (arg) = (arg) )
-#endif
-
-
- /*************************************************************************/
- /* */
- /* AUTOMATIC CONFIGURATION MACROS */
- /* */
- /* These macros are computed from the ones defined above. Don't touch */
- /* their definition, unless you know precisely what you are doing. No */
- /* porter should need to mess with them. */
- /* */
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* Mac support */
- /* */
- /* This is the only necessary change, so it is defined here instead */
- /* providing a new configuration file. */
- /* */
-#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
- ( defined( __MWERKS__ ) && defined( macintosh ) )
- /* no Carbon frameworks for 64bit 10.4.x */
-#include "AvailabilityMacros.h"
-#if defined( __LP64__ ) && \
- ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#define DARWIN_NO_CARBON 1
-#else
-#define FT_MACINTOSH 1
-#endif
-#endif
-
-
- /*************************************************************************/
- /* */
- /* IntN types */
- /* */
- /* Used to guarantee the size of some specific integers. */
- /* */
- typedef signed short FT_Int16;
- typedef unsigned short FT_UInt16;
-
-#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
-
- typedef signed int FT_Int32;
- typedef unsigned int FT_UInt32;
-
-#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)
-
- typedef signed long FT_Int32;
- typedef unsigned long FT_UInt32;
-
-#else
-#error "no 32bit type found -- please check your configuration files"
-#endif
-
- /* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
-
- typedef int FT_Fast;
- typedef unsigned int FT_UFast;
-
-#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT)
-
- typedef long FT_Fast;
- typedef unsigned long FT_UFast;
-
-#endif
-
-
- /* determine whether we have a 64-bit int type for platforms without */
- /* Autoconf */
-#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT)
-
- /* FT_LONG64 must be defined if a 64-bit type is available */
-#define FT_LONG64
-#define FT_INT64 long
-
-#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
-
- /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64 __int64
-
-#elif defined( __BORLANDC__ ) /* Borland C++ */
-
- /* XXXX: We should probably check the value of __BORLANDC__ in order */
- /* to test the compiler version. */
-
- /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64 __int64
-
-#elif defined( __WATCOMC__ ) /* Watcom C++ */
-
- /* Watcom doesn't provide 64-bit data types */
-
-#elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */
-
-#define FT_LONG64
-#define FT_INT64 long long int
-
-#elif defined( __GNUC__ )
-
- /* GCC provides the `long long' type */
-#define FT_LONG64
-#define FT_INT64 long long int
-
-#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
-
-
-#define FT_BEGIN_STMNT do {
-#define FT_END_STMNT } while ( 0 )
-#define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT
-
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list