From a6dd459d9e337c81386e87bd616f04aadb9d2035 Mon Sep 17 00:00:00 2001 From: Max Gaukler Date: Tue, 11 Sep 2018 21:11:15 +0200 Subject: convert to unix line endings --- src/live_effects/lpe-jointype.h | 114 +++++++------- src/live_effects/spiro-converters.cpp | 272 +++++++++++++++++----------------- 2 files changed, 193 insertions(+), 193 deletions(-) (limited to 'src') diff --git a/src/live_effects/lpe-jointype.h b/src/live_effects/lpe-jointype.h index 5ea6445a5..e84b11ad9 100644 --- a/src/live_effects/lpe-jointype.h +++ b/src/live_effects/lpe-jointype.h @@ -1,57 +1,57 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* Authors: - * Liam P White - * - * Copyright (C) 2014 Authors - * - * Released under GNU GPL v2+, read the file COPYING for more information - */ - -#ifndef INKSCAPE_LPE_JOINTYPE_H -#define INKSCAPE_LPE_JOINTYPE_H - -#include "live_effects/effect.h" -#include "live_effects/parameter/parameter.h" -#include "live_effects/parameter/point.h" -#include "live_effects/parameter/enum.h" - -namespace Inkscape { -namespace LivePathEffect { - -class LPEJoinType : public Effect { -public: - LPEJoinType(LivePathEffectObject *lpeobject); - ~LPEJoinType() override; - - void doOnApply(SPLPEItem const* lpeitem) override; - void doOnRemove(SPLPEItem const* lpeitem) override; - Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; - -private: - LPEJoinType(const LPEJoinType&) = delete; - LPEJoinType& operator=(const LPEJoinType&) = delete; - - ScalarParam line_width; - EnumParam linecap_type; - EnumParam linejoin_type; - //ScalarParam start_lean; - //ScalarParam end_lean; - ScalarParam miter_limit; - BoolParam attempt_force_join; -}; - -} //namespace LivePathEffect -} //namespace Inkscape - -#endif - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : +// SPDX-License-Identifier: GPL-2.0-or-later +/* Authors: + * Liam P White + * + * Copyright (C) 2014 Authors + * + * Released under GNU GPL v2+, read the file COPYING for more information + */ + +#ifndef INKSCAPE_LPE_JOINTYPE_H +#define INKSCAPE_LPE_JOINTYPE_H + +#include "live_effects/effect.h" +#include "live_effects/parameter/parameter.h" +#include "live_effects/parameter/point.h" +#include "live_effects/parameter/enum.h" + +namespace Inkscape { +namespace LivePathEffect { + +class LPEJoinType : public Effect { +public: + LPEJoinType(LivePathEffectObject *lpeobject); + ~LPEJoinType() override; + + void doOnApply(SPLPEItem const* lpeitem) override; + void doOnRemove(SPLPEItem const* lpeitem) override; + Geom::PathVector doEffect_path (Geom::PathVector const & path_in) override; + +private: + LPEJoinType(const LPEJoinType&) = delete; + LPEJoinType& operator=(const LPEJoinType&) = delete; + + ScalarParam line_width; + EnumParam linecap_type; + EnumParam linejoin_type; + //ScalarParam start_lean; + //ScalarParam end_lean; + ScalarParam miter_limit; + BoolParam attempt_force_join; +}; + +} //namespace LivePathEffect +} //namespace Inkscape + +#endif + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : diff --git a/src/live_effects/spiro-converters.cpp b/src/live_effects/spiro-converters.cpp index e0daf6d54..556df82b4 100644 --- a/src/live_effects/spiro-converters.cpp +++ b/src/live_effects/spiro-converters.cpp @@ -1,136 +1,136 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* Authors: - * Johan Engelen - * - * Copyright (C) 2010-2012 Authors - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "spiro-converters.h" -#include <2geom/path.h> -#include "display/curve.h" -#include - -#define SPIRO_SHOW_INFINITE_COORDINATE_CALLS -#ifdef SPIRO_SHOW_INFINITE_COORDINATE_CALLS -# define SPIRO_G_MESSAGE(x) g_message(x) -#else -# define SPIRO_G_MESSAGE(x) -#endif - -namespace Spiro { - -void -ConverterSPCurve::moveto(double x, double y) -{ - if ( IS_FINITE(x) && IS_FINITE(y) ) { - _curve.moveto(x, y); - } else { - SPIRO_G_MESSAGE("Spiro: moveto not finite"); - } -} - -void -ConverterSPCurve::lineto(double x, double y, bool close_last) -{ - if ( IS_FINITE(x) && IS_FINITE(y) ) { - _curve.lineto(x, y); - if (close_last) { - _curve.closepath(); - } - } else { - SPIRO_G_MESSAGE("Spiro: lineto not finite"); - } -} - -void -ConverterSPCurve::quadto(double xm, double ym, double x3, double y3, bool close_last) -{ - if ( IS_FINITE(xm) && IS_FINITE(ym) && IS_FINITE(x3) && IS_FINITE(y3) ) { - _curve.quadto(xm, ym, x3, y3); - if (close_last) { - _curve.closepath(); - } - } else { - SPIRO_G_MESSAGE("Spiro: quadto not finite"); - } -} - -void -ConverterSPCurve::curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last) -{ - if ( IS_FINITE(x1) && IS_FINITE(y1) && IS_FINITE(x2) && IS_FINITE(y2) ) { - _curve.curveto(x1, y1, x2, y2, x3, y3); - if (close_last) { - _curve.closepath(); - } - } else { - SPIRO_G_MESSAGE("Spiro: curveto not finite"); - } -} - - -ConverterPath::ConverterPath(Geom::Path &path) - : _path(path) -{ - _path.setStitching(true); -} - -void -ConverterPath::moveto(double x, double y) -{ - if ( IS_FINITE(x) && IS_FINITE(y) ) { - _path.start(Geom::Point(x, y)); - } else { - SPIRO_G_MESSAGE("spiro moveto not finite"); - } -} - -void -ConverterPath::lineto(double x, double y, bool close_last) -{ - if ( IS_FINITE(x) && IS_FINITE(y) ) { - _path.appendNew( Geom::Point(x, y) ); - _path.close(close_last); - } else { - SPIRO_G_MESSAGE("spiro lineto not finite"); - } -} - -void -ConverterPath::quadto(double xm, double ym, double x3, double y3, bool close_last) -{ - if ( IS_FINITE(xm) && IS_FINITE(ym) && IS_FINITE(x3) && IS_FINITE(y3) ) { - _path.appendNew(Geom::Point(xm, ym), Geom::Point(x3, y3)); - _path.close(close_last); - } else { - SPIRO_G_MESSAGE("spiro quadto not finite"); - } -} - -void -ConverterPath::curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last) -{ - if ( IS_FINITE(x1) && IS_FINITE(y1) && IS_FINITE(x2) && IS_FINITE(y2) ) { - _path.appendNew(Geom::Point(x1, y1), Geom::Point(x2, y2), Geom::Point(x3, y3)); - _path.close(close_last); - } else { - SPIRO_G_MESSAGE("spiro curveto not finite"); - } -} - -} // namespace Spiro - - - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : +// SPDX-License-Identifier: GPL-2.0-or-later +/* Authors: + * Johan Engelen + * + * Copyright (C) 2010-2012 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "spiro-converters.h" +#include <2geom/path.h> +#include "display/curve.h" +#include + +#define SPIRO_SHOW_INFINITE_COORDINATE_CALLS +#ifdef SPIRO_SHOW_INFINITE_COORDINATE_CALLS +# define SPIRO_G_MESSAGE(x) g_message(x) +#else +# define SPIRO_G_MESSAGE(x) +#endif + +namespace Spiro { + +void +ConverterSPCurve::moveto(double x, double y) +{ + if ( IS_FINITE(x) && IS_FINITE(y) ) { + _curve.moveto(x, y); + } else { + SPIRO_G_MESSAGE("Spiro: moveto not finite"); + } +} + +void +ConverterSPCurve::lineto(double x, double y, bool close_last) +{ + if ( IS_FINITE(x) && IS_FINITE(y) ) { + _curve.lineto(x, y); + if (close_last) { + _curve.closepath(); + } + } else { + SPIRO_G_MESSAGE("Spiro: lineto not finite"); + } +} + +void +ConverterSPCurve::quadto(double xm, double ym, double x3, double y3, bool close_last) +{ + if ( IS_FINITE(xm) && IS_FINITE(ym) && IS_FINITE(x3) && IS_FINITE(y3) ) { + _curve.quadto(xm, ym, x3, y3); + if (close_last) { + _curve.closepath(); + } + } else { + SPIRO_G_MESSAGE("Spiro: quadto not finite"); + } +} + +void +ConverterSPCurve::curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last) +{ + if ( IS_FINITE(x1) && IS_FINITE(y1) && IS_FINITE(x2) && IS_FINITE(y2) ) { + _curve.curveto(x1, y1, x2, y2, x3, y3); + if (close_last) { + _curve.closepath(); + } + } else { + SPIRO_G_MESSAGE("Spiro: curveto not finite"); + } +} + + +ConverterPath::ConverterPath(Geom::Path &path) + : _path(path) +{ + _path.setStitching(true); +} + +void +ConverterPath::moveto(double x, double y) +{ + if ( IS_FINITE(x) && IS_FINITE(y) ) { + _path.start(Geom::Point(x, y)); + } else { + SPIRO_G_MESSAGE("spiro moveto not finite"); + } +} + +void +ConverterPath::lineto(double x, double y, bool close_last) +{ + if ( IS_FINITE(x) && IS_FINITE(y) ) { + _path.appendNew( Geom::Point(x, y) ); + _path.close(close_last); + } else { + SPIRO_G_MESSAGE("spiro lineto not finite"); + } +} + +void +ConverterPath::quadto(double xm, double ym, double x3, double y3, bool close_last) +{ + if ( IS_FINITE(xm) && IS_FINITE(ym) && IS_FINITE(x3) && IS_FINITE(y3) ) { + _path.appendNew(Geom::Point(xm, ym), Geom::Point(x3, y3)); + _path.close(close_last); + } else { + SPIRO_G_MESSAGE("spiro quadto not finite"); + } +} + +void +ConverterPath::curveto(double x1, double y1, double x2, double y2, double x3, double y3, bool close_last) +{ + if ( IS_FINITE(x1) && IS_FINITE(y1) && IS_FINITE(x2) && IS_FINITE(y2) ) { + _path.appendNew(Geom::Point(x1, y1), Geom::Point(x2, y2), Geom::Point(x3, y3)); + _path.close(close_last); + } else { + SPIRO_G_MESSAGE("spiro curveto not finite"); + } +} + +} // namespace Spiro + + + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : -- cgit v1.2.3