Commit 17ae985d3838bb4f83644ecad27a87a1a8730a4c
2000-01-02T09:41:30
ftbbox.h: FT_Get_Outline_BBox() must be called FT_Raster_GetBBox(). ftcalc.c: Added a missing closing paranthesis in 64bit version of FT_MulFix(). Some formatting; updating copyright.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399
diff --git a/include/ftbbox.h b/include/ftbbox.h
index ea68615..f3dfb60 100644
--- a/include/ftbbox.h
+++ b/include/ftbbox.h
@@ -4,7 +4,7 @@
/* */
/* FreeType bbox computation (specification). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -40,7 +40,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Get_Outline_BBox */
+ /* FT_Raster_GetBBox */
/* */
/* <Description> */
/* Computes the exact bounding box of an outline. This is slower */
@@ -59,8 +59,8 @@
/* Error code. 0 means success. */
/* */
EXPORT_DEF
- FT_Error FT_Get_Outline_BBox( FT_Outline* outline,
- FT_BBox* bbox );
+ FT_Error FT_Raster_GetBBox( FT_Outline* outline,
+ FT_BBox* abbox );
#ifdef __cplusplus
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index 0a00e62..cb7cee5 100644
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -1,6 +1,27 @@
+/***************************************************************************/
+/* */
+/* ftbase.c */
+/* */
+/* Single object library component. */
+/* */
+/* Copyright 1996-2000 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 <ftcalc.c>
#include <ftobjs.c>
#include <ftstream.c>
#include <ftlist.c>
#include <ftextend.c>
+
+
+/* END */
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index 71d4430..6687412 100644
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -4,7 +4,7 @@
/* */
/* FreeType bbox computation (body). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -343,7 +343,7 @@
/* Computes the exact bounding box of an outline. This is slower */
/* than computing the control box. However, it uses an advanced */
/* algorithm which returns _very_ quickly when the two boxes */
- /* coincide. Otherwise, the outline Bezier arcs are walked over to */
+ /* coincide. Otherwise, the outline Bezier arcs are walked over to */
/* extract their extrema. */
/* */
/* <Input> */
@@ -419,10 +419,10 @@
static FT_Outline_Funcs interface =
{
- (FT_Outline_MoveTo_Func) BBox_Move_To,
- (FT_Outline_LineTo_Func) BBox_Move_To,
- (FT_Outline_ConicTo_Func) BBox_Conic_To,
- (FT_Outline_CubicTo_Func) BBox_Cubic_To
+ (FT_Outline_MoveTo_Func) BBox_Move_To,
+ (FT_Outline_LineTo_Func) BBox_Move_To,
+ (FT_Outline_ConicTo_Func)BBox_Conic_To,
+ (FT_Outline_CubicTo_Func)BBox_Cubic_To
};
FT_Error error;
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 9acc58e..0e05091 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -4,7 +4,7 @@
/* */
/* Arithmetic computations (body). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -24,7 +24,7 @@
/*************************************************************************/
/* */
- /* Implementing basic computation routines. */
+ /* Implementing basic computation routines. */
/* */
/* FT_MulDiv() and FT_MulFix() are declared in freetype.h. */
/* */
@@ -39,22 +39,25 @@
FT_Int32 FT_Sqrt32( FT_Int32 x )
{
FT_ULong val, root, newroot, mask;
+
root = 0;
mask = 0x40000000;
val = (FT_ULong)x;
+
do
{
- newroot = root+mask;
+ newroot = root + mask;
if (newroot <= val)
{
val -= newroot;
root = newroot+mask;
}
+
root >>= 1;
mask >>= 2;
}
- while (mask != 0);
+ while ( mask != 0 );
return root;
}
@@ -93,12 +96,13 @@
{
FT_Int s;
+
s = 1;
if ( a < 0 ) { a = -a; s = -s; }
if ( b < 0 ) { b = -b; s = -s; }
if ( c < 0 ) { c = -c; s = -s; }
- return s*( ((FT_Int64)a * b + (c >> 1) )/c);
+ return s * ( ( (FT_Int64)a * b + ( c >> 1 ) ) / c );
}
@@ -109,7 +113,7 @@
/* */
/* <Description> */
/* A very simple function used to perform the computation */
- /* `(A*B)/0x10000' with maximum accuracy. Most of the time, this is */
+ /* `(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. */
/* */
/* <Input> */
@@ -125,7 +129,7 @@
/* value of `a' is less than 2048, and `b' is a 16.16 scaling factor. */
/* As this happens mainly when scaling from notional units to */
/* fractional pixels in FreeType, it resulted in noticeable speed */
- /* improvements between versions 2.0 and 1.x. */
+ /* improvements between versions 2.x and 1.x. */
/* */
/* As a conclusion, always try to place a 16.16 factor as the */
/* _second_ argument of this function; this can make a great */
@@ -137,13 +141,15 @@
{
FT_Int s;
+
s = 1;
if ( a < 0 ) { a = -a; s = -s; }
if ( b < 0 ) { b = -b; s = -s; }
- return s*(FT_Long)((FT_Int64)a * b + 0x8000) >> 16);
+ return s * (FT_Long)( ( (FT_Int64)a * b + 0x8000 ) >> 16 );
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -152,7 +158,7 @@
/* <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 float factor. */
/* */
/* <Input> */
/* a :: The first multiplier. */
@@ -163,9 +169,9 @@
/* The result of `(a*0x10000)/b'. */
/* */
/* <Note> */
- /* The optimisation for FT_DivFix() is simple : if (a << 16) fits */
- /* in 32 bits, then the division is computed directly. Otherwise, */
- /* we use a specialised version of the old FT_MulDiv64 */
+ /* The optimization for FT_DivFix() is simple: If (a << 16) fits in */
+ /* 32 bits, then the division is computed directly. Otherwise, we */
+ /* use a specialized version of the old FT_MulDiv64(). */
/* */
EXPORT_FUNC
FT_Int32 FT_DivFix( FT_Long a,
@@ -174,6 +180,7 @@
FT_Int32 s;
FT_Word32 q;
+
s = a; a = ABS(a);
s ^= b; b = ABS(b);
@@ -220,7 +227,7 @@
/* Graham Asher. The trick is to optimize computation if everything */
/* fits within 32 bits (a rather common case). */
/* */
- /* We compute `a*b+c/2', then divide it by `c'. (positive values) */
+ /* We compute `a*b+c/2', then divide it by `c' (positive values). */
/* */
/* 46340 is FLOOR(SQRT(2^31-1)). */
/* */
@@ -230,7 +237,7 @@
/* */
/* if ( c < 0x157F0*2 ) then ( a*b+c/2 <= 0x7FFFFFFF ) */
/* */
- /* and 2*0x157F0 = 176096 */
+ /* and 2*0x157F0 = 176096. */
/* */
EXPORT_FUNC
FT_Long FT_MulDiv( FT_Long a,
@@ -255,6 +262,7 @@
{
FT_Int64 temp, temp2;
+
FT_MulTo64( a, b, &temp );
temp2.hi = (FT_Int32)(c >> 31);
temp2.lo = (FT_Word32)(c / 2);
@@ -285,17 +293,17 @@
/* The result of `(a*b)/0x10000'. */
/* */
/* <Note> */
- /* The optimisation for FT_MulFix() is different. We could simply be */
+ /* The optimization for FT_MulFix() is different. We could simply be */
/* happy by applying the same principles as with FT_MulDiv(), because */
/* */
- /* c = 0x10000 < 176096 */
+ /* c = 0x10000 < 176096 */
/* */
/* However, in most cases, we have a `b' with a value around 0x10000 */
/* which is greater than 46340. */
/* */
/* According to some testing, most cases have `a' < 2048, so a good */
/* idea is to use bounds like 2048 and 1048576 (=floor((2^31-1)/2048) */
- /* for `a' and `b' respectively. */
+ /* for `a' and `b', respectively. */
/* */
EXPORT_FUNC
FT_Long FT_MulFix( FT_Long a,
@@ -303,6 +311,7 @@
{
FT_Long s;
+
if ( a == 0 || b == 0x10000L )
return a;
@@ -317,6 +326,7 @@
{
FT_Long al = a & 0xFFFF;
+
a = (a >> 16)*b + al*(b >> 16) + ( al*(b & 0xFFFF) >> 16 );
}
@@ -343,9 +353,9 @@
/* The result of `(a*0x10000)/b'. */
/* */
/* <Note> */
- /* The optimisation for FT_DivFix() is simple : if (a << 16) fits */
- /* in 32 bits, then the division is computed directly. Otherwise, */
- /* we use a specialised version of the old FT_MulDiv64 */
+ /* The optimization for FT_DivFix() is simple: If (a << 16) fits in */
+ /* 32 bits, then the division is computed directly. Otherwise, we */
+ /* use a specialized version of the old FT_MulDiv64(). */
/* */
EXPORT_FUNC
FT_Long FT_DivFix( FT_Long a,
@@ -354,6 +364,7 @@
FT_Int32 s;
FT_Word32 q;
+
s = a; a = ABS(a);
s ^= b; b = ABS(b);
@@ -371,18 +382,19 @@
/* we need more bits, we'll have to do it by hand */
FT_Word32 c;
- q = (a/b) << 16;
- c = a%b;
- /* we must compute C*0x10000/B, we simply shift C and B so */
+ q = ( a / b ) << 16;
+ c = a % b;
+
+ /* we must compute C*0x10000/B; we simply shift C and B so */
/* C becomes smaller than 16 bits */
- while (c >> 16)
+ while ( c >> 16 )
{
c >>= 1;
b <<= 1;
}
- q += (c << 16)/b;
+ q += ( c << 16 ) / b;
}
return ( s < 0 ? -(FT_Int32)q : (FT_Int32)q );
@@ -417,6 +429,7 @@
{
FT_Word32 lo1, hi1, lo2, hi2, lo, hi, i1, i2;
+
lo1 = x & 0x0000FFFF; hi1 = x >> 16;
lo2 = y & 0x0000FFFF; hi2 = y >> 16;
@@ -431,7 +444,7 @@
if ( i1 < i2 )
hi += 1L << 16;
- hi += (i1 >> 16);
+ hi += i1 >> 16;
i1 = i1 << 16;
/* Check carry overflow of i1 + lo */
diff --git a/src/base/ftcalc.h b/src/base/ftcalc.h
index 1bbe178..949d88f 100644
--- a/src/base/ftcalc.h
+++ b/src/base/ftcalc.h
@@ -4,7 +4,7 @@
/* */
/* Arithmetic computations (specification). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -29,6 +29,7 @@
#ifdef LONG64
+
typedef INT64 FT_Int64;
#define ADD_64( x, y, z ) z = (x) + (y)
@@ -53,8 +54,10 @@
BASE_DEF void FT_MulTo64 ( FT_Int32 x, FT_Int32 y, FT_Int64* z );
BASE_DEF FT_Int32 FT_Div64by32( FT_Int64* x, FT_Int32 y );
+
#endif /* LONG64 */
+
#define SQRT_32( x ) FT_Sqrt32( x )
BASE_DEF FT_Int32 FT_Sqrt32( FT_Int32 l );
@@ -73,7 +76,7 @@
#define FLOAT_TO_FIXED( x ) ( (FT_Long)(x * 65536.0) )
#define ROUND_F26DOT6( x ) ( x >= 0 ? ( ((x) + 32) & -64) \
- : ( -((32 - (x)) & -64) ) )
+ : ( -((32 - (x)) & -64) ) )
#ifdef __cplusplus
}