~inkscape.dev/inkscape/eraser_improvements

« back to all changes in this revision

Viewing changes to src/2geom/generic-rect.h

Committer: jabiertxof
Date: 2016-03-01 01:42:13 UTC
mfrom: (14648.1.28 inkscape)
Revision ID: info@marker.es-20160301014213-ewfxjn3ohelo104c

update to trunk

files added:
CMakeScripts/Modules/sigcpp_test.cpp

share/extensions/nicechart.inx

share/extensions/nicechart.py

files modified:
AUTHORS

CMakeScripts/ConfigChecks.cmake

CMakeScripts/DefineDependsandFlags.cmake

CMakeScripts/Modules/FindSigC++.cmake

build-x64-gtk3.xml

build-x64.xml

configure.ac

packaging/release-sign-tarballs

po/inkscape.pot

po/is.po *

src/2geom/circle.cpp

src/2geom/conicsec.cpp

src/2geom/coord.cpp

src/2geom/ellipse.cpp

src/2geom/generic-interval.h

src/2geom/generic-rect.h

src/2geom/line.cpp

src/2geom/line.h

src/2geom/ray.h

src/2geom/sbasis-to-bezier.cpp

src/2geom/sweeper.h

src/2geom/utils.h

src/conn-avoid-ref.cpp

src/desktop-style.cpp

src/display/sp-canvas.cpp

src/document.cpp

src/document.h

src/extension/internal/cdr-input.cpp

src/extension/internal/emf-inout.cpp

src/extension/internal/wmf-inout.cpp

src/helper/geom-pathstroke.cpp

src/helper/geom-pathstroke.h

src/inkview.cpp

src/io/inkjar.cpp

src/live_effects/lpe-jointype.cpp

src/object-snapper.cpp

src/sp-marker.cpp

src/sp-mask.cpp

src/sp-text.cpp

src/ui/dialog/document-properties.cpp

src/ui/dialog/text-edit.cpp

src/ui/tools/mesh-tool.cpp

src/ui/tools/select-tool.cpp

src/vanishing-point.cpp

src/vanishing-point.h

src/widgets/ruler.cpp

src/widgets/text-toolbar.cpp

Show diffs side-by-side

added added

removed removed

src/2geom/generic-rect.h

#define LIB2GEOM_SEEN_GENERIC_RECT_H

#include <limits>

#include <iostream>

#include <boost/optional.hpp>

#include <2geom/coord.h>

513

514

return !r || contains(*r);

514

515

}

515

516

#ifdef _GLIBCXX_IOSTREAM

517

template <typename C>

518

inline std::ostream &operator<<(std::ostream &out, GenericRect<C> const &r) {

519

out << "X: " << r[X] << " Y: " << r[Y];

519

out << "Rect " << r[X] << " x " << r[Y];

520

return out;

521

}

522

#endif

523

522

524

523

} // end namespace Geom

525

524

Older »