From 2af7b044668ecbb886c0245552db7cf0db96be94 Mon Sep 17 00:00:00 2001 From: rwst Date: Tue, 28 Mar 2006 08:43:49 +0000 Subject: [PATCH] more g++ 4.1 fixes (by inkblotter) --- src/removeoverlap/constraint.h | 2 +- src/trace/siox.h | 4 ++-- src/ui/widget/color-picker.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/removeoverlap/constraint.h b/src/removeoverlap/constraint.h index c8273376b..de8ccebd4 100644 --- a/src/removeoverlap/constraint.h +++ b/src/removeoverlap/constraint.h @@ -25,7 +25,7 @@ public: double lm; Constraint(Variable *left, Variable *right, double gap); ~Constraint(void){}; - inline double Constraint::slack() const { return right->position() - gap - left->position(); } + inline double slack() const { return right->position() - gap - left->position(); } //inline bool operator<(Constraint const &o) const { return slack() < o.slack(); } long timeStamp; bool active; diff --git a/src/trace/siox.h b/src/trace/siox.h index cfb7ea19c..4020fe343 100644 --- a/src/trace/siox.h +++ b/src/trace/siox.h @@ -274,7 +274,7 @@ public: * * @see #segmentate */ - void SioxSegmentator::subpixelRefine(int x, int y, int brushmode, + void subpixelRefine(int x, int y, int brushmode, float threshold, float *cf, int brushsize); /** @@ -302,7 +302,7 @@ public: * * @see #segmentate */ - bool SioxSegmentator::subpixelRefine(int xa, int ya, int dx, int dy, + bool subpixelRefine(int xa, int ya, int dx, int dy, int brushmode, float threshold, float *cf); /** diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp index ef8c491d0..a8cdba61e 100644 --- a/src/ui/widget/color-picker.cpp +++ b/src/ui/widget/color-picker.cpp @@ -25,6 +25,7 @@ namespace Inkscape { namespace UI { namespace Widget { +void sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp); ColorPicker::ColorPicker (const Glib::ustring& title, const Glib::ustring& tip, guint32 rgba, bool undo) -- 2.30.2