slight change to the smooth renderer to make it compile stand alone with the _STANDALONE_ macro defined.. See comments inside it "src/base/ftgrays.c"
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
diff --git a/include/freetype/ftgrays.h b/include/freetype/ftgrays.h
index 676f272..feb7484 100644
--- a/include/freetype/ftgrays.h
+++ b/include/freetype/ftgrays.h
@@ -22,7 +22,11 @@
extern "C" {
#endif
+#ifdef _STANDALONE_
+#include "ftimage.h"
+#else
#include <freetype/ftimage.h>
+#endif
/*************************************************************************/
/* */
diff --git a/src/base/ftgrays.c b/src/base/ftgrays.c
index 2ebf248..23edeef 100644
--- a/src/base/ftgrays.c
+++ b/src/base/ftgrays.c
@@ -17,6 +17,34 @@
/*************************************************************************/
/* */
+ /* This file can be compiled without the rest of the FreeType engine, */
+ /* by defining the _STANDALONE_ macro when compiling it. You also need */
+ /* to put the files "ftgrays.h" and "ftimage.h" in the current */
+ /* compilation directory. Typically, you could do something like: */
+ /* */
+ /* - copy "src/base/ftgrays.c" to your current directory */
+ /* */
+ /* - copy "include/freetype/ftimage.h" and */
+ /* "include/freetype/ftgrays.h" to the same directory */
+ /* */
+ /* - compile the "ftgrays" with the _STANDALONE_ macro defined, as in: */
+ /* */
+ /* cc -c -D_STANDALONE_ ftgrays.c */
+ /* */
+ /* - the renderer can be initialised with a call to: */
+ /* */
+ /* ft_grays_raster.init */
+ /* */
+ /* - an anti-aliased bitmap can be generated with a call to: */
+ /* */
+ /* ft_grays_raster.render */
+ /* */
+ /* See the comments and documentation in the file "ftimage.h" for */
+ /* more details on how the raster works.. */
+ /* */
+
+ /*************************************************************************/
+ /* */
/* This is a new anti-aliasing scan-converter for FreeType 2. The */
/* algorithm used here is _very_ different from the one in the standard */
/* `ftraster' module. Actually, `ftgrays' computes the _exact_ */
@@ -56,14 +84,22 @@
/*************************************************************************/
-#include <freetype/ftgrays.h>
#include <string.h> /* for memcpy() */
#define ErrRaster_Invalid_Outline -1
#ifdef _STANDALONE_
-#error "implementation of FT_Outline_Decompose missing!"
+
+#include "ftimage.h"
+#include "ftgrays.h"
+/* this macro is used to indicate that a function parameter is unused */
+/* its purpose is simply to reduce compiler warnings. Note also that */
+/* simply defining it as "(void)x" doesn't avoid warnings with certain */
+/* ANSI compilers, like LCC */
+#define UNUSED(x) (x)=(x)
+
#else
+#include <freetype/ftgrays.h>
#include <freetype/internal/ftobjs.h> /* for UNUSED() */
#include <freetype/freetype.h> /* to link to FT_Outline_Decompose() */
#endif
@@ -1365,6 +1401,210 @@
}
+#ifdef _STANDALONE_
+ /************************************************************************
+ *
+ * The Following function should only compile in stand_alone mode,
+ * i.e. when building this component without the rest of FreeType.
+ *
+ *
+ *
+ *
+ *
+ */
+ static int FT_Outline_Decompose( FT_Outline* outline,
+ FT_Outline_Funcs* interface,
+ void* user )
+ {
+#undef SCALED
+#define SCALED( x ) ( ((x) << shift) - delta )
+
+ FT_Vector v_last;
+ FT_Vector v_control;
+ FT_Vector v_start;
+
+ FT_Vector* point;
+ FT_Vector* limit;
+ char* tags;
+
+ int n; /* index of contour in outline */
+ int first; /* index of first point in contour */
+ int error;
+ char tag; /* current point's state */
+
+ int shift = interface->shift;
+ FT_Pos delta = interface->delta;
+
+ first = 0;
+
+ for ( n = 0; n < outline->n_contours; n++ )
+ {
+ int last; /* index of last point in contour */
+
+ last = outline->contours[n];
+ limit = outline->points + last;
+
+ v_start = outline->points[first];
+ v_last = outline->points[last];
+
+ v_start.x = SCALED(v_start.x); v_start.y = SCALED(v_start.y);
+ v_last.x = SCALED(v_last.x); v_last.y = SCALED(v_last.y);
+
+ v_control = v_start;
+
+ point = outline->points + first;
+ tags = outline->tags + first;
+ tag = FT_CURVE_TAG( tags[0] );
+
+ /* A contour cannot start with a cubic control point! */
+ if ( tag == FT_Curve_Tag_Cubic )
+ goto Invalid_Outline;
+
+ /* check first point to determine origin */
+ if ( tag == FT_Curve_Tag_Conic )
+ {
+ /* first point is conic control. Yes, this happens. */
+ if ( FT_CURVE_TAG( outline->tags[last] ) == FT_Curve_Tag_On )
+ {
+ /* start at last point if it is on the curve */
+ v_start = v_last;
+ limit--;
+ }
+ else
+ {
+ /* if both first and last points are conic, */
+ /* start at their middle and record its position */
+ /* for closure */
+ v_start.x = ( v_start.x + v_last.x ) / 2;
+ v_start.y = ( v_start.y + v_last.y ) / 2;
+
+ v_last = v_start;
+ }
+ point--;
+ tags--;
+ }
+
+ error = interface->move_to( &v_start, user );
+ if (error) goto Exit;
+
+ while (point < limit)
+ {
+ point++;
+ tags++;
+
+ tag = FT_CURVE_TAG( tags[0] );
+ switch (tag)
+ {
+ case FT_Curve_Tag_On: /* emit a single line_to */
+ {
+ FT_Vector vec;
+
+ vec.x = SCALED(point->x);
+ vec.y = SCALED(point->y);
+
+ error = interface->line_to( &vec, user );
+ if (error) goto Exit;
+ continue;
+ }
+
+
+ case FT_Curve_Tag_Conic: /* consume conic arcs */
+ {
+ v_control.x = SCALED(point->x);
+ v_control.y = SCALED(point->y);
+
+ Do_Conic:
+ if (point < limit)
+ {
+ FT_Vector vec;
+ FT_Vector v_middle;
+
+ point++;
+ tags++;
+ tag = FT_CURVE_TAG( tags[0] );
+
+ vec.x = SCALED(point->x);
+ vec.y = SCALED(point->y);
+
+ if (tag == FT_Curve_Tag_On)
+ {
+ error = interface->conic_to( &v_control, &vec, user );
+ if (error) goto Exit;
+ continue;
+ }
+
+ if (tag != FT_Curve_Tag_Conic)
+ goto Invalid_Outline;
+
+ v_middle.x = (v_control.x + vec.x)/2;
+ v_middle.y = (v_control.y + vec.y)/2;
+
+ error = interface->conic_to( &v_control, &v_middle, user );
+ if (error) goto Exit;
+
+ v_control = vec;
+ goto Do_Conic;
+ }
+
+ error = interface->conic_to( &v_control, &v_start, user );
+ goto Close;
+ }
+
+ default: /* FT_Curve_Tag_Cubic */
+ {
+ FT_Vector vec1, vec2;
+
+ if ( point+1 > limit ||
+ FT_CURVE_TAG( tags[1] ) != FT_Curve_Tag_Cubic )
+ goto Invalid_Outline;
+
+ point += 2;
+ tags += 2;
+
+ vec1.x = SCALED(point[-2].x); vec1.y = SCALED(point[-2].y);
+ vec2.x = SCALED(point[-1].x); vec2.y = SCALED(point[-1].y);
+
+ if (point <= limit)
+ {
+ FT_Vector vec;
+
+ vec.x = SCALED(point->x);
+ vec.y = SCALED(point->y);
+
+ error = interface->cubic_to( &vec1, &vec2, &vec, user );
+ if (error) goto Exit;
+ continue;
+ }
+
+ error = interface->cubic_to( &vec1, &vec2, &v_start, user );
+ goto Close;
+ }
+ }
+ }
+
+ /* close the contour with a line segment */
+ error = interface->line_to( &v_start, user );
+
+ Close:
+ if (error) goto Exit;
+ first = last+1;
+ }
+
+ return 0;
+ Exit:
+ return error;
+
+ Invalid_Outline:
+ return -1;
+ }
+#endif /* _STANDALONE_ */
+
+
+
+
+
+
+
typedef struct TBand_
{
FT_Pos min, max;
@@ -1564,12 +1804,13 @@
int grays_raster_new( void* memory,
FT_Raster* araster )
{
- static FT_RasterRec_ the_raster;
+ static TRaster the_raster;
-
- *araster = &the_raster;
- memset( &the_raster, sizeof ( the_raster ), 0 );
- return 0;
+ UNUSED(memory);
+
+ *araster = (FT_Raster)&the_raster;
+ memset( &the_raster, 0, sizeof(the_raster) );
+ return 0;
}