Attachment #563436 for bug #677058

Lines 563-569 Link Here

(-)a/src/ui/dialog/document-properties.cpp.ORIG (-1 / +1 lines)
563	}	563	}
564		564
565	struct _cmp {	565	struct _cmp {
566	bool operator()(const SPObject * const & a, const SPObject * const & b)	566	bool operator()(const SPObject * const & a, const SPObject * const & b) const
567	{	567	{
568	const Inkscape::ColorProfile &a_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*a);	568	const Inkscape::ColorProfile &a_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*a);
569	const Inkscape::ColorProfile &b_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*b);	569	const Inkscape::ColorProfile &b_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*b);

Lines 104-110 Link Here

(-)a/src/vanishing-point.h.ORIG (-2 / +2 lines)
104	g_return_if_fail (_persp);	104	g_return_if_fail (_persp);
105	persp3d_get_VP (_persp, _axis).print("");	105	persp3d_get_VP (_persp, _axis).print("");
106	}	106	}
107	inline char const *axisString () { return Proj::string_from_axis(_axis); }	107	inline char const *axisString () const { return Proj::string_from_axis(_axis); }
108		108
109	unsigned int my_counter;	109	unsigned int my_counter;
110	static unsigned int global_counter; // FIXME: Only to implement operator< so that we can merge lists. Do this in a better way!!	110	static unsigned int global_counter; // FIXME: Only to implement operator< so that we can merge lists. Do this in a better way!!
Lines 116-122 Link Here
116	struct VPDrag;	116	struct VPDrag;
117		117
118	struct less_ptr : public std::binary_function<VanishingPoint , VanishingPoint , bool> {	118	struct less_ptr : public std::binary_function<VanishingPoint , VanishingPoint , bool> {
119	bool operator()(VanishingPoint vp1, VanishingPoint vp2) {	119	bool operator()(VanishingPoint vp1, VanishingPoint vp2) const {
120	return GPOINTER_TO_INT(vp1) < GPOINTER_TO_INT(vp2);	120	return GPOINTER_TO_INT(vp1) < GPOINTER_TO_INT(vp2);
121	}	121	}
122	};	122	};

Lines 673-679 Link Here

(-)a/src/ui/widget/color-icc-selector.cpp.ORIG (-1 / +1 lines)
673		673
674	#if defined(HAVE_LIBLCMS1) \|\| defined(HAVE_LIBLCMS2)	674	#if defined(HAVE_LIBLCMS1) \|\| defined(HAVE_LIBLCMS2)
675	struct _cmp {	675	struct _cmp {
676	bool operator()(const SPObject * const & a, const SPObject * const & b)	676	bool operator()(const SPObject * const & a, const SPObject * const & b) const
677	{	677	{
678	const Inkscape::ColorProfile &a_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*a);	678	const Inkscape::ColorProfile &a_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*a);
679	const Inkscape::ColorProfile &b_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*b);	679	const Inkscape::ColorProfile &b_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*b);

Return to bug 677058