Fix crash when floating dialog icon is not found

[inkscape.git] / src / 2geom / svg-path.cpp

diff --git a/src/2geom/svg-path.cpp b/src/2geom/svg-path.cpp
index 2c275cb4c5d247222c487ff15f25087164086b5c..3e4bf7becaabb868f74fe034b6b3d4ab29a60508 100644 (file)
--- a/src/2geom/svg-path.cpp
+++ b/src/2geom/svg-path.cpp
@@ -28,17 +28,26 @@
  *
  */
 
-#include "sbasis-to-bezier.h"
-#include "svg-path.h"
-#include "exception.h"
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/svg-path.h>
+#include <2geom/exception.h>
 
 namespace Geom {
 
 void output(Curve const &curve, SVGPathSink &sink) {
-    std::vector<Point> pts = sbasis_to_bezier(curve.toSBasis(), 2); //TODO: use something better!
+    std::vector<Point> pts;
+    sbasis_to_bezier(pts, curve.toSBasis(), 2); //TODO: use something better!
     sink.curveTo(pts[0], pts[1], pts[2]);
 }
 
+void output(HLineSegment const &curve, SVGPathSink &sink) {
+    sink.hlineTo(curve.finalPoint()[X]);
+}
+
+void output(VLineSegment const &curve, SVGPathSink &sink) {
+    sink.vlineTo(curve.finalPoint()[Y]);
+}
+
 void output(LineSegment const &curve, SVGPathSink &sink) {
     sink.lineTo(curve[1]);
 }
@@ -51,9 +60,10 @@ void output(QuadraticBezier const &curve, SVGPathSink &sink) {
     sink.quadTo(curve[1], curve[2]);
 }
 
-void output(EllipticalArc const &/*curve*/, SVGPathSink &/*sink*/) {
-    // FIXME
-    THROW_NOTIMPLEMENTED();
+void output(SVGEllipticalArc const &curve, SVGPathSink &sink) {
+    sink.arcTo( curve.ray(X), curve.ray(Y), curve.rotation_angle(),
+                       curve.large_arc_flag(), curve.sweep_flag(),
+                       curve.finalPoint() );
 }
 
 template <typename T>
@@ -72,10 +82,12 @@ void output_svg_path(Path &path, SVGPathSink &sink) {
 
     Path::iterator iter;
     for ( iter = path.begin() ; iter != path.end() ; ++iter ) {
+       output_as<HLineSegment>(*iter, sink) ||
+       output_as<VLineSegment>(*iter, sink) ||
         output_as<LineSegment>(*iter, sink) ||
         output_as<CubicBezier>(*iter, sink) ||
         output_as<QuadraticBezier>(*iter, sink) ||
-        output_as<EllipticalArc>(*iter, sink) ||
+        output_as<SVGEllipticalArc>(*iter, sink) ||
         output_as<Curve>(*iter, sink);
     }
 
@@ -96,4 +108,4 @@ void output_svg_path(Path &path, SVGPathSink &sink) {
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :