[ros-diffs] [tkreuzer] 47361: [FREETYPE] - Cleanup old files - Remove setjmplongjmp.s - Correction to last commit message: the conversion patch was already applied
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Wed May 26 13:07:12 CEST 2010
Author: tkreuzer
Date: Wed May 26 13:07:12 2010
New Revision: 47361
URL: http://svn.reactos.org/svn/reactos?rev=47361&view=rev
Log:
[FREETYPE]
- Cleanup old files
- Remove setjmplongjmp.s
- Correction to last commit message: the conversion patch was already applied
Removed:
trunk/reactos/lib/3rdparty/freetype/README.CVS
trunk/reactos/lib/3rdparty/freetype/i386/
trunk/reactos/lib/3rdparty/freetype/src/base/_ftbase_ros.c
trunk/reactos/lib/3rdparty/freetype/src/base/_ftmulfix_ros.c
Modified:
trunk/reactos/lib/3rdparty/freetype/freetype.rbuild
Removed: trunk/reactos/lib/3rdparty/freetype/README.CVS
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/README.CVS?rev=47360&view=auto
==============================================================================
--- trunk/reactos/lib/3rdparty/freetype/README.CVS [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/freetype/README.CVS (removed)
@@ -1,50 +1,0 @@
-The CVS archive doesn't contain pre-built configuration scripts for
-UNIXish platforms. To generate them say
-
- sh autogen.sh
-
-which in turn depends on the following packages:
-
- automake (1.9.6)
- libtool (1.5.22)
- autoconf (2.59c)
-
-The versions given in parentheses are known to work. Newer versions
-should work too, of course. Note that autogen.sh also sets up proper
-file permissions for the `configure' and auxiliary scripts.
-
-A very common problem is that this script complains that the `aclocal'
-program doesn't accept a `--force' option:
-
- generating `configure.ac'
- running `aclocal -I . --force'
- aclocal: unrecognized option -- `--force'
- Try `aclocal --help' for more information.
- error while running `aclocal -I . --force'
-
-This means that your version of the automake package is too old.
-Please update it before trying to build FreeType.
-
-
-For static builds which don't use platform specific optimizations, no
-configure script is necessary at all; saying
-
- make setup ansi
- make
-
-should work on all platforms which have GNU make (or makepp).
-
-
-----------------------------------------------------------------------
-
-Copyright 2005, 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.
-
-
---- end of README.CVS ---
Modified: trunk/reactos/lib/3rdparty/freetype/freetype.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/freetype.rbuild?rev=47361&r1=47360&r2=47361&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] Wed May 26 13:07:12 2010
@@ -9,11 +9,6 @@
</if>
<if property="NSWPAT" value="1">
<define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" />
- </if>
- <if property="ARCH" value="i386">
- <directory name="i386">
- <file>setjmplongjmp.s</file>
- </directory>
</if>
<directory name="src">
<directory name="base">
Removed: trunk/reactos/lib/3rdparty/freetype/src/base/_ftbase_ros.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/base/_ftbase_ros.c?rev=47360&view=auto
==============================================================================
--- trunk/reactos/lib/3rdparty/freetype/src/base/_ftbase_ros.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/freetype/src/base/_ftbase_ros.c (removed)
@@ -1,42 +1,0 @@
-/***************************************************************************/
-/* */
-/* ftbase.c */
-/* */
-/* Single object library component (body 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. */
-/* */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-
-#define FT_MAKE_OPTION_SINGLE_OBJECT
-
-#define FT_MulFix FT_MulFix_wrong
-#include "ftcalc.c"
-#undef FT_MulFix
-#include "_ftmulfix_ros.c"
-
-#include "ftdbgmem.c"
-#include "ftgloadr.c"
-#include "ftnames.c"
-#include "ftobjs.c"
-#include "ftoutln.c"
-#include "ftrfork.c"
-#include "ftstream.c"
-#include "fttrigon.c"
-#include "ftutil.c"
-
-#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
-#include <ftmac.c>
-#endif
-
-/* END */
Removed: trunk/reactos/lib/3rdparty/freetype/src/base/_ftmulfix_ros.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/base/_ftmulfix_ros.c?rev=47360&view=auto
==============================================================================
--- trunk/reactos/lib/3rdparty/freetype/src/base/_ftmulfix_ros.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/freetype/src/base/_ftmulfix_ros.c (removed)
@@ -1,92 +1,0 @@
- FT_EXPORT_DEF( FT_Long )
- FT_MulFix( FT_Long a,
- FT_Long b )
- {
- /* use inline assembly to speed up things a bit */
-
-#if defined( __GNUC__ ) && defined( i386 )
-
- FT_Long result;
-
-
- __asm__ __volatile__ (
- "imul %%edx\n"
- "movl %%edx, %%ecx\n"
- "sarl $31, %%ecx\n"
- "addl $0x8000, %%ecx\n"
- "addl %%ecx, %%eax\n"
- "adcl $0, %%edx\n"
- "shrl $16, %%eax\n"
- "shll $16, %%edx\n"
- "addl %%edx, %%eax\n"
- "mov %%eax, %0\n"
- : "=r"(result), "=d"(b)
- : "a"(a), "d"(b)
- : "%ecx"
- );
- return result;
-
-#elif 1
-
- FT_Long sa, sb;
- FT_ULong ua, ub;
-
-
- if ( a == 0 || b == 0x10000L )
- return a;
-
- sa = ( a >> ( sizeof ( a ) * 8 - 1 ) );
- a = ( a ^ sa ) - sa;
- sb = ( b >> ( sizeof ( b ) * 8 - 1 ) );
- b = ( b ^ sb ) - sb;
-
- ua = (FT_ULong)a;
- ub = (FT_ULong)b;
-
- if ( ua <= 2048 && ub <= 1048576L )
- ua = ( ua * ub + 0x8000U ) >> 16;
- else
- {
- FT_ULong al = ua & 0xFFFFU;
-
-
- ua = ( ua >> 16 ) * ub + al * ( ub >> 16 ) +
- ( ( al * ( ub & 0xFFFFU ) + 0x8000U ) >> 16 );
- }
-
- sa ^= sb,
- ua = (FT_ULong)(( ua ^ sa ) - sa);
-
- return (FT_Long)ua;
-
-#else /* 0 */
-
- FT_Long s;
- FT_ULong ua, ub;
-
-
- if ( a == 0 || b == 0x10000L )
- return a;
-
- s = a; a = FT_ABS( a );
- s ^= b; b = FT_ABS( b );
-
- ua = (FT_ULong)a;
- ub = (FT_ULong)b;
-
- if ( ua <= 2048 && ub <= 1048576L )
- ua = ( ua * ub + 0x8000UL ) >> 16;
- else
- {
- FT_ULong al = ua & 0xFFFFUL;
-
-
- ua = ( ua >> 16 ) * ub + al * ( ub >> 16 ) +
- ( ( al * ( ub & 0xFFFFUL ) + 0x8000UL ) >> 16 );
- }
-
- return ( s < 0 ? -(FT_Long)ua : (FT_Long)ua );
-
-#endif /* 0 */
-
- }
More information about the Ros-diffs
mailing list