Merge branch 'dev' into spot-removal-tool

This commit is contained in:
Hombre57
2019-12-08 00:37:54 +01:00
463 changed files with 16158 additions and 10338 deletions

View File

@@ -20,13 +20,15 @@
#ifdef GUIVERSION
#include "rtsurface.h"
#include "editbuffer.h"
#include <cairomm/cairomm.h>
#include <glibmm/ustring.h>
#include "editcoordsys.h"
#include "../rtengine/coord.h"
#include "../rtengine/rt_math.h"
class ObjectMOBuffer;
class RTSurface;
/** @file
*
@@ -289,7 +291,7 @@ public:
rtengine::Coord end;
Line ();
Line (rtengine::Coord& begin, rtengine::Coord& end);
Line (const rtengine::Coord& begin, const rtengine::Coord& end);
Line (int beginX, int beginY, int endX, int endY);
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
@@ -548,7 +550,7 @@ inline Circle::Circle (int centerX, int centerY, int radius, bool filled,
radiusInImageSpace) {
}
inline Line::Line (rtengine::Coord& begin, rtengine::Coord& end) :
inline Line::Line (const rtengine::Coord& begin, const rtengine::Coord& end) :
begin (begin), end (end) {
}