diff options
Diffstat (limited to 'src/dyna-draw-context.cpp')
| -rw-r--r-- | src/dyna-draw-context.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp index 4de36d0d7..cc79dfd2e 100644 --- a/src/dyna-draw-context.cpp +++ b/src/dyna-draw-context.cpp @@ -35,7 +35,7 @@ #include "svg/svg.h" #include "display/canvas-bpath.h" #include "display/bezier-utils.h" - +#include "display/curve.h" #include <glib/gmem.h> #include "macros.h" #include "document.h" @@ -1127,24 +1127,24 @@ accumulate_calligraphic(SPDynaDrawContext *dc) { if ( !dc->cal1->is_empty() && !dc->cal2->is_empty() ) { dc->accumulated->reset(); /* Is this required ?? */ - SPCurve *rev_cal2 = dc->cal2->reverse(); + SPCurve *rev_cal2 = dc->cal2->create_reverse(); - g_assert(dc->cal1->end > 1); - g_assert(rev_cal2->end > 1); + g_assert(dc->cal1->_end > 1); + g_assert(rev_cal2->_end > 1); g_assert(SP_CURVE_SEGMENT(dc->cal1, 0)->code == NR_MOVETO_OPEN); g_assert(SP_CURVE_SEGMENT(rev_cal2, 0)->code == NR_MOVETO_OPEN); g_assert(SP_CURVE_SEGMENT(dc->cal1, 1)->code == NR_CURVETO); g_assert(SP_CURVE_SEGMENT(rev_cal2, 1)->code == NR_CURVETO); - g_assert(SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->code == NR_CURVETO); - g_assert(SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->code == NR_CURVETO); + g_assert(SP_CURVE_SEGMENT(dc->cal1, dc->cal1->_end-1)->code == NR_CURVETO); + g_assert(SP_CURVE_SEGMENT(rev_cal2, rev_cal2->_end-1)->code == NR_CURVETO); dc->accumulated->append(dc->cal1, FALSE); - add_cap(dc->accumulated, SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->c(2), SP_CURVE_SEGMENT(dc->cal1, dc->cal1->end-1)->c(3), SP_CURVE_SEGMENT(rev_cal2, 0)->c(3), SP_CURVE_SEGMENT(rev_cal2, 1)->c(1), dc->cap_rounding); + add_cap(dc->accumulated, SP_CURVE_SEGMENT(dc->cal1, dc->cal1->_end-1)->c(2), SP_CURVE_SEGMENT(dc->cal1, dc->cal1->_end-1)->c(3), SP_CURVE_SEGMENT(rev_cal2, 0)->c(3), SP_CURVE_SEGMENT(rev_cal2, 1)->c(1), dc->cap_rounding); dc->accumulated->append(rev_cal2, TRUE); - add_cap(dc->accumulated, SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->c(2), SP_CURVE_SEGMENT(rev_cal2, rev_cal2->end-1)->c(3), SP_CURVE_SEGMENT(dc->cal1, 0)->c(3), SP_CURVE_SEGMENT(dc->cal1, 1)->c(1), dc->cap_rounding); + add_cap(dc->accumulated, SP_CURVE_SEGMENT(rev_cal2, rev_cal2->_end-1)->c(2), SP_CURVE_SEGMENT(rev_cal2, rev_cal2->_end-1)->c(3), SP_CURVE_SEGMENT(dc->cal1, 0)->c(3), SP_CURVE_SEGMENT(dc->cal1, 1)->c(1), dc->cap_rounding); dc->accumulated->closepath(); @@ -1183,7 +1183,7 @@ fit_and_split(SPDynaDrawContext *dc, gboolean release) #endif /* Current calligraphic */ - if ( dc->cal1->end == 0 || dc->cal2->end == 0 ) { + if ( dc->cal1->_end == 0 || dc->cal2->_end == 0 ) { /* dc->npoints > 0 */ /* g_print("calligraphics(1|2) reset\n"); */ dc->cal1->reset(); |