diff options
| -rw-r--r-- | converter/other/pamtosvg/Makefile | 1 | ||||
| -rw-r--r-- | converter/other/pamtosvg/fit.c | 202 | ||||
| -rw-r--r-- | converter/other/pamtosvg/point.c | 37 | ||||
| -rw-r--r-- | converter/other/pamtosvg/point.h | 11 | ||||
| -rw-r--r-- | converter/other/pamtosvg/vector.c | 24 | ||||
| -rw-r--r-- | converter/other/pamtosvg/vector.h | 3 | ||||
| -rw-r--r-- | doc/HISTORY | 2 |
7 files changed, 143 insertions, 137 deletions
diff --git a/converter/other/pamtosvg/Makefile b/converter/other/pamtosvg/Makefile index 83f150d0..aba40ba5 100644 --- a/converter/other/pamtosvg/Makefile +++ b/converter/other/pamtosvg/Makefile @@ -18,6 +18,7 @@ ADDL_OBJECTS = \ fit.o \ spline.o \ curve.o \ + point.o \ vector.o \ epsilon-equal.o \ autotrace.o \ diff --git a/converter/other/pamtosvg/fit.c b/converter/other/pamtosvg/fit.c index 6f8a8890..548d23da 100644 --- a/converter/other/pamtosvg/fit.c +++ b/converter/other/pamtosvg/fit.c @@ -41,16 +41,16 @@ #define CUBE(x) ((x) * (x) * (x)) -typedef enum {LINEEND_BEG, LINEEND_END} LineEnd; +typedef enum {LINEEND_INIT, LINEEND_TERM} LineEnd; static LineEnd otherEnd(LineEnd const thisEnd) { switch (thisEnd) { - case LINEEND_BEG: return LINEEND_END; - case LINEEND_END: return LINEEND_BEG; + case LINEEND_INIT: return LINEEND_TERM; + case LINEEND_TERM: return LINEEND_INIT; } assert(false); /* All cases handled above */ - return LINEEND_BEG; /* silence bogus compiler warning */ + return LINEEND_INIT; /* silence bogus compiler warning */ } @@ -1392,175 +1392,111 @@ logSplineFit(spline_type const spline) { static vector_type -findHalfTangentBeg(curve * const curveP, - unsigned int const tangentSurround) { +findHalfTangent(LineEnd const toWhichEnd, + curve * const curveP, + unsigned int const tangentSurround) { /*---------------------------------------------------------------------------- - Find the slope in the vicinity of the beginning of the curve *curveP. + Find the slope in the vicinity of one of the ends of the curve *curveP, + as specified by 'toWhichEnd'. - To wit, this is the mean slope between the first point on the curve and - each of the 'tangentSurround' following points, up to half the curve. + To wit, this is the mean slope between the end point and each of the + 'tangentSurround' adjacent points, up to half the curve. - For example, if 'tangentSurround' is 3 and the curve is 10 points long, we - imagine a line through Point 0 and Point 1, another through Point 0 and - Point 2, and a third through Point 0 and Point 3. We return the mean of the - slopes of those 3 lines. + For example, if 'toWhichEnd' is LINEEND_INIT and 'tangentSurround' is 3 and + the curve is 10 points long, we imagine a line through Point 0 and Point 1, + another through Point 0 and Point 2, and a third through Point 0 and Point + 3. We return the mean of the slopes of those 3 lines. - 'tangentSurround' must be at least 1 and *curveP must have at least - two points. + Don't consider points that are identical to the end point (as there could + be no slope between those points) -- they're part of the count, but don't + contribute to the slope. If _all_ of the points to be considered are + identical to the end point, arbitrarily return a horizontal slope. -----------------------------------------------------------------------------*/ - float_coord const tangentPoint = CURVE_POINT(curveP, 0); + float_coord const tangentPoint = + CURVE_POINT(curveP, + toWhichEnd == LINEEND_INIT ? 0 : CURVE_LENGTH(curveP) - 1); vector_type const zeroZero = { 0.0, 0.0 }; - unsigned int const surround = + unsigned int const surroundCt = MIN(CURVE_LENGTH(curveP) / 2, tangentSurround); - unsigned int p; + unsigned int i; vector_type sum; - vector_type mean; - unsigned int n; - - assert(CURVE_LENGTH(curveP) > 0); - assert(tangentSurround > 0); - assert(surround > 0); - - for (p = 0, n = 0, sum = zeroZero; p < surround; ++p) { - unsigned int const thisIndex = p + 1; - float_coord const thisPoint = CURVE_POINT(curveP, thisIndex); - - /* Perhaps we should weight the tangent from `thisPoint' by some - factor dependent on the distance from the tangent point. - */ - sum = Vadd(sum, Pdirection(thisPoint, tangentPoint)); - ++n; - } - - mean = Vmult_scalar(sum, 1.0 / n); - - assert(n != 0); /* because surround > 0 */ - - return mean; -} - - - -static vector_type -findHalfTangentEnd(curve * const curveP, - unsigned int const tangentSurround) { -/*---------------------------------------------------------------------------- - Find the slope in the vicinity of the end of the curve *curveP. - - This is analogous to findHalfTangentBeg(), but at the other end of the - curve. ------------------------------------------------------------------------------*/ - float_coord const tangentPoint = - CURVE_POINT(curveP, CURVE_LENGTH(curveP) - 1); - vector_type const zeroZero = { 0.0, 0.0 }; - unsigned int const surround = - MIN(CURVE_LENGTH(curveP) / 2, tangentSurround); - - unsigned int p; - vector_type sum; - vector_type mean; unsigned int n; + vector_type mean; - assert(CURVE_LENGTH(curveP)/2 > 0); - assert(tangentSurround > 0); - assert(surround > 0); - - for (p = 0, n = 0, sum = zeroZero; p < surround; ++p) { - unsigned int const thisIndex = CURVE_LENGTH(curveP) - 1 - p; + for (i = 0, n = 0, sum = zeroZero; i < surroundCt; ++i) { + unsigned int const thisIndex = + toWhichEnd == LINEEND_INIT ? i + 1 : CURVE_LENGTH(curveP) - 1 - i; float_coord const thisPoint = CURVE_POINT(curveP, thisIndex); - sum = Vadd(sum, Pdirection(tangentPoint, thisPoint)); - ++n; + if (!pointsEqual(thisPoint, tangentPoint)) { + /* Perhaps we should weight the tangent from `thisPoint' by some + factor dependent on the distance from the tangent point. + */ + sum = Vadd(sum, Pdirection(thisPoint, tangentPoint)); + ++n; + } } - assert(n != 0); /* because surround > 0 */ - - mean = Vmult_scalar(sum, 1.0 / n); + mean = n > 0 ? Vmult_scalar(sum, 1.0 / n) : Vhorizontal(); return mean; } -static vector_type -findHalfTangent(LineEnd const toWhichEnd, - curve * const curveP, - unsigned int const tangentSurround) { - - switch (toWhichEnd) { - case LINEEND_BEG: - return findHalfTangentBeg(curveP, tangentSurround); - case LINEEND_END: - return findHalfTangentEnd(curveP, tangentSurround); - } - assert(false); /* All cases handled above */ - { - vector_type const dummyVector = {0.0, 0,0}; - return dummyVector; /* silence bogus compiler warning */ - } -} - - - static void findTangent(curve * const curveP, LineEnd const toWhichEnd, curve * const adjacentCurveP, - unsigned int const tangentSurroundReq, + unsigned int const tangentSurround, vector_type * const tangentP) { /*---------------------------------------------------------------------------- Find an approximation to the slope of *curveP (i.e. slope of tangent line) at an endpoint (per 'toWhichEnd'). This approximation is the mean of the slopes between the end of the curve - and the 'tangentSurroundReq' points leading up to it (but not beyond the - midpoint of the curve). Note that the curve may loop. We detect this only - in the case that the endpoint itself appears among those adjacent points. - In that case, we consider only the points up to that. - - IF THE VERY NEXT POINT IS THE ENDPOINT AGAIN, WE CRASH WITH AN ASSERTION - FAILURE (AND IF NO ASSERTION CHECKING, INFINITE LOOP). WE NEED TO FIX THAT. - - If 'adjacentCurveP' is non-null, consider points on the adjacent - curve to *curveP. The adjacent curve is *adjacentCurveP. Adjacent - means the previous curve in the outline chain for the slope at the - start point ('toWhichEnd' == LINEEND_BEG), the next curve otherwise. - If *curveP is cyclic, then it is its own adjacent curve. + and the 'tangentSurround' points leading up to it (but not more than one + point beyond the midpoint of the curve). Note that the curve may loop. + Since there is no slope between two identical points, we ignore points that + are identical to the endpoint. They count toward the limit; they just + aren't included in the result. If none of the points to be considered are + distinct from the endpoint, we arbitrarily consider the curve to be + horizontal there. + + If 'adjacentCurveP' is non-null, average this slope with the slope of the + other end of curve *adjacentCurveP, which we assume is adjacent. Adjacent + means the previous curve in the outline chain for the slope at the start + point ('toWhichEnd' == LINEEND_BEG), the next curve otherwise. If *curveP + is cyclic, then it is its own adjacent curve. It is important to compute an accurate approximation, because the control points that we eventually decide upon to fit the curve will be placed on the half-lines defined by the slopes and endpoints, and we never recompute the tangent after this. -----------------------------------------------------------------------------*/ - vector_type slope; - unsigned int tangentSurround; + vector_type const slopeThisCurve = + findHalfTangent(toWhichEnd, curveP, tangentSurround); LOG2(" tangent to %s of curve %lx: ", - toWhichEnd == LINEEND_BEG ? "start" : "end", (unsigned long)curveP); + toWhichEnd == LINEEND_INIT ? "start" : "end", (unsigned long)curveP); - tangentSurround = tangentSurroundReq; /* initial value */ - do { - slope = findHalfTangent(toWhichEnd, curveP, tangentSurround); + LOG3("(this curve half tangent (%.3f,%.3f,%.3f)) ", + slopeThisCurve.dx, slopeThisCurve.dy, slopeThisCurve.dz); - if (adjacentCurveP) { - vector_type const slopeAdj = - findHalfTangent(otherEnd(toWhichEnd), - adjacentCurveP, - tangentSurround); + if (adjacentCurveP) { + vector_type const slopeAdjCurve = + findHalfTangent(otherEnd(toWhichEnd), + adjacentCurveP, + tangentSurround); - LOG3("(adjacent curve half tangent (%.3f,%.3f,%.3f)) ", - slopeAdj.dx, slopeAdj.dy, slopeAdj.dz); - slope = Vmult_scalar(Vadd(slope, slopeAdj), 0.5); - } - assert(tangentSurround > 0); - --tangentSurround; - } while (slope.dx == 0.0 && slope.dy == 0.0); - - *tangentP = slope; + LOG3("(adjacent curve half tangent (%.3f,%.3f,%.3f)) ", + slopeAdjCurve.dx, slopeAdjCurve.dy, slopeAdjCurve.dz); + *tangentP = Vmult_scalar(Vadd(slopeThisCurve, slopeAdjCurve), 0.5); + } else + *tangentP = slopeThisCurve; - LOG3("(%.3f,%.3f,%.3f).\n", - tangentP->dx, tangentP->dy, tangentP->dz); + LOG3("(%.3f,%.3f,%.3f).\n", tangentP->dx, tangentP->dy, tangentP->dz); } @@ -1720,7 +1656,7 @@ subdivideCurve(curve * const curveP, point to compute the slope, hence we use adjacentCurveP. */ findTangent(leftCurveP, - LINEEND_END, + LINEEND_TERM, /* adjacentCurveP: */ rghtCurveP, fittingOptsP->tangent_surround, joinSlopeP); @@ -1987,11 +1923,11 @@ fitCurves(curve_list_type const curveList, LOG2("\nFitting curve #%u (%lx):\n", curveSeq, (unsigned long)curveP); LOG("Finding tangents:\n"); - findTangent(curveP, LINEEND_BEG, + findTangent(curveP, LINEEND_INIT, CURVE_CYCLIC(curveP) ? curveP : NULL, fittingOptsP->tangent_surround, &begSlope); - findTangent(curveP, LINEEND_END, + findTangent(curveP, LINEEND_TERM, CURVE_CYCLIC(curveP) ? curveP : NULL, fittingOptsP->tangent_surround, &endSlope); diff --git a/converter/other/pamtosvg/point.c b/converter/other/pamtosvg/point.c new file mode 100644 index 00000000..6a9ffafa --- /dev/null +++ b/converter/other/pamtosvg/point.c @@ -0,0 +1,37 @@ +#include <stdbool.h> + +#include "epsilon-equal.h" + +#include "point.h" + +float_coord +makePoint(float const x, + float const y, + float const z) { + + float_coord retval; + + retval.x = x; + retval.y = y; + retval.z = z; + + return retval; +} + + + +bool +pointsEqual(float_coord const comparand, + float_coord const comparator) { + + return + epsilon_equal(comparand.x, comparator.x) + && + epsilon_equal(comparand.y, comparator.y) + && + epsilon_equal(comparand.z, comparator.z) + ; +} + + + diff --git a/converter/other/pamtosvg/point.h b/converter/other/pamtosvg/point.h index 037ec8a0..1304d0fe 100644 --- a/converter/other/pamtosvg/point.h +++ b/converter/other/pamtosvg/point.h @@ -1,8 +1,19 @@ #ifndef POINT_H_INCLUDED #define POINT_H_INCLUDED +#include <stdbool.h> + typedef struct { float x, y, z; } float_coord; +float_coord +makePoint(float const x, + float const y, + float const z); + +bool +pointsEqual(float_coord const comparand, + float_coord const comparator); + #endif diff --git a/converter/other/pamtosvg/vector.c b/converter/other/pamtosvg/vector.c index 771e5f27..17c4ec77 100644 --- a/converter/other/pamtosvg/vector.c +++ b/converter/other/pamtosvg/vector.c @@ -70,7 +70,7 @@ normalize(vector_type const v) { new_v.dy = v.dy; new_v.dz = v.dz; } - + return new_v; } @@ -120,7 +120,7 @@ Vmult_scalar(vector_type const v, */ float -Vangle(vector_type const in_vector, +Vangle(vector_type const in_vector, vector_type const out_vector, at_exception_type * const exP) { @@ -170,7 +170,7 @@ Vadd_int_point(pm_pixelcoord const c, a.col = ROUND ((float) c.col + v.dx); a.row = ROUND ((float) c.row + v.dy); - + return a; } @@ -257,7 +257,7 @@ IPsubtract(pm_pixelcoord const coord1, v.dx = (int) (coord1.col - coord2.col); v.dy = (int) (coord1.row - coord2.row); v.dz = 0.0; - + return v; } @@ -288,3 +288,19 @@ acos_d(float const v, return retval; } + + + +vector_type +Vhorizontal(void) { + + vector_type retval; + + retval.dx = 1.0; + retval.dy = 0.0; + retval.dz = 0.0; + + return retval; +} + + diff --git a/converter/other/pamtosvg/vector.h b/converter/other/pamtosvg/vector.h index b5c85c38..8c172f4f 100644 --- a/converter/other/pamtosvg/vector.h +++ b/converter/other/pamtosvg/vector.h @@ -100,4 +100,7 @@ float_coord Pmult_scalar(float_coord const, float const); +vector_type +Vhorizontal(void); + #endif diff --git a/doc/HISTORY b/doc/HISTORY index 9b367f5d..741d4ec4 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -34,6 +34,8 @@ not yet BJH Release 11.04.00 large for unsigned integer. Always broken (Pamstack was new in Netpbm 10.0 (June 2002). + pamtosvg: fix hang. + ppmfade: fix "file not found" crash for most fade modes. Introduced in Netpbm 10.98 (March 2022). |