Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix default ctor of homogeneous_color_base for reference pixel elements #542

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 56 additions & 21 deletions include/boost/gil/color_base.hpp
Original file line number Diff line number Diff line change
@@ -79,8 +79,14 @@ struct homogeneous_color_base<Element, Layout, 1>
{
using layout_t = Layout;

homogeneous_color_base() = default;
homogeneous_color_base(Element v) : v0_(v) {}
template
<
typename U = Element,
typename = typename std::enable_if<!std::is_reference<U>::value>::type
>
homogeneous_color_base() : v0_{} {};

explicit homogeneous_color_base(Element v) : v0_(v) {}

template <typename E2, typename L2>
homogeneous_color_base(homogeneous_color_base<E2, L2, 1> const& c)
@@ -100,7 +106,7 @@ struct homogeneous_color_base<Element, Layout, 1>
operator Element() const { return v0_; }

private:
Element v0_{};
Element v0_;
};

/// \brief A homogeneous color base holding two color elements
@@ -111,8 +117,15 @@ struct homogeneous_color_base<Element, Layout, 2>
{
using layout_t = Layout;

homogeneous_color_base() = default;
template
<
typename U = Element,
typename = typename std::enable_if<!std::is_reference<U>::value>::type
>
homogeneous_color_base() : v0_{}, v1_{} {}

explicit homogeneous_color_base(Element v) : v0_(v), v1_(v) {}

homogeneous_color_base(Element v0, Element v1) : v0_(v0), v1_(v1) {}

template <typename E2, typename L2>
@@ -174,8 +187,8 @@ struct homogeneous_color_base<Element, Layout, 2>
}

private:
Element v0_{};
Element v1_{};
Element v0_;
Element v1_;
};

/// \brief A homogeneous color base holding three color elements.
@@ -186,8 +199,15 @@ struct homogeneous_color_base<Element, Layout, 3>
{
using layout_t = Layout;

homogeneous_color_base() = default;
template
<
typename U = Element,
typename = typename std::enable_if<!std::is_reference<U>::value>::type
>
homogeneous_color_base() : v0_{}, v1_{}, v2_{} {}

explicit homogeneous_color_base(Element v) : v0_(v), v1_(v), v2_(v) {}

homogeneous_color_base(Element v0, Element v1, Element v2)
: v0_(v0), v1_(v1), v2_(v2)
{}
@@ -268,9 +288,9 @@ struct homogeneous_color_base<Element, Layout, 3>
}

private:
Element v0_{};
Element v1_{};
Element v2_{};
Element v0_;
Element v1_;
Element v2_;
};

/// \brief A homogeneous color base holding four color elements.
@@ -281,8 +301,15 @@ struct homogeneous_color_base<Element, Layout, 4>
{
using layout_t = Layout;

homogeneous_color_base() = default;
template
<
typename U = Element,
typename = typename std::enable_if<!std::is_reference<U>::value>::type
>
homogeneous_color_base() : v0_{}, v1_{}, v2_{}, v3_{} {}

explicit homogeneous_color_base(Element v) : v0_(v), v1_(v), v2_(v), v3_(v) {}

homogeneous_color_base(Element v0, Element v1, Element v2, Element v3)
: v0_(v0), v1_(v1), v2_(v2), v3_(v3)
{}
@@ -377,10 +404,10 @@ struct homogeneous_color_base<Element, Layout, 4>
}

private:
Element v0_{};
Element v1_{};
Element v2_{};
Element v3_{};
Element v0_;
Element v1_;
Element v2_;
Element v3_;
};

/// \brief A homogeneous color base holding five color elements.
@@ -391,7 +418,15 @@ struct homogeneous_color_base<Element, Layout, 5>
{
using layout_t = Layout;

homogeneous_color_base() = default;
template
<
typename U = Element,
typename = typename std::enable_if<!std::is_reference<U>::value>::type
>
homogeneous_color_base()
: v0_{}, v1_{}, v2_{}, v3_{}, v4_{}
{}

explicit homogeneous_color_base(Element v)
: v0_(v), v1_(v), v2_(v), v3_(v), v4_(v)
{}
@@ -505,11 +540,11 @@ struct homogeneous_color_base<Element, Layout, 5>
}

private:
Element v0_{};
Element v1_{};
Element v2_{};
Element v3_{};
Element v4_{};
Element v0_;
Element v1_;
Element v2_;
Element v3_;
Element v4_;
};

#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
2 changes: 1 addition & 1 deletion test/core/pixel/test_fixture.hpp
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ class pixel_value
public:
using type = Pixel;
using pixel_t = type;
type pixel_{};
type pixel_;

pixel_value() = default;
explicit pixel_value(pixel_t const& pixel)