diff options
Diffstat (limited to 'converter/other/pamtosvg')
| -rw-r--r-- | converter/other/pamtosvg/curve.c | 259 | ||||
| -rw-r--r-- | converter/other/pamtosvg/curve.h | 109 | ||||
| -rw-r--r-- | converter/other/pamtosvg/fit.c | 216 |
3 files changed, 306 insertions, 278 deletions
diff --git a/converter/other/pamtosvg/curve.c b/converter/other/pamtosvg/curve.c index 0785dde5..5c9c7157 100644 --- a/converter/other/pamtosvg/curve.c +++ b/converter/other/pamtosvg/curve.c @@ -25,7 +25,7 @@ static Point -int_to_real_coord(pm_pixelcoord const int_coord) { +realCoordFromInt(pm_pixelcoord const int_coord) { /*---------------------------------------------------------------------------- Turn an integer point into a real one. -----------------------------------------------------------------------------*/ @@ -40,48 +40,50 @@ int_to_real_coord(pm_pixelcoord const int_coord) { -/* Return an entirely empty curve. */ - -curve * -new_curve(void) { - curve * curveP; +Curve * +curve_new(void) { +/*---------------------------------------------------------------------------- + A new, entirely empty curve. +-----------------------------------------------------------------------------*/ + Curve * curveP; - MALLOCVAR_NOFAIL(curveP); + MALLOCVAR_NOFAIL(curveP); - curveP->point_list = NULL; - CURVE_LENGTH(curveP) = 0; - CURVE_CYCLIC(curveP) = false; - PREVIOUS_CURVE(curveP) = NULL; - NEXT_CURVE(curveP) = NULL; + curveP->pointList = NULL; + CURVE_LENGTH(curveP) = 0; + CURVE_CYCLIC(curveP) = false; + PREVIOUS_CURVE(curveP) = NULL; + NEXT_CURVE(curveP) = NULL; - return curveP; + return curveP; } -/* Don't copy the points or tangents, but copy everything else. */ +Curve * +curve_copyMost(Curve * const oldCurveP) { +/*---------------------------------------------------------------------------- + New curve that is the same as *curveP, except without any points. -curve_type -copy_most_of_curve (curve_type old_curve) -{ - curve_type curve = new_curve (); + Don't copy the points or tangents, but copy everything else. +-----------------------------------------------------------------------------*/ + Curve * curveP = curve_new(); - CURVE_CYCLIC (curve) = CURVE_CYCLIC (old_curve); - PREVIOUS_CURVE (curve) = PREVIOUS_CURVE (old_curve); - NEXT_CURVE (curve) = NEXT_CURVE (old_curve); + CURVE_CYCLIC(curveP) = CURVE_CYCLIC(oldCurveP); + PREVIOUS_CURVE(curveP) = PREVIOUS_CURVE(oldCurveP); + NEXT_CURVE(curveP) = NEXT_CURVE(oldCurveP); - return curve; + return curveP; } void -move_curve(curve * const dstP, - curve * const srcP) { - - /* Move ownership of dynamically allocated memory from source - to destination; destroy source. - */ - +curve_move(Curve * const dstP, + Curve * const srcP) { +/*---------------------------------------------------------------------------- + Move ownership of dynamically allocated memory from source to destination; + destroy source. +-----------------------------------------------------------------------------*/ if (CURVE_LENGTH(dstP) > 0) - free(dstP->point_list); + free(dstP->pointList); *dstP = *srcP; @@ -90,62 +92,69 @@ move_curve(curve * const dstP, -/* The length of CURVE will be zero if we ended up not being able to fit - it (which in turn implies a problem elsewhere in the program, but at - any rate, we shouldn't try here to free the nonexistent curve). */ - void -free_curve(curve * const curveP) { +curve_free(Curve * const curveP) { - if (CURVE_LENGTH(curveP) > 0) - free(curveP->point_list); + /* The length of CURVE will be zero if we ended up not being able to fit + it (which in turn implies a problem elsewhere in the program, but at + any rate, we shouldn't try here to free the nonexistent curve). + */ - free(curveP); + if (CURVE_LENGTH(curveP) > 0) + free(curveP->pointList); + + free(curveP); } void -append_point(curve_type const curve, - Point const coord) { - - CURVE_LENGTH(curve)++; - REALLOCARRAY_NOFAIL(curve->point_list, CURVE_LENGTH(curve)); - LAST_CURVE_POINT(curve) = coord; +curve_appendPoint(Curve * const curveP, + Point const coord) { +/*---------------------------------------------------------------------------- + Like `append_pixel', for a point in real coordinates. +-----------------------------------------------------------------------------*/ + CURVE_LENGTH(curveP)++; + REALLOCARRAY_NOFAIL(curveP->pointList, CURVE_LENGTH(curveP)); + LAST_CURVE_POINT(curveP) = coord; /* The t value does not need to be set. */ } -void -append_pixel(curve_type const curve, - pm_pixelcoord const coord) { - append_point(curve, int_to_real_coord(coord)); +void +curve_appendPixel(Curve * const curveP, + pm_pixelcoord const coord) { +/*---------------------------------------------------------------------------- + Append the point 'coord' to the end of *curveP's list. +-----------------------------------------------------------------------------*/ + curve_appendPoint(curveP, realCoordFromInt(coord)); } -/* Print a curve in human-readable form. It turns out we never care - about most of the points on the curve, and so it is pointless to - print them all out umpteen times. What matters is that we have some - from the end and some from the beginning. */ #define NUM_TO_PRINT 3 -#define LOG_CURVE_POINT(c, p, print_t) \ - do \ - { \ - LOG2 ("(%.3f,%.3f)", CURVE_POINT (c, p).x, CURVE_POINT (c, p).y); \ - if (print_t) \ - LOG1 ("/%.2f", CURVE_T (c, p)); \ - } \ +#define LOG_CURVE_POINT(c, p, printDistance) \ + do \ + { \ + LOG2 ("(%.3f,%.3f)", CURVE_POINT (c, p).x, CURVE_POINT (c, p).y); \ + if (printDistance) \ + LOG1 ("/%.2f", CURVE_DIST(c, p)); \ + } \ while (0) void -log_curve(curve * const curveP, - bool const print_t) { - +curve_log(Curve * const curveP, + bool const printDistance) { +/*---------------------------------------------------------------------------- + Print a curve in human-readable form. It turns out we never care + about most of the points on the curve, and so it is pointless to + print them all out umpteen times. What matters is that we have some + from the end and some from the beginning. +-----------------------------------------------------------------------------*/ if (!log_file) return; @@ -161,7 +170,7 @@ log_curve(curve * const curveP, unsigned int thisPoint; for (thisPoint = 0; thisPoint < CURVE_LENGTH(curveP); ++thisPoint) { - LOG_CURVE_POINT(curveP, thisPoint, print_t); + LOG_CURVE_POINT(curveP, thisPoint, printDistance); LOG(" "); if (thisPoint != CURVE_LENGTH(curveP) - 1 @@ -173,7 +182,7 @@ log_curve(curve * const curveP, for (thisPoint = 0; thisPoint < NUM_TO_PRINT && thisPoint < CURVE_LENGTH(curveP); ++thisPoint) { - LOG_CURVE_POINT(curveP, thisPoint, print_t); + LOG_CURVE_POINT(curveP, thisPoint, printDistance); LOG(" "); } @@ -183,18 +192,19 @@ log_curve(curve * const curveP, thisPoint < CURVE_LENGTH(curveP); ++thisPoint) { LOG(" "); - LOG_CURVE_POINT(curveP, thisPoint, print_t); + LOG_CURVE_POINT(curveP, thisPoint, printDistance); } } LOG(".\n"); } -/* Like `log_curve', but write the whole thing. */ void -log_entire_curve(curve * const curveP) { - +curve_logEntire(Curve * const curveP) { +/*---------------------------------------------------------------------------- + Like `log_curve', but write the whole thing. +-----------------------------------------------------------------------------*/ unsigned int thisPoint; if (!log_file) @@ -218,93 +228,106 @@ log_entire_curve(curve * const curveP) { -/* Return an initialized but empty curve list. */ -curve_list_type -new_curve_list (void) -{ - curve_list_type curve_list; +CurveList +curve_newList(void) { +/*---------------------------------------------------------------------------- + A new initialized but empty curve list. +-----------------------------------------------------------------------------*/ + CurveList curveList; - curve_list.length = 0; - curve_list.data = NULL; + curveList.length = 0; + curveList.data = NULL; - return curve_list; + return curveList; } -/* Free a curve list and all the curves it contains. */ void -free_curve_list(curve_list_type * const curveListP) { - +curve_freeList(CurveList * const curveListP) { +/*---------------------------------------------------------------------------- + Free curve list and all the curves it contains. +-----------------------------------------------------------------------------*/ unsigned int thisCurve; for (thisCurve = 0; thisCurve < curveListP->length; ++thisCurve) - free_curve(curveListP->data[thisCurve]); + curve_free(curveListP->data[thisCurve]); /* If the character was empty, it won't have any curves. */ if (curveListP->data != NULL) - free (curveListP->data); + free(curveListP->data); } -/* Add an element to a curve list. */ void -append_curve (curve_list_type *curve_list, curve_type curve) -{ - curve_list->length++; - REALLOCARRAY_NOFAIL(curve_list->data, curve_list->length); - curve_list->data[curve_list->length - 1] = curve; } +curve_appendList(CurveList * const curveListP, + Curve * const curveP) { +/*---------------------------------------------------------------------------- + Add an element to a curve list. +-----------------------------------------------------------------------------*/ + ++curveListP->length; + REALLOCARRAY_NOFAIL(curveListP->data, curveListP->length); + curveListP->data[curveListP->length - 1] = curveP; +} -/* Return an initialized but empty curve list array. */ -curve_list_array_type -new_curve_list_array (void) -{ - curve_list_array_type curve_list_array; +CurveListArray +curve_newListArray(void) { +/*---------------------------------------------------------------------------- + An initialized but empty curve list array. +-----------------------------------------------------------------------------*/ + CurveListArray curveListArray; - CURVE_LIST_ARRAY_LENGTH (curve_list_array) = 0; - curve_list_array.data = NULL; + CURVE_LIST_ARRAY_LENGTH(curveListArray) = 0; + curveListArray.data = NULL; - return curve_list_array; + return curveListArray; } -/* Free a curve list array and all the curve lists it contains. */ void -free_curve_list_array(const curve_list_array_type * const curve_list_array, - at_progress_func notify_progress, - void * const client_data) { +curve_freeListArray(const CurveListArray * const curveListArrayP, + at_progress_func notify_progress, + void * const clientData) { +/*---------------------------------------------------------------------------- + Free all the curve lists curveListArray contains. +-----------------------------------------------------------------------------*/ + unsigned int thisList; - unsigned this_list; + for (thisList = 0; + thisList < CURVE_LIST_ARRAY_LENGTH(*curveListArrayP); + ++thisList) { - for (this_list = 0; this_list < CURVE_LIST_ARRAY_LENGTH(*curve_list_array); - this_list++) { if (notify_progress) - notify_progress(((float)this_list)/ - (CURVE_LIST_ARRAY_LENGTH(*curve_list_array) * + notify_progress(((float)thisList)/ + (CURVE_LIST_ARRAY_LENGTH(*curveListArrayP) * (float)3.0)+(float)0.666 , - client_data); - free_curve_list(&CURVE_LIST_ARRAY_ELT (*curve_list_array, this_list)); - } + clientData); + curve_freeList(&CURVE_LIST_ARRAY_ELT(*curveListArrayP, thisList)); + } - /* If the character was empty, it won't have any curves. */ - if (curve_list_array->data != NULL) - free(curve_list_array->data); + /* If the character was empty, it won't have any curves. */ + if (curveListArrayP->data) + free(curveListArrayP->data); } -/* Add an element to a curve list array. */ void -append_curve_list(curve_list_array_type * const curve_list_array, - curve_list_type const curve_list) { - - CURVE_LIST_ARRAY_LENGTH (*curve_list_array)++; - REALLOCARRAY_NOFAIL(curve_list_array->data, - CURVE_LIST_ARRAY_LENGTH(*curve_list_array)); - LAST_CURVE_LIST_ARRAY_ELT (*curve_list_array) = curve_list; +curve_appendArray(CurveListArray * const curveListArrayP, + CurveList const curveList) { +/*---------------------------------------------------------------------------- + Add an element to *curveListArrayP. +-----------------------------------------------------------------------------*/ + CURVE_LIST_ARRAY_LENGTH(*curveListArrayP)++; + REALLOCARRAY_NOFAIL(curveListArrayP->data, + CURVE_LIST_ARRAY_LENGTH(*curveListArrayP)); + LAST_CURVE_LIST_ARRAY_ELT(*curveListArrayP) = curveList; } + + + diff --git a/converter/other/pamtosvg/curve.h b/converter/other/pamtosvg/curve.h index c7845e7a..499e4f34 100644 --- a/converter/other/pamtosvg/curve.h +++ b/converter/other/pamtosvg/curve.h @@ -5,27 +5,34 @@ #include "autotrace.h" #include "point.h" -#include "vector.h" /* We are simultaneously manipulating two different representations of the same outline: one based on (x,y) positions in the plane, and one based on parametric splines. (We are trying to match the latter to the former.) Although the original (x,y)'s are pixel positions, - i.e., integers, after filtering they are reals. */ + i.e., integers, after filtering they are reals. +*/ typedef struct { +/*---------------------------------------------------------------------------- + A point in a curve (i.e. a component of a curve). +-----------------------------------------------------------------------------*/ Point coord; - float t; -} point_type; + /* Location in space of the point */ + float distance; + /* Distance point is along the curve, as a fraction of the + curve length + */ +} CurvePoint; -typedef struct curve { +typedef struct Curve { /*---------------------------------------------------------------------------- An ordered list of contiguous points in the raster, with no corners in it. I.e. something that could reasonably be fit to a spline. -----------------------------------------------------------------------------*/ - point_type * point_list; + CurvePoint * pointList; /* Array of the points in the curve. Malloc'ed. Size is 'length'. if 'length' is zero, this is meaningless and no memory is allocated. @@ -38,17 +45,15 @@ typedef struct curve { a chain of all curves in an outline. The chain is a cycle for a closed outline and linear for an open outline. */ - struct curve * previous; - struct curve * next; -} curve; - -typedef struct curve * curve_type; + struct Curve * previous; + struct Curve * next; +} Curve; /* Get at the coordinates and the t values. */ -#define CURVE_POINT(c, n) ((c)->point_list[n].coord) -#define LAST_CURVE_POINT(c) ((c)->point_list[(c)->length-1].coord) -#define CURVE_T(c, n) ((c)->point_list[n].t) -#define LAST_CURVE_T(c) ((c)->point_list[(c)->length-1].t) +#define CURVE_POINT(c, n) ((c)->pointList[n].coord) +#define LAST_CURVE_POINT(c) ((c)->pointList[(c)->length-1].coord) +#define CURVE_DIST(c, n) ((c)->pointList[n].distance) +#define LAST_CURVE_DIST(c) ((c)->pointList[(c)->length-1].distance) /* This is the length of `point_list'. */ #define CURVE_LENGTH(c) ((c)->length) @@ -73,44 +78,38 @@ typedef struct curve * curve_type; #define NEXT_CURVE(c) ((c)->next) -/* Return an entirely empty curve. */ -extern curve_type new_curve (void); +Curve * +curve_new(void); -/* Return a curve the same as C, except without any points. */ -extern curve_type copy_most_of_curve (curve_type c); +Curve * +curve_copyMost(Curve * const curveP); void -move_curve(curve * const dstP, - curve * const srcP); +curve_move(Curve * const dstP, + Curve * const srcP); void -free_curve(curve * const curveP); +curve_free(Curve * const curveP); -/* Like `append_pixel', for a point in real coordinates. */ void -append_point(curve_type const curve, - Point const coord); +curve_appendPoint(Curve * const curveP, + Point const coord); -/* Append the point P to the end of C's list. */ void -append_pixel(curve_type const c, - pm_pixelcoord const p); - -/* Write some or all, respectively, of the curve C in human-readable - form to the log file, if logging is enabled. */ -void log_curve (curve_type c, bool print_t); -void log_entire_curve (curve_type c); - -/* Display the curve C online, if displaying is enabled. */ -void display_curve (curve_type); - +curve_appendPixel(Curve * const curveP, + pm_pixelcoord const p); +void +curve_log(Curve * const curveP, + bool const print_t); +void +curve_logEntire(Curve * const curveP); typedef struct { /*---------------------------------------------------------------------------- An ordered list of contiguous curves of a particular color. -----------------------------------------------------------------------------*/ - curve ** data; + Curve ** data; /* data[i] is the handle of the ith curve in the list */ unsigned length; bool clockwise; @@ -119,7 +118,7 @@ typedef struct { /* The curve list does not form a closed shape; i.e. the last curve doesn't end where the first one starts. */ -} curve_list_type; +} CurveList; /* Number of curves in the list. */ #define CURVE_LIST_LENGTH(c_l) ((c_l).length) @@ -134,21 +133,23 @@ typedef struct { #define CURVE_LIST_CLOCKWISE(c_l) ((c_l).clockwise) -curve_list_type new_curve_list (void); +CurveList +curve_newList(void); void -free_curve_list(curve_list_type * const curve_list); +curve_freeList(CurveList * const curveListP); -void append_curve (curve_list_type *, curve_type); +void +curve_appendList(CurveList * const curveListP, + Curve * const curveP); /* And a character is a list of outlines. I named this `curve_list_array_type' because `curve_list_list_type' seemed pretty monstrous. */ -typedef struct -{ - curve_list_type *data; - unsigned length; -} curve_list_array_type; +typedef struct { + CurveList * data; + unsigned length; +} CurveListArray; /* Turns out we can use the same definitions for lists of lists as for just lists. But we define the usual names, just in case. */ @@ -156,16 +157,16 @@ typedef struct #define CURVE_LIST_ARRAY_ELT CURVE_LIST_ELT #define LAST_CURVE_LIST_ARRAY_ELT LAST_CURVE_LIST_ELT -curve_list_array_type -new_curve_list_array(void); +CurveListArray +curve_newListArray(void); void -free_curve_list_array(const curve_list_array_type * const curve_list_array, - at_progress_func notify_progress, - void * const client_data); +curve_freeListArray(const CurveListArray * const curveListArrayP, + at_progress_func notify_progress, + void * const client_data); void -append_curve_list(curve_list_array_type * const curve_list_array, - curve_list_type const curve_list); +curve_appendArray(CurveListArray * const curveListArrayP, + CurveList const curveList); #endif diff --git a/converter/other/pamtosvg/fit.c b/converter/other/pamtosvg/fit.c index 0d8fe534..689f3128 100644 --- a/converter/other/pamtosvg/fit.c +++ b/converter/other/pamtosvg/fit.c @@ -413,17 +413,18 @@ removeAdjacentCorners(IndexList * const listP, static void -remove_knee_points(curve * const curveP, +remove_knee_points(Curve * const curveP, bool const clockwise) { unsigned int const offset = CURVE_CYCLIC(curveP) ? 0 : 1; - curve * const trimmedCurveP = copy_most_of_curve(curveP); + Curve * const trimmedCurveP = curve_copyMost(curveP); pm_pixelcoord previous; unsigned int i; if (!CURVE_CYCLIC(curveP)) - append_pixel(trimmedCurveP, intCoordFmReal(CURVE_POINT(curveP, 0))); + curve_appendPixel(trimmedCurveP, + intCoordFmReal(CURVE_POINT(curveP, 0))); previous = intCoordFmReal(CURVE_POINT(curveP, CURVE_PREV(curveP, offset))); @@ -443,26 +444,26 @@ remove_knee_points(curve * const curveP, LOG2(" (%d,%d)", current.col, current.row); else { previous = current; - append_pixel(trimmedCurveP, current); + curve_appendPixel(trimmedCurveP, current); } } if (!CURVE_CYCLIC(curveP)) - append_pixel(trimmedCurveP, - intCoordFmReal(LAST_CURVE_POINT(curveP))); + curve_appendPixel(trimmedCurveP, + intCoordFmReal(LAST_CURVE_POINT(curveP))); if (CURVE_LENGTH(trimmedCurveP) == CURVE_LENGTH(curveP)) LOG(" (none)"); LOG(".\n"); - move_curve(curveP, trimmedCurveP); + curve_move(curveP, trimmedCurveP); } static void -filter(curve * const curveP, +filter(Curve * const curveP, fitting_opts_type * const fittingOptsP) { /*---------------------------------------------------------------------------- Smooth the curve by adding in neighboring points. Do this @@ -490,7 +491,7 @@ filter(curve * const curveP, for (iteration = 0; iteration < fittingOptsP->filter_iterations; ++iteration) { - curve * const newcurveP = copy_most_of_curve(curveP); + Curve * const newcurveP = curve_copyMost(curveP); bool collapsed; @@ -498,7 +499,7 @@ filter(curve * const curveP, /* Keep the first point on the curve. */ if (offset) - append_point(newcurveP, CURVE_POINT(curveP, 0)); + curve_appendPoint(newcurveP, CURVE_POINT(curveP, 0)); for (thisPoint = offset; thisPoint < CURVE_LENGTH(curveP) - offset; @@ -565,25 +566,25 @@ filter(curve * const curveP, /* Put the newly computed point into a separate curve, so it doesn't affect future computation (on this iteration). */ - append_point(newcurveP, prevNewPoint = newPoint); + curve_appendPoint(newcurveP, prevNewPoint = newPoint); } if (collapsed) - free_curve(newcurveP); + curve_free(newcurveP); else { /* Just as with the first point, we have to keep the last point. */ if (offset) - append_point(newcurveP, LAST_CURVE_POINT(curveP)); + curve_appendPoint(newcurveP, LAST_CURVE_POINT(curveP)); /* Set the original curve to the newly filtered one, and go again. */ - move_curve(curveP, newcurveP); + curve_move(curveP, newcurveP); } } - log_curve(curveP, false); + curve_log(curveP, false); } @@ -716,19 +717,19 @@ cleanup: static void makeOutlineOneCurve(pixel_outline_type const outline, - curve_list_type * const curveListP) { + CurveList * const curveListP) { /*---------------------------------------------------------------------------- Add to *curveListP a single curve that represents the outline 'outline'. That curve does not have beginning and ending slope information. -----------------------------------------------------------------------------*/ - curve * curveP; + Curve * curveP; unsigned int pixelSeq; - curveP = new_curve(); + curveP = curve_new(); for (pixelSeq = 0; pixelSeq < O_LENGTH(outline); ++pixelSeq) - append_pixel(curveP, O_COORDINATE(outline, pixelSeq)); + curve_appendPixel(curveP, O_COORDINATE(outline, pixelSeq)); if (outline.open) CURVE_CYCLIC(curveP) = false; @@ -739,7 +740,7 @@ makeOutlineOneCurve(pixel_outline_type const outline, NEXT_CURVE(curveP) = curveP; PREVIOUS_CURVE(curveP) = curveP; - append_curve(curveListP, curveP); + curve_appendList(curveListP, curveP); } @@ -748,8 +749,8 @@ static void addCurveStartingAtCorner(pixel_outline_type const outline, IndexList const cornerList, unsigned int const cornerSeq, - curve_list_type * const curveListP, - curve ** const curCurvePP) { + CurveList * const curveListP, + Curve ** const curCurvePP) { /*---------------------------------------------------------------------------- Add to the list *curveListP a new curve that starts at the cornerSeq'th corner in outline 'outline' (whose corners are 'cornerList') and @@ -763,7 +764,7 @@ addCurveStartingAtCorner(pixel_outline_type const outline, unsigned int const cornerPixelSeq = GET_INDEX(cornerList, cornerSeq); unsigned int lastPixelSeq; - curve * curveP; + Curve * curveP; unsigned int pixelSeq; if (cornerSeq + 1 >= cornerList.length) @@ -773,16 +774,16 @@ addCurveStartingAtCorner(pixel_outline_type const outline, /* Go through the next corner */ lastPixelSeq = GET_INDEX(cornerList, cornerSeq + 1); - curveP = new_curve(); + curveP = curve_new(); for (pixelSeq = cornerPixelSeq; pixelSeq <= lastPixelSeq; ++pixelSeq) - append_pixel(curveP, O_COORDINATE(outline, pixelSeq)); + curve_appendPixel(curveP, O_COORDINATE(outline, pixelSeq)); - append_curve(curveListP, curveP); + curve_appendList(curveListP, curveP); { /* Add the new curve to the outline chain */ - curve * const oldCurCurveP = *curCurvePP; + Curve * const oldCurCurveP = *curCurvePP; if (oldCurCurveP) { NEXT_CURVE(oldCurCurveP) = curveP; @@ -797,7 +798,7 @@ addCurveStartingAtCorner(pixel_outline_type const outline, static void divideOutlineWithCorners(pixel_outline_type const outline, IndexList const cornerList, - curve_list_type * const curveListP) { + CurveList * const curveListP) { /*---------------------------------------------------------------------------- Divide the outline 'outline' into curves at the corner points 'cornerList' and add each curve to *curveListP. @@ -821,7 +822,7 @@ divideOutlineWithCorners(pixel_outline_type const outline, unsigned int const firstCurveSeq = CURVE_LIST_LENGTH(*curveListP); /* Index in curve list of the first curve we add */ unsigned int cornerSeq; - curve * curCurveP; + Curve * curCurveP; /* Pointer to the curve we most recently added for this outline. Null if none */ @@ -834,15 +835,15 @@ divideOutlineWithCorners(pixel_outline_type const outline, /* Start with a curve that contains the points up to the first corner */ - curve * curveP; + Curve * curveP; unsigned int pixelSeq; - curveP = new_curve(); + curveP = curve_new(); for (pixelSeq = 0; pixelSeq <= GET_INDEX(cornerList, 0); ++pixelSeq) - append_pixel(curveP, O_COORDINATE(outline, pixelSeq)); + curve_appendPixel(curveP, O_COORDINATE(outline, pixelSeq)); - append_curve(curveListP, curveP); + curve_appendList(curveListP, curveP); curCurveP = curveP; /* Only curve in outline chain now */ } else { /* We'll pick up the pixels before the first corner at the end */ @@ -860,12 +861,12 @@ divideOutlineWithCorners(pixel_outline_type const outline, before the first corner to the last curve, and chain the last curve to the first one. */ - curve * const firstCurveP = CURVE_LIST_ELT(*curveListP, firstCurveSeq); + Curve * const firstCurveP = CURVE_LIST_ELT(*curveListP, firstCurveSeq); unsigned int pixelSeq; for (pixelSeq = 0; pixelSeq <= GET_INDEX(cornerList, 0); ++pixelSeq) - append_pixel(curCurveP, O_COORDINATE(outline, pixelSeq)); + curve_appendPixel(curCurveP, O_COORDINATE(outline, pixelSeq)); NEXT_CURVE(curCurveP) = firstCurveP; PREVIOUS_CURVE(firstCurveP) = curCurveP; @@ -874,7 +875,7 @@ divideOutlineWithCorners(pixel_outline_type const outline, -static curve_list_array_type +static CurveListArray split_at_corners(pixel_outline_list_type const pixelList, fitting_opts_type * const fittingOptsP, at_exception_type * const exception) { @@ -907,9 +908,9 @@ split_at_corners(pixel_outline_list_type const pixelList, information. -----------------------------------------------------------------------------*/ unsigned outlineSeq; - curve_list_array_type curveArray; + CurveListArray curveArray; - curveArray = new_curve_list_array(); + curveArray = curve_newListArray(); LOG("\nFinding corners:\n"); @@ -920,10 +921,10 @@ split_at_corners(pixel_outline_list_type const pixelList, pixel_outline_type const outline = O_LIST_OUTLINE(pixelList, outlineSeq); - IndexList cornerList; - curve_list_type curveList; + IndexList cornerList; + CurveList curveList; - curveList = new_curve_list(); + curveList = curve_newList(); CURVE_LIST_CLOCKWISE(curveList) = O_CLOCKWISE(outline); curveList.color = outline.color; @@ -964,7 +965,7 @@ split_at_corners(pixel_outline_list_type const pixelList, indexList_free(&cornerList); /* And now add the just-completed curve list to the array. */ - append_curve_list(&curveArray, curveList); + curve_appendArray(&curveArray, curveList); } return curveArray; @@ -973,7 +974,7 @@ split_at_corners(pixel_outline_list_type const pixelList, static void -removeKnees(curve_list_type const curveList) { +removeKnees(CurveList const curveList) { /*---------------------------------------------------------------------------- Remove the extraneous ``knee'' points before filtering. Since the corners have already been found, we don't need to worry about @@ -993,7 +994,7 @@ removeKnees(curve_list_type const curveList) { static void -computePointWeights(curve_list_type const curveList, +computePointWeights(CurveList const curveList, fitting_opts_type * const fittingOptsP, distance_map_type * const distP) { @@ -1002,12 +1003,14 @@ computePointWeights(curve_list_type const curveList, unsigned int curveSeq; for (curveSeq = 0; curveSeq < curveList.length; ++curveSeq) { + Curve * const curveP = CURVE_LIST_ELT(curveList, curveSeq); + unsigned pointSeq; - curve_type const curve = CURVE_LIST_ELT(curveList, curveSeq); - for (pointSeq = 0; pointSeq < CURVE_LENGTH(curve); ++pointSeq) { - Point * const coordP = &CURVE_POINT(curve, pointSeq); - unsigned int x = coordP->x; - unsigned int y = height - (unsigned int)coordP->y - 1; + + for (pointSeq = 0; pointSeq < CURVE_LENGTH(curveP); ++pointSeq) { + Point * const coordP = &CURVE_POINT(curveP, pointSeq); + unsigned int const x = coordP->x; + unsigned int const y = height - (unsigned int)coordP->y - 1; float width, w; @@ -1049,7 +1052,7 @@ computePointWeights(curve_list_type const curveList, static void -filterCurves(curve_list_type const curveList, +filterCurves(CurveList const curveList, fitting_opts_type * const fittingOptsP) { unsigned int curveSeq; @@ -1142,7 +1145,7 @@ changeBadLines(spline_list_type * const splineListP, static bool splineLinearEnough(spline_type * const splineP, - curve_type const curve, + Curve * const curve, const fitting_opts_type * const fittingOptsP) { /* Supposing that we have accepted the error, another question arises: @@ -1177,7 +1180,7 @@ splineLinearEnough(spline_type * const splineP, thisPoint < CURVE_LENGTH(curve); ++thisPoint) { - float const t = CURVE_T(curve, thisPoint); + float const t = CURVE_DIST(curve, thisPoint); Point const splinePoint = evaluate_spline(*splineP, t); float const a = splinePoint.x - BEG_POINT(*splineP).x; @@ -1218,16 +1221,16 @@ splineLinearEnough(spline_type * const splineP, /* Forward declaration for recursion */ static spline_list_type * -fitCurve(curve * const curveP, - Vector const begSlope, - Vector const endSlope, +fitCurve(Curve * const curveP, + Vector const begSlope, + Vector const endSlope, const fitting_opts_type * const fittingOptsP, at_exception_type * const exceptionP); static spline_list_type * -fitWithLine(curve * const curveP) { +fitWithLine(Curve * const curveP) { /*---------------------------------------------------------------------------- Return a list of splines that fit curve *curveP in a very simple way: a single spline which is a straight line through the first and last @@ -1262,7 +1265,7 @@ fitWithLine(curve * const curveP) { #define B3(t) CUBE (t) static spline_type -fitOneSpline(curve * const curveP, +fitOneSpline(Curve * const curveP, Vector const begSlope, Vector const endSlope, at_exception_type * const exceptionP) { @@ -1330,8 +1333,8 @@ fitOneSpline(curve * const curveP, endVector = vector_fromPoint(END_POINT(spline)); for (i = 0; i < CURVE_LENGTH(curveP); ++i) { - A[i].beg = vector_scaled(tang.beg, B1(CURVE_T(curveP, i))); - A[i].end = vector_scaled(tang.end, B2(CURVE_T(curveP, i))); + A[i].beg = vector_scaled(tang.beg, B1(CURVE_DIST(curveP, i))); + A[i].end = vector_scaled(tang.end, B2(CURVE_DIST(curveP, i))); } C.beg.beg = 0.0; C.beg.end = 0.0; C.end.end = 0.0; /* initial value */ @@ -1348,10 +1351,10 @@ fitOneSpline(curve * const curveP, C.end.end += vector_dotProduct(AP->end, AP->end); /* Now the right-hand side of the equation in the paper. */ - temp0 = vector_scaled(begVector, B0(CURVE_T(curveP, i))); - temp1 = vector_scaled(begVector, B1(CURVE_T(curveP, i))); - temp2 = vector_scaled(endVector, B2(CURVE_T(curveP, i))); - temp3 = vector_scaled(endVector, B3(CURVE_T(curveP, i))); + temp0 = vector_scaled(begVector, B0(CURVE_DIST(curveP, i))); + temp1 = vector_scaled(begVector, B1(CURVE_DIST(curveP, i))); + temp2 = vector_scaled(endVector, B2(CURVE_DIST(curveP, i))); + temp3 = vector_scaled(endVector, B3(CURVE_DIST(curveP, i))); temp = vector_fromPoint( vector_diffPoint( @@ -1407,7 +1410,7 @@ logSplineFit(spline_type const spline) { static Vector findHalfTangent(LineEnd const toWhichEnd, - curve * const curveP, + Curve * const curveP, unsigned int const tangentSurround) { /*---------------------------------------------------------------------------- Find the slope in the vicinity of one of the ends of the curve *curveP, @@ -1485,9 +1488,9 @@ findHalfTangent(LineEnd const toWhichEnd, static void -findTangent(curve * const curveP, +findTangent(Curve * const curveP, LineEnd const toWhichEnd, - curve * const adjacentCurveP, + Curve * const adjacentCurveP, unsigned int const tangentSurround, Vector * const tangentP) { /*---------------------------------------------------------------------------- @@ -1542,7 +1545,7 @@ findTangent(curve * const curveP, static void -findError(curve * const curveP, +findError(Curve * const curveP, spline_type const spline, float * const errorP, unsigned int * const worstPointP, @@ -1571,7 +1574,7 @@ findError(curve * const curveP, for (thisPoint = 0; thisPoint < CURVE_LENGTH(curveP); ++thisPoint) { Point const curvePoint = CURVE_POINT(curveP, thisPoint); - float const t = CURVE_T(curveP, thisPoint); + float const t = CURVE_DIST(curveP, thisPoint); Point const splinePoint = evaluate_spline(spline, t); float const thisError = distance(curvePoint, splinePoint); if (thisError >= worstError) { @@ -1601,7 +1604,7 @@ findError(curve * const curveP, static void -setCurvePointDistance(curve * const curveP) { +setCurvePointDistance(Curve * const curveP) { /*---------------------------------------------------------------------------- Fill in the 't' values in *curveP. @@ -1622,33 +1625,34 @@ setCurvePointDistance(curve * const curveP) { LOG("\nAssigning initial t values:\n "); - CURVE_T(curveP, 0) = 0.0; + CURVE_DIST(curveP, 0) = 0.0; for (p = 1; p < CURVE_LENGTH(curveP); ++p) { Point const point = CURVE_POINT(curveP, p); Point const previous_p = CURVE_POINT(curveP, p - 1); float const d = distance(point, previous_p); - CURVE_T(curveP, p) = CURVE_T(curveP, p - 1) + d; + CURVE_DIST(curveP, p) = CURVE_DIST(curveP, p - 1) + d; } - assert(LAST_CURVE_T(curveP) != 0.0); + assert(LAST_CURVE_DIST(curveP) != 0.0); /* Normalize to a curve length of 1.0 */ for (p = 1; p < CURVE_LENGTH(curveP); ++p) - CURVE_T(curveP, p) = CURVE_T(curveP, p) / LAST_CURVE_T(curveP); + CURVE_DIST(curveP, p) = + CURVE_DIST(curveP, p) / LAST_CURVE_DIST(curveP); - log_entire_curve(curveP); + curve_logEntire(curveP); } static void -subdivideCurve(curve * const curveP, +subdivideCurve(Curve * const curveP, unsigned int const subdivisionIndex, const fitting_opts_type * const fittingOptsP, - curve ** const leftCurvePP, - curve ** const rghtCurvePP, + Curve ** const leftCurvePP, + Curve ** const rghtCurvePP, Vector * const joinSlopeP) { /*---------------------------------------------------------------------------- Split curve *curveP into two, at 'subdivisionIndex'. (Actually, @@ -1662,11 +1666,11 @@ subdivideCurve(curve * const curveP, To be precise, the point with sequence number 'subdivisionIndex' becomes the first pixel of the right-hand curve. -----------------------------------------------------------------------------*/ - curve * leftCurveP; - curve * rghtCurveP; + Curve * leftCurveP; + Curve * rghtCurveP; - leftCurveP = new_curve(); - rghtCurveP = new_curve(); + leftCurveP = curve_new(); + rghtCurveP = curve_new(); LOG4(" Subdividing curve %lx into %lx and %lx at point #%u\n", (unsigned long)curveP, @@ -1680,13 +1684,13 @@ subdivideCurve(curve * const curveP, CURVE_LENGTH(leftCurveP) = subdivisionIndex + 1; CURVE_LENGTH(rghtCurveP) = CURVE_LENGTH(curveP) - subdivisionIndex; - MALLOCARRAY_NOFAIL(leftCurveP->point_list, CURVE_LENGTH(leftCurveP)); - memcpy(leftCurveP->point_list, &curveP->point_list[0], - CURVE_LENGTH(leftCurveP) * sizeof(curveP->point_list[0])); + MALLOCARRAY_NOFAIL(leftCurveP->pointList, CURVE_LENGTH(leftCurveP)); + memcpy(leftCurveP->pointList, &curveP->pointList[0], + CURVE_LENGTH(leftCurveP) * sizeof(curveP->pointList[0])); - MALLOCARRAY_NOFAIL(rghtCurveP->point_list, CURVE_LENGTH(rghtCurveP)); - memcpy(rghtCurveP->point_list, &curveP->point_list[subdivisionIndex], - CURVE_LENGTH(rghtCurveP) * sizeof(curveP->point_list[0])); + MALLOCARRAY_NOFAIL(rghtCurveP->pointList, CURVE_LENGTH(rghtCurveP)); + memcpy(rghtCurveP->pointList, &curveP->pointList[subdivisionIndex], + CURVE_LENGTH(rghtCurveP) * sizeof(curveP->pointList[0])); /* We have to set up the two curves before finding the slope at the subdivision point. The slope at that point must be the @@ -1737,7 +1741,7 @@ leftRightConcat(const spline_list_type * const leftSplineListP, static unsigned int -divisionPoint(curve * const curveP, +divisionPoint(Curve * const curveP, unsigned int const worstFitPoint) { /*---------------------------------------------------------------------------- Return the sequence number of the point at which we should divide @@ -1761,7 +1765,7 @@ divisionPoint(curve * const curveP, static spline_list_type * -divideAndFit(curve * const curveP, +divideAndFit(Curve * const curveP, Vector const begSlope, Vector const endSlope, unsigned int const subdivisionIndex, @@ -1779,9 +1783,9 @@ divideAndFit(curve * const curveP, Assume 'subdivisionIndex' leaves at least two pixels on each side. -----------------------------------------------------------------------------*/ spline_list_type * retval; - curve * leftCurveP; + Curve * leftCurveP; /* The beginning (lower indexes) subcurve */ - curve * rghtCurveP; + Curve * rghtCurveP; /* The other subcurve */ Vector joinSlope; /* The slope of the end of the left subcurve and start of the right @@ -1821,8 +1825,8 @@ divideAndFit(curve * const curveP, } } - free_curve(leftCurveP); - free_curve(rghtCurveP); + curve_free(leftCurveP); + curve_free(rghtCurveP); return retval; } @@ -1830,7 +1834,7 @@ divideAndFit(curve * const curveP, static spline_list_type * -fitWithLeastSquares(curve * const curveP, +fitWithLeastSquares(Curve * const curveP, Vector const begSlope, Vector const endSlope, const fitting_opts_type * const fittingOptsP, @@ -1905,7 +1909,7 @@ fitWithLeastSquares(curve * const curveP, static spline_list_type * -fitCurve(curve * const curveP, +fitCurve(Curve * const curveP, Vector const begSlope, Vector const endSlope, const fitting_opts_type * const fittingOptsP, @@ -1935,7 +1939,7 @@ fitCurve(curve * const curveP, static void -fitCurves(curve_list_type const curveList, +fitCurves(CurveList const curveList, pixel const color, const fitting_opts_type * const fittingOptsP, spline_list_type * const splinesP, @@ -1954,7 +1958,7 @@ fitCurves(curve_list_type const curveList, curveSeq < curveList.length && !at_exception_got_fatal(exceptionP); ++curveSeq) { - curve * const curveP = CURVE_LIST_ELT(curveList, curveSeq); + Curve * const curveP = CURVE_LIST_ELT(curveList, curveSeq); Vector begSlope, endSlope; spline_list_type * curveSplinesP; @@ -2017,7 +2021,7 @@ logFittedSplines(spline_list_type const curve_list_splines) { static void -fitCurveList(curve_list_type const curveList, +fitCurveList(CurveList const curveList, fitting_opts_type * const fittingOptsP, distance_map_type * const dist, pixel const color, @@ -2028,7 +2032,7 @@ fitCurveList(curve_list_type const curveList, it. CURVE_LIST represents a single closed paths, e.g., either the inside or outside outline of an `o'. -----------------------------------------------------------------------------*/ - curve_type curve; + Curve * curveP; spline_list_type curveListSplines; removeKnees(curveList); @@ -2053,9 +2057,9 @@ fitCurveList(curve_list_type const curveList, and three points isn't enough to determine a spline. Therefore, the fitting will fail. */ - curve = CURVE_LIST_ELT(curveList, 0); - if (CURVE_CYCLIC(curve)) - append_point(curve, CURVE_POINT(curve, 0)); + curveP = CURVE_LIST_ELT(curveList, 0); + if (CURVE_CYCLIC(curveP)) + curve_appendPoint(curveP, CURVE_POINT(curveP, 0)); /* Finally, fit each curve in the list to a list of splines. */ @@ -2070,7 +2074,7 @@ fitCurveList(curve_list_type const curveList, static void -fitCurvesToSplines(curve_list_array_type const curveArray, +fitCurvesToSplines(CurveListArray const curveArray, fitting_opts_type * const fittingOptsP, distance_map_type * const dist, unsigned short const width, @@ -2101,7 +2105,7 @@ fitCurvesToSplines(curve_list_array_type const curveArray, !at_exception_got_fatal(exception) && !cancelled; ++splineListSeq) { - curve_list_type const curveList = + CurveList const curveList = CURVE_LIST_ARRAY_ELT(curveArray, splineListSeq); spline_list_type curveSplineList; @@ -2142,14 +2146,14 @@ fit_outlines_to_splines(pixel_outline_list_type const pixelOutlineList, Transform a list of pixels in the outlines of the original character to a list of spline lists fitted to those pixels. -----------------------------------------------------------------------------*/ - curve_list_array_type const curveListArray = + CurveListArray const curveListArray = split_at_corners(pixelOutlineList, fittingOptsP, exception); fitCurvesToSplines(curveListArray, fittingOptsP, dist, width, height, exception, notifyProgress, progressData, testCancel, testcancelData, splineListArrayP); - free_curve_list_array(&curveListArray, notifyProgress, progressData); + curve_freeListArray(&curveListArray, notifyProgress, progressData); flush_log_output(); } |