Annotation of /trunk/xpdf/patches/xpdf-3.01-freetype-internals.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 2694 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 2694 byte(s)
-import
1 | niro | 153 | --- xpdf-3.01/splash/SplashFTFont.cc.orig 2006-07-14 10:55:18.000000000 +0200 |
2 | +++ xpdf-3.01/splash/SplashFTFont.cc 2006-07-14 10:55:25.000000000 +0200 | ||
3 | @@ -14,7 +14,8 @@ | ||
4 | |||
5 | #include <ft2build.h> | ||
6 | #include FT_OUTLINE_H | ||
7 | -#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl | ||
8 | +#include FT_SIZES_H // needed for FT_New_Size decl | ||
9 | +#include FT_GLYPH_H | ||
10 | #include "gmem.h" | ||
11 | #include "SplashMath.h" | ||
12 | #include "SplashGlyphBitmap.h" | ||
13 | @@ -25,11 +26,12 @@ | ||
14 | |||
15 | //------------------------------------------------------------------------ | ||
16 | |||
17 | -static int glyphPathMoveTo(FT_Vector *pt, void *path); | ||
18 | -static int glyphPathLineTo(FT_Vector *pt, void *path); | ||
19 | -static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path); | ||
20 | -static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2, | ||
21 | - FT_Vector *pt, void *path); | ||
22 | +static int glyphPathMoveTo( const FT_Vector *pt, void *path); | ||
23 | +static int glyphPathLineTo( const FT_Vector *pt, void *path); | ||
24 | +static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt, | ||
25 | + void* path ); | ||
26 | +static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2, | ||
27 | + const FT_Vector *pt, void *path); | ||
28 | |||
29 | //------------------------------------------------------------------------ | ||
30 | // SplashFTFont | ||
31 | @@ -210,7 +212,7 @@ | ||
32 | }; | ||
33 | |||
34 | SplashPath *SplashFTFont::getGlyphPath(int c) { | ||
35 | - static FT_Outline_Funcs outlineFuncs = { | ||
36 | + static const FT_Outline_Funcs outlineFuncs = { | ||
37 | &glyphPathMoveTo, | ||
38 | &glyphPathLineTo, | ||
39 | &glyphPathConicTo, | ||
40 | @@ -249,7 +251,7 @@ | ||
41 | return path.path; | ||
42 | } | ||
43 | |||
44 | -static int glyphPathMoveTo(FT_Vector *pt, void *path) { | ||
45 | +static int glyphPathMoveTo( const FT_Vector *pt, void *path) { | ||
46 | SplashFTFontPath *p = (SplashFTFontPath *)path; | ||
47 | |||
48 | if (p->needClose) { | ||
49 | @@ -260,7 +262,7 @@ | ||
50 | return 0; | ||
51 | } | ||
52 | |||
53 | -static int glyphPathLineTo(FT_Vector *pt, void *path) { | ||
54 | +static int glyphPathLineTo(const FT_Vector *pt, void *path) { | ||
55 | SplashFTFontPath *p = (SplashFTFontPath *)path; | ||
56 | |||
57 | p->path->lineTo(pt->x / 64.0, -pt->y / 64.0); | ||
58 | @@ -268,7 +270,7 @@ | ||
59 | return 0; | ||
60 | } | ||
61 | |||
62 | -static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) { | ||
63 | +static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path) { | ||
64 | SplashFTFontPath *p = (SplashFTFontPath *)path; | ||
65 | SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc; | ||
66 | |||
67 | @@ -306,8 +308,8 @@ | ||
68 | return 0; | ||
69 | } | ||
70 | |||
71 | -static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2, | ||
72 | - FT_Vector *pt, void *path) { | ||
73 | +static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2, | ||
74 | + const FT_Vector *pt, void *path) { | ||
75 | SplashFTFontPath *p = (SplashFTFontPath *)path; | ||
76 | |||
77 | p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0, |