minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

[base] Make `FT_Hypot' really internal. 

* include/freetype/fttrigon.h (FT_Hypot): Move to...
* include/freetype/internal/ftcalc.h: This file.

* src/base/fttrigon.c (FT_Hypot): Move to...
* src/base/ftcalc.c: This file.
Include FT_TRIGONOMETRY_H.

* src/truetype/ttgload.c: Don't include FT_TRIGONOMETRY_H.
This commit is contained in:
Werner Lemberg 2013-01-24 09:12:56 +01:00
parent a56f95b268
commit e9f330adf6
6 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,16 @@
2013-01-23 Werner Lemberg <wl@gnu.org>
[base] Make `FT_Hypot' really internal.
* include/freetype/fttrigon.h (FT_Hypot): Move to...
* include/freetype/internal/ftcalc.h: This file.
* src/base/fttrigon.c (FT_Hypot): Move to...
* src/base/ftcalc.c: This file.
Include FT_TRIGONOMETRY_H.
* src/truetype/ttgload.c: Don't include FT_TRIGONOMETRY_H.
2013-01-23 Werner Lemberg <wl@gnu.org>
[truetype] Revert change from 2013-01-22.
@ -8,7 +21,7 @@
2013-01-23 Alexei Podtelezhnikov <apodtele@gmail.com>
[base, truetype] New internal FT_Hypot function.
[base, truetype] New internal `FT_Hypot' function.
* include/freetype/fttrigon.h (FT_Hypot): Declare it.
* src/base/fttrigon.c (FT_Hypot): Define it.

8
include/freetype/fttrigon.h
View File

@ -339,14 +339,6 @@ FT_BEGIN_HEADER
FT_Fixed length,
FT_Angle angle );
/*
* Return sqrt(x*x+y*y), which is the same as FT_Vector_Length but uses
* two fixed-point arguments instead.
*/
FT_BASE( FT_Fixed )
FT_Hypot( FT_Fixed x,
FT_Fixed y );
/* */

13
include/freetype/internal/ftcalc.h
View File

@ -4,7 +4,7 @@
/* */
/* Arithmetic computations (specification). */
/* */
/* Copyright 1996-2006, 2008, 2009, 2012 by */
/* Copyright 1996-2006, 2008, 2009, 2012-2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -159,7 +159,16 @@ FT_BEGIN_HEADER
* Return the most significant bit index.
*/
FT_BASE( FT_Int )
FT_MSB( FT_UInt32 z );
FT_MSB( FT_UInt32 z );
/*
* Return sqrt(x*x+y*y), which is the same as `FT_Vector_Length' but uses
* two fixed-point arguments instead.
*/
FT_BASE( FT_Fixed )
FT_Hypot( FT_Fixed x,
FT_Fixed y );
#define INT_TO_F26DOT6( x ) ( (FT_Long)(x) << 6 )

19
src/base/ftcalc.c
View File

@ -4,7 +4,7 @@
/* */
/* Arithmetic computations (body). */
/* */
/* Copyright 1996-2006, 2008, 2012 by */
/* Copyright 1996-2006, 2008, 2012-2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -34,6 +34,7 @@
#include <ft2build.h>
#include FT_GLYPH_H
#include FT_TRIGONOMETRY_H
#include FT_INTERNAL_CALC_H
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_OBJECTS_H
@ -139,6 +140,22 @@
}
/* documentation is in ftcalc.h */
FT_BASE_DEF( FT_Fixed )
FT_Hypot( FT_Fixed x,
FT_Fixed y )
{
FT_Vector v;
v.x = x;
v.y = y;
return FT_Vector_Length( &v );
}
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
/* documentation is in ftcalc.h */

15
src/base/fttrigon.c
View File

@ -492,19 +492,4 @@
}
/* documentation is in fttrigon.h */
FT_BASE_DEF( FT_Fixed )
FT_Hypot( FT_Fixed x,
FT_Fixed y )
{
FT_Vector v;
v.x = x;
v.y = y;
return FT_Vector_Length( &v );
}
/* END */

1
src/truetype/ttgload.c
View File

@ -22,7 +22,6 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_SFNT_H
#include FT_TRUETYPE_TAGS_H
#include FT_TRIGONOMETRY_H
#include FT_OUTLINE_H
#include "ttgload.h"