summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Podtelezhnikov <apodtele@gmail.com>2013-01-12 19:17:05 -0500
committerAlexei Podtelezhnikov <apodtele@gmail.com>2013-01-12 19:17:05 -0500
commita692170a238f4bdb5fdb3b7b7c31bf662340a43a (patch)
tree0cdd28a65cfcbf580f1793815b7f4ab4fb58d8ff
parente4ecce3bfe464cf56a3838db945ca0e528e5555f (diff)
downloadfreetype2-a692170a238f4bdb5fdb3b7b7c31bf662340a43a.tar.gz
Call it fixed-point.
-rw-r--r--ChangeLog.232
-rw-r--r--include/freetype/freetype.h4
-rw-r--r--include/freetype/ftglyph.h2
-rw-r--r--include/freetype/ftimage.h2
-rw-r--r--include/freetype/ftstroke.h2
-rw-r--r--include/freetype/fttrigon.h8
-rw-r--r--include/freetype/fttypes.h8
-rw-r--r--include/freetype/internal/ftcalc.h2
-rw-r--r--src/base/ftbbox.c4
-rw-r--r--src/tools/test_trig.c5
10 files changed, 19 insertions, 20 deletions
diff --git a/ChangeLog.23 b/ChangeLog.23
index bc46c84a0..1a23848f8 100644
--- a/ChangeLog.23
+++ b/ChangeLog.23
@@ -6668,7 +6668,7 @@
2007-01-10 Derek Clegg <dclegg@apple.com>
- * src/type1/t1load.c (T1_Get_MM_Var): Always return fixed point
+ * src/type1/t1load.c (T1_Get_MM_Var): Always return fixed-point
values.
2007-01-08 David Turner <david@freetype.org>
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 8df4828f6..8f342658b 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -3695,7 +3695,7 @@ FT_BEGIN_HEADER
/* <Description> */
/* A very simple function used to perform the computation */
/* `(a*b)/0x10000' with maximum accuracy. Most of the time this is */
- /* used to multiply a given value by a 16.16 fixed float factor. */
+ /* used to multiply a given value by a 16.16 fixed-point factor. */
/* */
/* <Input> */
/* a :: The first multiplier. */
@@ -3740,7 +3740,7 @@ FT_BEGIN_HEADER
/* <Description> */
/* A very simple function used to perform the computation */
/* `(a*0x10000)/b' with maximum accuracy. Most of the time, this is */
- /* used to divide a given value by a 16.16 fixed float factor. */
+ /* used to divide a given value by a 16.16 fixed-point factor. */
/* */
/* <Input> */
/* a :: The first multiplier. */
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index 3de69f7ae..31dc33187 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -94,7 +94,7 @@ FT_BEGIN_HEADER
/* */
/* <Description> */
/* The root glyph structure contains a given glyph image plus its */
- /* advance width in 16.16 fixed float format. */
+ /* advance width in 16.16 fixed-point format. */
/* */
/* <Fields> */
/* library :: A handle to the FreeType library object. */
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 04b5e04f7..783430332 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -54,7 +54,7 @@ FT_BEGIN_HEADER
/* <Description> */
/* The type FT_Pos is used to store vectorial coordinates. Depending */
/* on the context, these can represent distances in integer font */
- /* units, or 16.16, or 26.6 fixed float pixel coordinates. */
+ /* units, or 16.16, or 26.6 fixed-point pixel coordinates. */
/* */
typedef signed long FT_Pos;
diff --git a/include/freetype/ftstroke.h b/include/freetype/ftstroke.h
index c3eb85a67..a498e4a88 100644
--- a/include/freetype/ftstroke.h
+++ b/include/freetype/ftstroke.h
@@ -271,7 +271,7 @@ FT_BEGIN_HEADER
* miter_limit ::
* The miter limit for the FT_STROKER_LINEJOIN_MITER_FIXED and
* FT_STROKER_LINEJOIN_MITER_VARIABLE line join styles,
- * expressed as 16.16 fixed point value.
+ * expressed as 16.16 fixed-point value.
*
* @note:
* The radius is expressed in the same units as the outline
diff --git a/include/freetype/fttrigon.h b/include/freetype/fttrigon.h
index 6b77d2ee5..f50e2b420 100644
--- a/include/freetype/fttrigon.h
+++ b/include/freetype/fttrigon.h
@@ -46,7 +46,7 @@ FT_BEGIN_HEADER
*
* @description:
* This type is used to model angle values in FreeType. Note that the
- * angle is a 16.16 fixed float value expressed in degrees.
+ * angle is a 16.16 fixed-point value expressed in degrees.
*
*/
typedef FT_Fixed FT_Angle;
@@ -106,7 +106,7 @@ FT_BEGIN_HEADER
* FT_Sin
*
* @description:
- * Return the sinus of a given angle in fixed point format.
+ * Return the sinus of a given angle in fixed-point format.
*
* @input:
* angle ::
@@ -130,7 +130,7 @@ FT_BEGIN_HEADER
* FT_Cos
*
* @description:
- * Return the cosinus of a given angle in fixed point format.
+ * Return the cosinus of a given angle in fixed-point format.
*
* @input:
* angle ::
@@ -154,7 +154,7 @@ FT_BEGIN_HEADER
* FT_Tan
*
* @description:
- * Return the tangent of a given angle in fixed point format.
+ * Return the tangent of a given angle in fixed-point format.
*
* @input:
* angle ::
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 325552744..1ad7fa153 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -255,7 +255,7 @@ FT_BEGIN_HEADER
/* FT_F2Dot14 */
/* */
/* <Description> */
- /* A signed 2.14 fixed float type used for unit vectors. */
+ /* A signed 2.14 fixed-point type used for unit vectors. */
/* */
typedef signed short FT_F2Dot14;
@@ -266,7 +266,7 @@ FT_BEGIN_HEADER
/* FT_F26Dot6 */
/* */
/* <Description> */
- /* A signed 26.6 fixed float type used for vectorial pixel */
+ /* A signed 26.6 fixed-point type used for vectorial pixel */
/* coordinates. */
/* */
typedef signed long FT_F26Dot6;
@@ -278,7 +278,7 @@ FT_BEGIN_HEADER
/* FT_Fixed */
/* */
/* <Description> */
- /* This type is used to store 16.16 fixed float values, like scaling */
+ /* This type is used to store 16.16 fixed-point values, like scaling */
/* values or matrix coefficients. */
/* */
typedef signed long FT_Fixed;
@@ -362,7 +362,7 @@ FT_BEGIN_HEADER
/* */
/* <Description> */
/* A simple structure used to store a 2x2 matrix. Coefficients are */
- /* in 16.16 fixed float format. The computation performed is: */
+ /* in 16.16 fixed-point format. The computation performed is: */
/* */
/* { */
/* x' = x*xx + y*xy */
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index a6a5e05f6..56aa07c2d 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -33,7 +33,7 @@ FT_BEGIN_HEADER
/* FT_FixedSqrt */
/* */
/* <Description> */
- /* Computes the square root of a 16.16 fixed point value. */
+ /* Computes the square root of a 16.16 fixed-point value. */
/* */
/* <Input> */
/* x :: The value to compute the root for. */
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index aaf9042d9..5d3c1f92c 100644
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -369,12 +369,12 @@
/* We need to solve `ax^2+2bx+c' here, without floating points! */
/* The trick is to normalize to a different representation in order */
- /* to use our 16.16 fixed point routines. */
+ /* to use our 16.16 fixed-point routines. */
/* */
/* We compute FT_MulFix(b,b) and FT_MulFix(a,c) after normalization. */
/* These values must fit into a single 16.16 value. */
/* */
- /* We normalize a, b, and c to `8.16' fixed float values to ensure */
+ /* We normalize a, b, and c to `8.16' fixed-point values to ensure */
/* that its product is held in a `16.16' value. */
{
diff --git a/src/tools/test_trig.c b/src/tools/test_trig.c
index 8c8a544aa..451e999b1 100644
--- a/src/tools/test_trig.c
+++ b/src/tools/test_trig.c
@@ -8,9 +8,8 @@
#define PI 3.14159265358979323846
#define SPI (PI/FT_ANGLE_PI)
-/* the precision in 16.16 fixed float points of the checks. Expect */
-/* between 2 and 5 noise LSB bits during operations, due to */
-/* rounding errors.. */
+/* the precision in 16.16 fixed-point checks. Expect between 2 and 5 */
+/* noise LSB bits during operations, due to rounding errors.. */
#define THRESHOLD 64
static error = 0;