Imported Upstream version 1.72.0

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

diff --git a/boost/gil/device_n.hpp b/boost/gil/device_n.hpp
index 8a5974f..6868d66 100644 (file)
--- a/boost/gil/device_n.hpp
+++ b/boost/gil/device_n.hpp
@@ -10,45 +10,50 @@
 
 #include <boost/gil/metafunctions.hpp>
 #include <boost/gil/utilities.hpp>
+#include <boost/gil/detail/mp11.hpp>
 
 #include <boost/config.hpp>
-#include <boost/mpl/range_c.hpp>
-#include <boost/mpl/vector_c.hpp>
-#include <boost/type_traits.hpp>
 
 #include <cstddef>
+#include <type_traits>
 
 namespace boost { namespace gil {
 
+
+// TODO: Document the DeviceN Color Space and Color Model
+// with reference to the Adobe documentation
+// https://www.adobe.com/content/dam/acom/en/devnet/postscript/pdfs/TN5604.DeviceN_Color.pdf
+
 /// \brief unnamed color
 /// \ingroup ColorNameModel
-template <int N> struct devicen_color_t {};
+template <int N>
+struct devicen_color_t {};
 
-template <int N> struct devicen_t;
+template <int N>
+struct devicen_t;
 
-/// \brief unnamed color space of one channel
+/// \brief Unnamed color space of 1, 3, 4, or 5 channels
+/// \tparam N Number of color components (1, 3, 4 or 5).
 /// \ingroup ColorSpaceModel
-template <> struct devicen_t<1> : public mpl::vector1<devicen_color_t<0> > {};
-
-/// \brief unnamed color space of two channels
-/// \ingroup ColorSpaceModel
-template <> struct devicen_t<2> : public mpl::vector2<devicen_color_t<0>, devicen_color_t<1> > {};
-
-/// \brief unnamed color space of three channels
-/// \ingroup ColorSpaceModel
-template <> struct devicen_t<3> : public mpl::vector3<devicen_color_t<0>, devicen_color_t<1>, devicen_color_t<2> > {};
+template <int N>
+struct devicen_t
+{
+private:
+    template <typename T>
+    using color_t = devicen_color_t<T::value>;
 
-/// \brief unnamed color space of four channels
-/// \ingroup ColorSpaceModel
-template <> struct devicen_t<4> : public mpl::vector4<devicen_color_t<0>, devicen_color_t<1>, devicen_color_t<2>, devicen_color_t<3> > {};
+    static_assert(
+        N == 1 || (3 <= N && N <= 5),
+        "invalid number of DeviceN color components");
 
-/// \brief unnamed color space of five channels
-/// \ingroup ColorSpaceModel
-template <> struct devicen_t<5> : public mpl::vector5<devicen_color_t<0>, devicen_color_t<1>, devicen_color_t<2>, devicen_color_t<3>, devicen_color_t<4> > {};
+public:
+    using type = mp11::mp_transform<color_t, mp11::mp_iota_c<N>>;
+};
 
 /// \brief unnamed color layout of up to five channels
 /// \ingroup LayoutModel
-template <int N> struct devicen_layout_t : public layout<devicen_t<N> > {};
+template <int N>
+struct devicen_layout_t : layout<typename devicen_t<N>::type> {};
 
 /// \ingroup ImageViewConstructors
 /// \brief from 2-channel planar data
@@ -63,8 +68,9 @@ planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, std::pt
 /// \ingroup ImageViewConstructors
 /// \brief from 3-channel planar data
 template <typename IC>
-inline typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<3>>>::view_t
-planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, std::ptrdiff_t rowsize_in_bytes)
+inline
+auto planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, std::ptrdiff_t rowsize_in_bytes)
+    -> typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<3>>>::view_t
 {
     using view_t = typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<3>>>::view_t;
     return view_t(width, height, typename view_t::locator(typename view_t::x_iterator(c0,c1,c2), rowsize_in_bytes));
@@ -73,8 +79,9 @@ planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2,
 /// \ingroup ImageViewConstructors
 /// \brief from 4-channel planar data
 template <typename IC>
-inline typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<4>>>::view_t
-planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, IC c3, std::ptrdiff_t rowsize_in_bytes)
+inline
+auto planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, IC c3, std::ptrdiff_t rowsize_in_bytes)
+    -> typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<4>>>::view_t
 {
     using view_t = typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<4>>>::view_t;
     return view_t(width, height, typename view_t::locator(typename view_t::x_iterator(c0,c1,c2,c3), rowsize_in_bytes));
@@ -83,13 +90,14 @@ planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2,
 /// \ingroup ImageViewConstructors
 /// \brief from 5-channel planar data
 template <typename IC>
-inline typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<5>>>::view_t
-planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, IC c3, IC c4, std::ptrdiff_t rowsize_in_bytes)
+inline
+auto planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, IC c3, IC c4, std::ptrdiff_t rowsize_in_bytes)
+    -> typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<5>>>::view_t
 {
     using view_t = typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<5>>>::view_t;
     return view_t(width, height, typename view_t::locator(typename view_t::x_iterator(c0,c1,c2,c3,c4), rowsize_in_bytes));
 }
 
-} }  // namespace boost::gil
+}}  // namespace boost::gil
 
 #endif