Commit b51a58fae619235029c1ca5ecd7ff1f18669c9fe
2000-06-23T11:36:51
added a few missing commits !!
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
diff --git a/demos/src/ftstring.c b/demos/src/ftstring.c
index 726324d..6b0558d 100644
--- a/demos/src/ftstring.c
+++ b/demos/src/ftstring.c
@@ -24,8 +24,6 @@
#include "graph.h"
#include "grfont.h"
-#include <freetype/ftgrays.h>
-
#define DIM_X 500
#define DIM_Y 400
diff --git a/demos/src/fttimer.c b/demos/src/fttimer.c
index 4042f5f..77d1367 100644
--- a/demos/src/fttimer.c
+++ b/demos/src/fttimer.c
@@ -28,7 +28,6 @@
#include <time.h> /* for clock() */
#include "graph.h"
-#include <freetype/ftgrays.h>
/* SunOS 4.1.* does not define CLOCKS_PER_SEC, so include <sys/param.h> */
/* to get the HZ macro which is the equivalent. */
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 24914d5..f5b5a0b 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -1352,6 +1352,86 @@
} TT_FaceRec;
+
+
+ /************************************************************************
+ *
+ * <Struct>
+ * TT_GlyphZone
+ *
+ * <Description>
+ * A glyph zone is used to load, scale and hint glyph outline
+ * coordinates.
+ *
+ * <Fields>
+ * memory :: handle to memory manager
+ * max_points :: max size in points of zone
+ * max_contours :: max size in contours of zone
+ * n_points :: current number of points in zone
+ * n_contours :: current number of contours in zone
+ * org :: original glyph coordinates (font units/scaled)
+ * cur :: current glyph coordinates (scaled/hinted)
+ * tags :: point control tags
+ * contours :: contour end points
+ *
+ ***********************************************************************/
+
+ typedef struct TT_GlyphZone_
+ {
+ FT_Memory memory;
+ FT_UShort max_points;
+ FT_UShort max_contours;
+ FT_UShort n_points; /* number of points in zone */
+ FT_Short n_contours; /* number of contours */
+
+ FT_Vector* org; /* original point coordinates */
+ FT_Vector* cur; /* current point coordinates */
+
+ FT_Byte* tags; /* current touch flags */
+ FT_UShort* contours; /* contour end points */
+
+ } TT_GlyphZone;
+
+
+ /* handle to execution context */
+ typedef struct TT_ExecContextRec_* TT_ExecContext;
+
+ /* glyph loader structure */
+ typedef struct TT_Loader_
+ {
+ FT_Face face;
+ FT_Size size;
+ FT_GlyphSlot glyph;
+ FT_GlyphLoader* gloader;
+
+ FT_ULong load_flags;
+ FT_UInt glyph_index;
+
+ FT_Stream stream;
+ FT_Int byte_len;
+
+ FT_BBox bbox;
+ FT_Int left_bearing;
+ FT_Int advance;
+ FT_Bool preserve_pps;
+ FT_Vector pp1;
+ FT_Vector pp2;
+
+ FT_ULong glyf_offset;
+
+ /* the zone where we load our glyphs */
+ TT_GlyphZone base;
+ TT_GlyphZone zone;
+
+ TT_ExecContext exec;
+ FT_Byte* instructions;
+ FT_ULong ins_pos;
+
+ } TT_Loader;
+
+
+
+
#ifdef __cplusplus
}
#endif