Imported Upstream version 1.72.0

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

diff --git a/boost/gil/rgb.hpp b/boost/gil/rgb.hpp
index e397812..1ab15f8 100644 (file)
--- a/boost/gil/rgb.hpp
+++ b/boost/gil/rgb.hpp
@@ -10,11 +10,10 @@
 
 #include <boost/gil/metafunctions.hpp>
 #include <boost/gil/planar_pixel_iterator.hpp>
-
-#include <boost/mpl/range_c.hpp>
-#include <boost/mpl/vector_c.hpp>
+#include <boost/gil/detail/mp11.hpp>
 
 #include <cstddef>
+#include <type_traits>
 
 namespace boost { namespace gil {
 
@@ -32,26 +31,31 @@ struct blue_t {};
 /// \}
 
 /// \ingroup ColorSpaceModel
-using rgb_t = mpl::vector3<red_t,green_t,blue_t>;
+using rgb_t = mp11::mp_list<red_t, green_t, blue_t>;
 
 /// \ingroup LayoutModel
 using rgb_layout_t = layout<rgb_t>;
+
 /// \ingroup LayoutModel
-using bgr_layout_t = layout<rgb_t, mpl::vector3_c<int,2,1,0>>;
+using bgr_layout_t = layout<rgb_t, mp11::mp_list_c<int, 2, 1, 0>>;
 
 /// \ingroup ImageViewConstructors
 /// \brief from raw RGB planar data
 template <typename IC>
 inline
-typename type_from_x_iterator<planar_pixel_iterator<IC,rgb_t> >::view_t
-planar_rgb_view(std::size_t width, std::size_t height,
-                IC r, IC g, IC b,
-                std::ptrdiff_t rowsize_in_bytes)
+auto planar_rgb_view(
+    std::size_t width, std::size_t height,
+    IC r, IC g, IC b,
+    std::ptrdiff_t rowsize_in_bytes)
+    -> typename type_from_x_iterator<planar_pixel_iterator<IC, rgb_t> >::view_t
 {
-    using view_t = typename type_from_x_iterator<planar_pixel_iterator<IC,rgb_t>>::view_t;
-    return view_t(width, height,
-                 typename view_t::locator(planar_pixel_iterator<IC,rgb_t>(r,g,b),
-                                         rowsize_in_bytes));
+    using view_t = typename type_from_x_iterator<planar_pixel_iterator<IC, rgb_t>>::view_t;
+
+    return view_t(
+        width, height,
+        typename view_t::locator(
+            planar_pixel_iterator<IC, rgb_t>(r, g, b),
+            rowsize_in_bytes));
 }
 
 }}  // namespace boost::gil