Attachment #252249 for bug #304919

View | Details | Raw Unified | Return to bug 304919
Collapse All | Expand All

Lines 191-196 Link Here

(-)src/extension/internal/cairo-renderer.cpp (+1 lines)
191	SPStyle* style = SP_OBJECT_STYLE (item);	191	SPStyle* style = SP_OBJECT_STYLE (item);
192		192
193	Geom::PathVector const & pathv = shape->curve->get_pathvector();	193	Geom::PathVector const & pathv = shape->curve->get_pathvector();
		194	if (pathv.empty()) return;
194		195
195	ctx->renderPathVector(pathv, style, &pbox);	196	ctx->renderPathVector(pathv, style, &pbox);
196		197

Lines 410-416 Link Here

(-)src/sp-shape.cpp (-4 / +8 lines)
410	// position arguments to sp_marker_show_instance, basically counts the amount of markers.	410	// position arguments to sp_marker_show_instance, basically counts the amount of markers.
411	int counter[4] = {0};	411	int counter[4] = {0};
412		412
		413	if (!shape->curve) return;
413	Geom::PathVector const & pathv = shape->curve->get_pathvector();	414	Geom::PathVector const & pathv = shape->curve->get_pathvector();
		415	if (pathv.empty()) return;
414		416
415	// the first vertex should get a start marker, the last an end marker, and all the others a mid marker	417	// the first vertex should get a start marker, the last an end marker, and all the others a mid marker
416	// see bug 456148	418	// see bug 456148
Lines 585-591 Link Here
585	}	587	}
586		588
587	// Union with bboxes of the markers, if any	589	// Union with bboxes of the markers, if any
588	if (sp_shape_has_markers (shape)) {	590	if (sp_shape_has_markers (shape) && !shape->curve->get_pathvector().empty()) {
589	/** \todo make code prettier! */	591	/** \todo make code prettier! */
590	Geom::PathVector const & pathv = shape->curve->get_pathvector();	592	Geom::PathVector const & pathv = shape->curve->get_pathvector();
591	// START marker	593	// START marker
Lines 767-772 Link Here
767		769
768	if (!shape->curve) return;	770	if (!shape->curve) return;
769		771
		772	Geom::PathVector const & pathv = shape->curve->get_pathvector();
		773	if (pathv.empty()) return;
		774
770	Inkscape::Preferences *prefs = Inkscape::Preferences::get();	775	Inkscape::Preferences *prefs = Inkscape::Preferences::get();
771	gint add_comments = prefs->getBool("/printing/debug/add-label-comments");	776	gint add_comments = prefs->getBool("/printing/debug/add-label-comments");
772	if (add_comments) {	777	if (add_comments) {
Lines 788-802 Link Here
788	SPStyle* style = SP_OBJECT_STYLE (item);	793	SPStyle* style = SP_OBJECT_STYLE (item);
789		794
790	if (!style->fill.isNone()) {	795	if (!style->fill.isNone()) {
791	sp_print_fill (ctx, shape->curve->get_pathvector(), &i2d, style, &pbox, &dbox, &bbox);	796	sp_print_fill (ctx, pathv, &i2d, style, &pbox, &dbox, &bbox);
792	}	797	}
793		798
794	if (!style->stroke.isNone()) {	799	if (!style->stroke.isNone()) {
795	sp_print_stroke (ctx, shape->curve->get_pathvector(), &i2d, style, &pbox, &dbox, &bbox);	800	sp_print_stroke (ctx, pathv, &i2d, style, &pbox, &dbox, &bbox);
796	}	801	}
797		802
798	/** \todo make code prettier */	803	/** \todo make code prettier */
799	Geom::PathVector const & pathv = shape->curve->get_pathvector();
800	// START marker	804	// START marker
801	for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START	805	for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START
802	if ( shape->marker[i] ) {	806	if ( shape->marker[i] ) {

Lines 674-679 Link Here

(-)src/splivarot.cpp (+8 lines)
674	return ret_pathv;	674	return ret_pathv;
675	}	675	}
676		676
		677	if (curve->get_pathvector().empty()) {
		678	return ret_pathv;
		679	}
		680
677	// remember old stroke style, to be set on fill	681	// remember old stroke style, to be set on fill
678	SPStyle *i_style = SP_OBJECT_STYLE(item);	682	SPStyle *i_style = SP_OBJECT_STYLE(item);
679		683
Lines 900-905 Link Here
900	continue;	904	continue;
901	}	905	}
902		906
		907	if (curve->get_pathvector().empty()) {
		908	continue;
		909	}
		910
903	// pas de stroke pas de chocolat	911	// pas de stroke pas de chocolat
904	if (!SP_OBJECT_STYLE(item) \|\| SP_OBJECT_STYLE(item)->stroke.noneSet) {	912	if (!SP_OBJECT_STYLE(item) \|\| SP_OBJECT_STYLE(item)->stroke.noneSet) {
905	curve->unref();	913	curve->unref();

Return to bug 304919