| Index: third_party/freetype/include/ftbbox.h
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftbbox.h b/third_party/freetype/include/ftbbox.h
|
| similarity index 96%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftbbox.h
|
| rename to third_party/freetype/include/ftbbox.h
|
| index 5f5424697670b1ce62d30c76597fdc35c4478b77..d6800e240fc73acc05ced979e89329beca3c5ddb 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftbbox.h
|
| +++ b/third_party/freetype/include/ftbbox.h
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* FreeType exact bbox computation (specification). */
|
| /* */
|
| -/* Copyright 1996-2001, 2003, 2007, 2011 by */
|
| +/* Copyright 1996-2001, 2003, 2007, 2011, 2013 by */
|
| /* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -31,8 +31,8 @@
|
| #define __FTBBOX_H__
|
|
|
|
|
| -#include "../ft2build.h"
|
| -#include "freetype.h"
|
| +#include <ft2build.h>
|
| +#include FT_FREETYPE_H
|
|
|
| #ifdef FREETYPE_H
|
| #error "freetype.h of FreeType 1 has been loaded!"
|
| @@ -60,7 +60,7 @@ FT_BEGIN_HEADER
|
| /* <Description> */
|
| /* Compute 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 */
|
| + /* algorithm that returns _very_ quickly when the two boxes */
|
| /* coincide. Otherwise, the outline Bézier arcs are traversed to */
|
| /* extract their extrema. */
|
| /* */
|
| @@ -78,14 +78,13 @@ FT_BEGIN_HEADER
|
| /* @FT_LOAD_NO_SCALE, the resulting BBox is meaningless. To get */
|
| /* reasonable values for the BBox it is necessary to load the glyph */
|
| /* at a large ppem value (so that the hinting instructions can */
|
| - /* properly shift and scale the subglyphs), then extracting the BBox */
|
| + /* properly shift and scale the subglyphs), then extracting the BBox, */
|
| /* which can be eventually converted back to font units. */
|
| /* */
|
| FT_EXPORT( FT_Error )
|
| FT_Outline_Get_BBox( FT_Outline* outline,
|
| FT_BBox *abbox );
|
|
|
| -
|
| /* */
|
|
|
|
|
|
|