Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / gil / rgba.hpp

diff --git a/boost/gil/rgba.hpp b/boost/gil/rgba.hpp
index 479cc52..eb76db8 100644 (file)
--- a/boost/gil/rgba.hpp
+++ b/boost/gil/rgba.hpp
@@ -10,11 +10,10 @@
 
 #include <boost/gil/planar_pixel_iterator.hpp>
 #include <boost/gil/rgb.hpp>
-
-#include <boost/mpl/contains.hpp>
-#include <boost/mpl/vector.hpp>
+#include <boost/gil/detail/mp11.hpp>
 
 #include <cstddef>
+#include <type_traits>
 
 namespace boost { namespace gil {
 
@@ -23,30 +22,35 @@ namespace boost { namespace gil {
 struct alpha_t {};
 
 /// \ingroup ColorSpaceModel
-using rgba_t = mpl::vector4<red_t,green_t,blue_t,alpha_t>;
+using rgba_t =mp11::mp_list<red_t, green_t, blue_t, alpha_t>;
 
 /// \ingroup LayoutModel
 using rgba_layout_t = layout<rgba_t>;
+
 /// \ingroup LayoutModel
-using bgra_layout_t = layout<rgba_t, mpl::vector4_c<int,2,1,0,3>>;
+using bgra_layout_t = layout<rgba_t, mp11::mp_list_c<int, 2, 1, 0, 3>>;
+
 /// \ingroup LayoutModel
-using argb_layout_t = layout<rgba_t, mpl::vector4_c<int,1,2,3,0>>;
+using argb_layout_t = layout<rgba_t, mp11::mp_list_c<int, 1, 2, 3, 0>>;
+
 /// \ingroup LayoutModel
-using abgr_layout_t = layout<rgba_t, mpl::vector4_c<int,3,2,1,0>>;
+using abgr_layout_t = layout<rgba_t, mp11::mp_list_c<int, 3, 2, 1, 0>>;
 
 /// \ingroup ImageViewConstructors
 /// \brief from raw RGBA planar data
-template <typename IC>
+template <typename ChannelPtr>
 inline
-typename type_from_x_iterator<planar_pixel_iterator<IC,rgba_t> >::view_t
-planar_rgba_view(std::size_t width, std::size_t height,
-                 IC r, IC g, IC b, IC a,
-                 std::ptrdiff_t rowsize_in_bytes)
+auto planar_rgba_view(std::size_t width, std::size_t height,
+    ChannelPtr r, ChannelPtr g, ChannelPtr b, ChannelPtr a,
+    std::ptrdiff_t rowsize_in_bytes)
+    -> typename type_from_x_iterator<planar_pixel_iterator<ChannelPtr, rgba_t> >::view_t
 {
-    using view_t = typename type_from_x_iterator<planar_pixel_iterator<IC,rgba_t> >::view_t;
-    return RView(width, height,
-                 typename view_t::locator(planar_pixel_iterator<IC,rgba_t>(r,g,b,a),
-                                         rowsize_in_bytes));
+    using pixel_iterator_t = planar_pixel_iterator<ChannelPtr, rgba_t>;
+    using view_t = typename type_from_x_iterator<pixel_iterator_t>::view_t;
+    using locator_t = typename view_t::locator;
+
+    locator_t loc(pixel_iterator_t(r, g, b, a), rowsize_in_bytes);
+    return view_t(width, height, loc);
 }
 
 }} // namespace boost::gil